]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: disable node-exporter cpu/memory limits for the time being
authorSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 14:22:24 +0000 (08:22 -0600)
committerSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 14:22:24 +0000 (08:22 -0600)
Ubuntu 18.04 kernel does not support these.

Signed-off-by: Sage Weil <sage@redhat.com>
src/cephadm/cephadm

index 8e3fb8bb95f484149ad49994c4f78999eedadad5..7cfa327ebca74181e1860f845f61a4920e18fe46 100755 (executable)
@@ -2014,10 +2014,12 @@ def command_deploy():
         monitoring_args = [
             '--user',
             str(uid),
-            '--cpus',
-            metadata.get('cpus', '2'),
-            '--memory',
-            metadata.get('memory', '4GB')
+            # FIXME: disable cpu/memory limits for the time being (not supported
+            # by ubuntu 18.04 kernel!)
+            #'--cpus',
+            #metadata.get('cpus', '2'),
+            #'--memory',
+            #metadata.get('memory', '4GB')
         ]
 
         c = get_container(args.fsid, daemon_type, daemon_id, container_args=monitoring_args)