From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Feb 2020 14:22:24 +0000 (-0600)
Subject: cephadm: disable node-exporter cpu/memory limits for the time being
X-Git-Tag: v15.1.1~492^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99bcf59783adc16ea41130d22f6455593df2a768;p=ceph.git

cephadm: disable node-exporter cpu/memory limits for the time being

Ubuntu 18.04 kernel does not support these.

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 8e3fb8bb95f4..7cfa327ebca7 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -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)