author | Devjani Ray <devjani.ray@oracle.com> |
Fri, 20 May 2016 17:42:29 -0400 | |
branch | s11u3-sru |
changeset 6035 | c9748fcc32de |
parent 4072 | db0cec748ec0 |
child 6853 | cf1567491b1b |
permissions | -rw-r--r-- |
6035
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
1 |
We want to put the Swift server executables in /usr/lib/swift, which means |
3135
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
that we need to be able to call them from there. We do so by using the |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
"executable" keyword argument to subprocess.Popen() (and allow for it to be |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
mocked out during testing). |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
|
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
This patch is not suitable for pushing upstream. |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
|
6035
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
8 |
--- swift-2.3.0/swift/common/manager.py.~1~ 2015-04-30 06:57:49.000000000 -0700 |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
9 |
+++ swift-2.3.0/swift/common/manager.py 2016-02-08 00:46:36.615826872 -0800 |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
10 |
@@ -577,7 +577,8 @@ class Server(object): |
3135
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
re_out = subprocess.PIPE |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
else: |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
re_out = open(os.devnull, 'w+b') |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
- proc = subprocess.Popen(args, stdout=re_out, stderr=re_err) |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
+ proc = subprocess.Popen(args, stdout=re_out, stderr=re_err, |
6035
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
16 |
+ executable='/usr/lib/swift/' + self.cmd) |
3135
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
pid_file = self.get_pid_file_name(conf_file) |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
write_file(pid_file, proc.pid) |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
self.procs.append(proc) |
6035
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
20 |
--- swift-2.3.0/test/unit/common/test_manager.py.~1~ 2015-04-30 06:57:49.000000000 -0700 |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
21 |
+++ swift-2.3.0/test/unit/common/test_manager.py 2016-02-08 00:45:32.431081803 -0800 |
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
22 |
@@ -955,7 +955,7 @@ class TestServer(unittest.TestCase): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
23 |
class MockProc(object): |
3135
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
|
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
def __init__(self, pid, args, stdout=MockProcess.NOTHING, |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
- stderr=MockProcess.NOTHING): |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
27 |
+ stderr=MockProcess.NOTHING, executable=None): |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
28 |
self.pid = pid |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
self.args = args |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
self.stdout = stdout |