Merge pull request #159 from HileQAQ/errlog

Enhance log

Author: liulanzheng

src/image_file.cpp

@@ -99,11 +99,24 @@ IFile *ImageFile::__open_ro_remote(const std::string &dir, const std::string &di
     LOG_DEBUG("open file from remotefs: `, size: `", url, size);
     IFile *remote_file = image_service.global_fs.remote_fs->open(url.c_str(), O_RDONLY);
     if (!remote_file) {
-        if (errno == EPERM)
-            set_auth_failed();
-        else
-            set_failed("failed to open remote file " + url);
-        LOG_ERROR_RETURN(0, nullptr, "failed to open remote file `", url);
+        std::string err_msg = "failed to open remote file " + url + ": ";
+        if (errno == EPERM || errno == EACCES) {
+            err_msg += "Authentication failed";
+        } else if (errno == ENOTCONN) {
+            err_msg += "Connection failed";
+        } else if (errno == ETIMEDOUT) {
+            err_msg += "Get meta timedout";
+        } else if (errno == ENOENT) {
+            err_msg += "No such file or directory";
+        } else if (errno == EBUSY) {
+            err_msg += "Too many requests";
+        } else if (errno == EIO) {
+            err_msg += "Unexpected response";
+        } else {
+            err_msg += std::string(strerror(errno));
+        }
+        set_failed(err_msg);
+        LOG_ERRNO_RETURN(0, nullptr, err_msg);
     }
 
     ISwitchFile *switch_file = new_switch_file(remote_file);

src/overlaybd/registryfs/registryfs.cpp

@@ -432,16 +432,18 @@ class RegistryFileImpl : public photon::fs::VirtualReadOnlyFile {
         auto code = m_fs->GET(m_url.c_str(), &headers, -1, -1, nullptr, tmo.timeout());
         if (code != 200 && code != 206) {
             if (tmo.expire() < photon::now)
-                LOG_ERROR_RETURN(ETIMEDOUT, -1, "get meta timedout");
-
+                LOG_ERROR_RETURN(ETIMEDOUT, -1, "Get meta timedout");
+            if (retry--)
+                goto again;
             if (code == 401 || code == 403) {
-                if (retry--)
-                    goto again;
                 LOG_ERROR_RETURN(EPERM, -1, "Authorization failed");
+            } else if (code == 404) {
+                LOG_ERROR_RETURN(ENOENT, -1, "No such file or directory");
+            } else if (code == 429) {
+                LOG_ERROR_RETURN(EBUSY, -1, "Too many request");
+            } else {
+                LOG_ERROR_RETURN(ENOENT, -1, "failed to get meta from server");
             }
-            if (retry--)
-                goto again;
-            LOG_ERROR_RETURN(ENOENT, -1, "failed to get meta from server");
         }
         char buffer[64];
         uint64_t ret = 0;