driver: fix driver scan timeout issue

Author: pymumu

src/libmodelbox/base/drivers/driver.cc

@@ -42,13 +42,16 @@
 namespace modelbox {
 
 constexpr const char *DEFAULT_LD_CACHE = "/etc/ld.so.cache";
+constexpr const int DRIVER_SCAN_TIMEOUT = 60 * 3;
 
 int SubProcessWaitAndLog(int fd) {
   struct pollfd fdset;
   std::string log;
   char tmp[4096];
   fdset.fd = fd;
   fdset.events = POLLIN | POLLHUP;
+  time_t begin = 0;
+  time_t now;
   if (fd <= 0) {
     return 0;
   }
@@ -61,8 +64,15 @@ int SubProcessWaitAndLog(int fd) {
 
   fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
 
+  time(&begin);
   while (true) {
-    int count = poll(&fdset, 1, 60000);
+    int count = poll(&fdset, 1, 10000);
+    time(&now);
+
+    if (now - begin >= DRIVER_SCAN_TIMEOUT) {
+      return -1;
+    }
+
     if (count < 0) {
       if (errno == EINTR) {
         continue;
@@ -112,16 +122,21 @@ Status SubProcessRun(func &&fun, ts &&...params) {
       signal(SIGABRT, SIG_DFL);
       close(fd[0]);
       dup2(fd[1], 1);
+      close(fd[1]);
+      setbuf(stdout, NULL);
+
+      // Keep old log avoid deadlock
+      auto oldlogger_keeper = klogger.GetLogger();
+
       // output log to console
-      auto loglevel = klogger.GetLogger()->GetLogLevel();
       klogger.SetLogger(nullptr);
-      klogger.GetLogger()->SetLogLevel(loglevel);
-
+      klogger.GetLogger()->SetLogLevel(oldlogger_keeper->GetLogLevel());
       Status ret = fun(params...);
-      if (!ret) {
+      if (ret == STATUS_OK) {
         _exit(0);
       }
 
+      MBLOG_WARN << "run function failed, errmsg: " << ret.WrapErrormsgs();
       _exit(1);
     }
 
@@ -152,16 +167,19 @@ Status SubProcessRun(func &&fun, ts &&...params) {
       return {STATUS_FAULT, err_msg};
     }
 
-    if (WIFEXITED(status) != 0) {
-      return {STATUS_NORESPONSE, "process exit abnormal."};
-    }
-
     if (WIFSIGNALED(status)) {
       const auto *err_msg = "killed by signal";
       MBLOG_ERROR << err_msg;
       return {STATUS_NORESPONSE, err_msg};
     }
 
+    if (!WIFEXITED(status)) {
+      std::string err_msg =
+          "process exit abnormal, ret = " + std::to_string(status);
+      MBLOG_ERROR << err_msg;
+      return {STATUS_NORESPONSE, err_msg};
+    }
+
     if (status != 0) {
       const auto *err_msg = "scan process exit result is fail.";
       MBLOG_ERROR << err_msg;
@@ -517,7 +535,7 @@ Status Drivers::Scan(const std::string &path, const std::string &filter) {
   struct stat s;
   auto ret = lstat(path.c_str(), &s);
   if (ret) {
-    auto err_msg = "lstat " + path + " failed, errno:" + StrError(errno);
+    auto err_msg = "lstat " + path + " failed, " + StrError(errno);
     return {STATUS_FAULT, err_msg};
   }
 
@@ -819,9 +837,10 @@ bool Drivers::CheckPathAndMagicCode() {
 Status Drivers::InnerScan() {
   Status ret = STATUS_NOTFOUND;
   for (const auto &dir : driver_dirs_) {
+    MBLOG_INFO << "Scan dir: " << dir;
     ret = Scan(dir, "libmodelbox-*.so*");
     if (!ret && ret != STATUS_NOTFOUND) {
-      MBLOG_WARN << "scan " << dir << " failed";
+      MBLOG_WARN << "scan " << dir << " failed, " << ret.WrapErrormsgs();
     }
     ret = STATUS_OK;
   }
@@ -830,9 +849,9 @@ Status Drivers::InnerScan() {
 
   ret = WriteScanInfo(default_driver_info_path_, check_code);
   if (ret != STATUS_OK) {
-    const auto *err_msg = "write scan info failed";
+    std::string err_msg = "write scan info failed, " + ret.WrapErrormsgs();
     MBLOG_ERROR << err_msg;
-    return {STATUS_FAULT, err_msg};
+    return {ret, err_msg};
   }
 
   return ret;