From 9ff2c1ffceb9222d4cbccc6406a666e2437191c6 Mon Sep 17 00:00:00 2001 From: Wetp Zhang Date: Fri, 18 Mar 2022 18:07:57 +0800 Subject: [PATCH 1/2] mservice: fix print large number Signed-off-by: Wetp Zhang --- source/tools/monitor/mservice/master/src/output_print.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/tools/monitor/mservice/master/src/output_print.c b/source/tools/monitor/mservice/master/src/output_print.c index 08e38145..262af1f3 100644 --- a/source/tools/monitor/mservice/master/src/output_print.c +++ b/source/tools/monitor/mservice/master/src/output_print.c @@ -145,6 +145,8 @@ printf_result(double result) printf("%5.1f%s", result / 1024 / 1024 / 1024, "G"); } else if ((1000 - result / 1024 / 1024 / 1024 / 1024) > 0.1) { printf("%5.1f%s", result / 1024 / 1024 / 1024 / 1024, "T"); + } else { + printf("------"); } printf("%s", PRINT_DATA_SPLIT); } -- Gitee From 3754b68deea6a5307c22aec13352e91a2d7bea4c Mon Sep 17 00:00:00 2001 From: Wetp Zhang Date: Fri, 18 Mar 2022 18:08:36 +0800 Subject: [PATCH 2/2] mservice: check command if exists --- .../tools/monitor/mservice/master/modules/mod_cgroup.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/tools/monitor/mservice/master/modules/mod_cgroup.c b/source/tools/monitor/mservice/master/modules/mod_cgroup.c index 0f6057df..1ad6c6e6 100644 --- a/source/tools/monitor/mservice/master/modules/mod_cgroup.c +++ b/source/tools/monitor/mservice/master/modules/mod_cgroup.c @@ -210,6 +210,15 @@ static void init_cgroups(void) memset(cgroups, 0, sizeof(cgroups)); n_cgs = 0; + + /*check docker exit*/ + if (access("/bin/docker", F_OK) != F_OK && + access("/usr/bin/docker", F_OK) != F_OK && + access("/bin/docker", F_OK) != F_OK && + access("/usr/bin/docker", F_OK) != F_OK) { + return; + } + result = popen("docker ps -q", "r"); for (i = 0; i < MAX_CGROUPS && !feof(result); i++) { if (feof(result) || !fgets(buffer, sizeof(buffer), result)) -- Gitee