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-- |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
RLIMIT_NPROC isn't implemented on Solaris, and it's not even clear what it |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
would mean, given the differences between the Solaris and Linux thread |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
models. Solaris has some resource controls that are similar: per-task and |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
per-project max-lwps and max-processes. |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
For the time being, just ignore the use of RLIMIT_NPROC. This might be |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
appropriate for upstream (but has not been submitted), depending on whether |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
RLIMIT_NPROC is unavailable on any platforms other than Solaris. |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
|
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
10 |
--- swift-2.7.0/swift/common/manager.py.~2~ 2016-08-08 19:02:27.957723715 -0700 |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
11 |
+++ swift-2.7.0/swift/common/manager.py 2016-08-08 19:02:28.057288615 -0700 |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
12 |
@@ -81,6 +81,8 @@ def setup_env(): |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
except ValueError: |
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
14 |
print(_("WARNING: Unable to modify max process limit. " |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
15 |
"Running as non-root?")) |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
+ except AttributeError: |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
+ pass |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
# Set PYTHON_EGG_CACHE if it isn't already set |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
20 |
os.environ.setdefault('PYTHON_EGG_CACHE', '/tmp') |
6853
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.~2~ 2016-08-08 19:02:27.958990495 -0700 |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
22 |
+++ swift-2.7.0/test/unit/common/test_manager.py 2016-08-08 19:02:28.058387965 -0700 |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
23 |
@@ -107,9 +107,10 @@ class TestManagerModule(unittest.TestCas |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
manager.MAX_DESCRIPTORS)), |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
(resource.RLIMIT_DATA, (manager.MAX_MEMORY, |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
manager.MAX_MEMORY)), |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
27 |
- (resource.RLIMIT_NPROC, (manager.MAX_PROCS, |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
28 |
- manager.MAX_PROCS)), |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
] |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
+ if getattr(resource, "RLIMIT_NPROC", None): |
5448
56f4540f741d
22694904 Some of the OpenStack patches can be cleaned up
david.comay@oracle.com
parents:
3998
diff
changeset
|
31 |
+ expected.append((resource.RLIMIT_NPROC, |
56f4540f741d
22694904 Some of the OpenStack patches can be cleaned up
david.comay@oracle.com
parents:
3998
diff
changeset
|
32 |
+ (manager.MAX_PROCS, manager.MAX_PROCS))) |
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
33 |
self.assertEqual(manager.resource.called_with_args, expected) |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
34 |
self.assertTrue( |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
35 |
manager.os.environ['PYTHON_EGG_CACHE'].startswith('/tmp')) |