commit 2b231e8aa91a76a7c36f1c70c7e4058a38d0a5f1
author Bruceleequantatw <Bruce_Lee@quantatw.com> Mon Nov 23 13:23:45 2020 +0800
committer Bruceleequantatw <Bruce_Lee@quantatw.com> Tue Dec 01 10:59:18 2020 +0800
tree 11a1a5e82b2c4eda3eeb4dc83854f492962a3521
parent af9acbde4b4d782d78fc8af30059207974bcc186

Avoid "Error from statvfs2" showing reaptedly.

Add check Storage or Inode path whether exist in the system.
Fixes openbmc/phosphor-health-monitor#1.

Signed-off-by: Bruce Lee <Bruce_Lee@quantatw.com>
Change-Id: Iff298615c59324c1d9907261d124b69a7b94e233

healthMonitor.cpp

diff --git a/healthMonitor.cpp b/healthMonitor.cpp
index dac0751..8861403 100644
--- a/healthMonitor.cpp
+++ b/healthMonitor.cpp
@@ -146,7 +146,8 @@
     if (ret != 0)
     {
         auto e = errno;
-        std::cerr << "Error from statvfs" << e << std::endl;
+        std::cerr << "Error from statvfs: " << strerror(e) << ",path: " << path
+                  << std::endl;
         return 0;
     }
 
@@ -180,7 +181,8 @@
     if (ret != 0)
     {
         auto e = errno;
-        std::cerr << "Error from statvfs" << e << std::endl;
+        std::cerr << "Error from statvfs: " << strerror(e) << ",path: " << path
+                  << std::endl;
         return 0;
     }
 
@@ -456,18 +458,35 @@
     if (DEBUG)
         std::cout << "Config json data:\n" << data << "\n\n";
 
-    /* Get CPU config data */
+    /* Get data items from config json data*/
     for (auto& j : data.items())
     {
         auto key = j.key();
         /* key need match default value in map readSensors or match the key
          * start with "Storage" or "Inode" */
-        if (readSensors.find(key) != readSensors.end() ||
-            (key.rfind(storage, 0) == 0) || (key.rfind(inode, 0) == 0))
+        bool isStorageOrInode =
+            (key.rfind(storage, 0) == 0 || key.rfind(inode, 0) == 0);
+        if (readSensors.find(key) != readSensors.end() || isStorageOrInode)
         {
             HealthConfig cfg = HealthConfig();
             cfg.name = j.key();
             getConfigData(j.value(), cfg);
+            if (isStorageOrInode)
+            {
+                struct statvfs buffer
+                {};
+                int ret = statvfs(cfg.path.c_str(), &buffer);
+                if (ret != 0)
+                {
+                    auto e = errno;
+                    std::cerr << "Error from statvfs: " << strerror(e)
+                              << ", name: " << cfg.name
+                              << ", path: " << cfg.path
+                              << ", please check your settings in config file."
+                              << std::endl;
+                    continue;
+                }
+            }
             cfgs.push_back(cfg);
             if (DEBUG)
                 printConfig(cfg);