mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-30 23:34:12 +03:00
Sarah Brofeldt
GitHub
commit
b256b2253c
@ -183,15 +183,15 @@ let
|
||||
monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
|
||||
|
||||
monA.succeed(
|
||||
"ceph osd pool create multi-node-test 100 100",
|
||||
"ceph osd pool create multi-node-test 128 128",
|
||||
"ceph osd pool ls | grep 'multi-node-test'",
|
||||
"ceph osd pool rename multi-node-test multi-node-other-test",
|
||||
"ceph osd pool ls | grep 'multi-node-other-test'",
|
||||
)
|
||||
monA.wait_until_succeeds("ceph -s | grep '1 pools, 100 pgs'")
|
||||
monA.wait_until_succeeds("ceph -s | grep '1 pools, 128 pgs'")
|
||||
monA.succeed("ceph osd pool set multi-node-other-test size 2")
|
||||
monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
|
||||
monA.wait_until_succeeds("ceph -s | grep '100 active+clean'")
|
||||
monA.wait_until_succeeds("ceph -s | grep '128 active+clean'")
|
||||
monA.fail(
|
||||
"ceph osd pool ls | grep 'multi-node-test'",
|
||||
"ceph osd pool delete multi-node-other-test multi-node-other-test --yes-i-really-really-mean-it",
|
||||
|
||||
@ -143,12 +143,12 @@ let
|
||||
monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
|
||||
|
||||
monA.succeed(
|
||||
"ceph osd pool create single-node-test 100 100",
|
||||
"ceph osd pool create single-node-test 128 128",
|
||||
"ceph osd pool ls | grep 'single-node-test'",
|
||||
"ceph osd pool rename single-node-test single-node-other-test",
|
||||
"ceph osd pool ls | grep 'single-node-other-test'",
|
||||
)
|
||||
monA.wait_until_succeeds("ceph -s | grep '1 pools, 100 pgs'")
|
||||
monA.wait_until_succeeds("ceph -s | grep '1 pools, 128 pgs'")
|
||||
monA.succeed(
|
||||
"ceph osd getcrushmap -o crush",
|
||||
"crushtool -d crush -o decrushed",
|
||||
@ -158,7 +158,7 @@ let
|
||||
"ceph osd pool set single-node-other-test size 2",
|
||||
)
|
||||
monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
|
||||
monA.wait_until_succeeds("ceph -s | grep '100 active+clean'")
|
||||
monA.wait_until_succeeds("ceph -s | grep '128 active+clean'")
|
||||
monA.fail(
|
||||
"ceph osd pool ls | grep 'multi-node-test'",
|
||||
"ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it",
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
|
||||
index a8a3ec07c1..bcc9b86c37 100644
|
||||
--- a/src/pybind/mgr/dashboard/module.py
|
||||
+++ b/src/pybind/mgr/dashboard/module.py
|
||||
@@ -25,40 +25,6 @@ except ImportError:
|
||||
|
||||
from .services.sso import load_sso_db
|
||||
|
||||
-# The SSL code in CherryPy 3.5.0 is buggy. It was fixed long ago,
|
||||
-# but 3.5.0 is still shipping in major linux distributions
|
||||
-# (Fedora 27, Ubuntu Xenial), so we must monkey patch it to get SSL working.
|
||||
-if cherrypy is not None:
|
||||
- v = StrictVersion(cherrypy.__version__)
|
||||
- # It was fixed in 3.7.0. Exact lower bound version is probably earlier,
|
||||
- # but 3.5.0 is what this monkey patch is tested on.
|
||||
- if StrictVersion("3.5.0") <= v < StrictVersion("3.7.0"):
|
||||
- from cherrypy.wsgiserver.wsgiserver2 import HTTPConnection,\
|
||||
- CP_fileobject
|
||||
-
|
||||
- def fixed_init(hc_self, server, sock, makefile=CP_fileobject):
|
||||
- hc_self.server = server
|
||||
- hc_self.socket = sock
|
||||
- hc_self.rfile = makefile(sock, "rb", hc_self.rbufsize)
|
||||
- hc_self.wfile = makefile(sock, "wb", hc_self.wbufsize)
|
||||
- hc_self.requests_seen = 0
|
||||
-
|
||||
- HTTPConnection.__init__ = fixed_init
|
||||
-
|
||||
-# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify
|
||||
-# that the ports its listening on are in fact bound. When using the any address
|
||||
-# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes)
|
||||
-# ipv6 isn't yet configured / supported and CherryPy throws an uncaught
|
||||
-# exception.
|
||||
-if cherrypy is not None:
|
||||
- v = StrictVersion(cherrypy.__version__)
|
||||
- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on
|
||||
- # centos:7) and back to at least 3.0.0.
|
||||
- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"):
|
||||
- # https://github.com/cherrypy/cherrypy/issues/1100
|
||||
- from cherrypy.process import servers
|
||||
- servers.wait_for_occupied_port = lambda host, port: None
|
||||
-
|
||||
if 'COVERAGE_ENABLED' in os.environ:
|
||||
import coverage
|
||||
__cov = coverage.Coverage(config_file="{}/.coveragerc".format(os.path.dirname(__file__)),
|
||||
diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
|
||||
index b7fecf8d85..dfd4160591 100644
|
||||
--- a/src/pybind/mgr/prometheus/module.py
|
||||
+++ b/src/pybind/mgr/prometheus/module.py
|
||||
@@ -18,20 +18,6 @@ from rbd import RBD
|
||||
DEFAULT_ADDR = '::'
|
||||
DEFAULT_PORT = 9283
|
||||
|
||||
-# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify
|
||||
-# that the ports its listening on are in fact bound. When using the any address
|
||||
-# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes)
|
||||
-# ipv6 isn't yet configured / supported and CherryPy throws an uncaught
|
||||
-# exception.
|
||||
-if cherrypy is not None:
|
||||
- v = StrictVersion(cherrypy.__version__)
|
||||
- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on
|
||||
- # centos:7) and back to at least 3.0.0.
|
||||
- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"):
|
||||
- # https://github.com/cherrypy/cherrypy/issues/1100
|
||||
- from cherrypy.process import servers
|
||||
- servers.wait_for_occupied_port = lambda host, port: None
|
||||
-
|
||||
# cherrypy likes to sys.exit on error. don't let it take us down too!
|
||||
def os_exit_noop(*args, **kwargs):
|
||||
pass
|
||||
@ -93,7 +93,7 @@ let
|
||||
]);
|
||||
sitePackages = ceph-python-env.python.sitePackages;
|
||||
|
||||
version = "14.2.7";
|
||||
version = "14.2.8";
|
||||
in rec {
|
||||
ceph = stdenv.mkDerivation {
|
||||
pname = "ceph";
|
||||
@ -101,12 +101,11 @@ in rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
|
||||
sha256 = "0qiqhm6hvz299q54k3i4crnb5dhpq6xnn2yqih9pxn9van0dq1ln";
|
||||
sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0000-fix-SPDK-build-env.patch
|
||||
./0000-dont-check-cherrypy-version.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Loading…
Reference in New Issue
Block a user