From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Mar 2019 17:27:30 +0000 (-0600)
Subject: common/util: include group limit in daemon metadata
X-Git-Tag: v14.2.0~66^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ecf3a105c075d59e5c13a13a7b417025f2453f1d;p=ceph.git

common/util: include group limit in daemon metadata

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

diff --git a/src/common/util.cc b/src/common/util.cc
index 84d413590f9..fea63e95511 100644
--- a/src/common/util.cc
+++ b/src/common/util.cc
@@ -259,6 +259,11 @@ void collect_sys_info(map<string, string> *m, CephContext *cct)
     }
     fclose(f);
   }
+  uint64_t cgroup_limit;
+  if (get_cgroup_memory_limit(&cgroup_limit) == 0 &&
+      cgroup_limit > 0) {
+    (*m)["mem_cgroup_limit"] = boost::lexical_cast<string>(cgroup_limit);
+  }
 
   // processor
   f = fopen(PROCPREFIX "/proc/cpuinfo", "r");