| author | Laszlo Peter <laszlo.peter@oracle.com> |
| Wed, 07 Sep 2016 14:48:42 -0700 | |
| changeset 6853 | cf1567491b1b |
| parent 5448 | 56f4540f741d |
| permissions | -rw-r--r-- |
|
5448
56f4540f741d
22694904 Some of the OpenStack patches can be cleaned up
david.comay@oracle.com
parents:
3998
diff
changeset
|
1 |
We want to put the Swift server executables in /usr/lib/swift, which means |
|
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
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 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
"executable" keyword argument to subprocess.Popen() (and allow for it to be |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
mocked out during testing). |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
|
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
This patch is not suitable for pushing upstream. |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
|
|
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
8 |
--- swift-2.7.0/swift/common/manager.py.~1~ 2016-03-25 02:42:55.000000000 -0700 |
|
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
9 |
+++ swift-2.7.0/swift/common/manager.py 2016-08-08 18:50:52.318623880 -0700 |
|
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
10 |
@@ -655,7 +655,8 @@ class Server(object): |
|
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
re_out = subprocess.PIPE |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
else: |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
re_out = open(os.devnull, 'w+b') |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
- proc = subprocess.Popen(args, stdout=re_out, stderr=re_err) |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
+ proc = subprocess.Popen(args, stdout=re_out, stderr=re_err, |
|
5448
56f4540f741d
22694904 Some of the OpenStack patches can be cleaned up
david.comay@oracle.com
parents:
3998
diff
changeset
|
16 |
+ executable='/usr/lib/swift/' + self.cmd) |
|
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
pid_file = self.get_pid_file_name(conf_file) |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
write_file(pid_file, proc.pid) |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
self.procs.append(proc) |
|
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
20 |
--- swift-2.7.0/test/unit/common/test_manager.py.~1~ 2016-03-25 02:42:55.000000000 -0700 |
|
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
21 |
+++ swift-2.7.0/test/unit/common/test_manager.py 2016-08-08 18:50:52.320000055 -0700 |
|
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
22 |
@@ -1054,7 +1054,7 @@ class TestServer(unittest.TestCase): |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
1944
diff
changeset
|
23 |
class MockProc(object): |
|
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
|
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
def __init__(self, pid, args, stdout=MockProcess.NOTHING, |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
- stderr=MockProcess.NOTHING): |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
27 |
+ stderr=MockProcess.NOTHING, executable=None): |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
28 |
self.pid = pid |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
self.args = args |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
self.stdout = stdout |