refactor some logs

yuchen0cc · yuchen0cc · commit 0d835b184871 · 2023-08-25T19:23:09.000+08:00
Signed-off-by: yuchen.cc &lt;yuchen.cc@alibaba-inc.com&gt;
diff --git a/src/bk_download.cpp b/src/bk_download.cpp
@@ -128,8 +128,7 @@ bool BkDownload::download_done() {
 
     int ret = lfs->rename(old_name.c_str(), new_name.c_str());
     if (ret != 0) {
-        LOG_ERROR("rename(`,`), `:`", old_name, new_name, errno, strerror(errno));
-        return false;
+        LOG_ERRNO_RETURN(0, false, "rename(`,`) failed", old_name, new_name);
     }
     LOG_INFO("download verify done. rename(`,`) success", old_name, new_name);
     return true;
diff --git a/src/image_file.cpp b/src/image_file.cpp
@@ -58,7 +58,7 @@ IFile *ImageFile::__open_ro_file(const std::string &path) {
     auto file = open_localfile_adaptor(path.c_str(), flags, 0644, ioengine);
     if (!file) {
         set_failed("failed to open local file " + path);
-        LOG_ERROR_RETURN(0, nullptr, "open(`),`:`", path, errno, strerror(errno));
+        LOG_ERRNO_RETURN(0, nullptr, "open(`) failed", path);
     }
 
     if (flags & O_DIRECT) {
@@ -67,8 +67,7 @@ IFile *ImageFile::__open_ro_file(const std::string &path) {
         if (!aligned_file) {
             set_failed("failed to open aligned_file_adaptor " + path);
             delete file;
-            LOG_ERROR_RETURN(0, nullptr, "new_aligned_file_adaptor(`) failed, `:`", path, errno,
-                             strerror(errno));
+            LOG_ERRNO_RETURN(0, nullptr, "new_aligned_file_adaptor(`) failed", path);
         }
         file = aligned_file;
     }
@@ -77,8 +76,7 @@ IFile *ImageFile::__open_ro_file(const std::string &path) {
     if (!switch_file) {
         set_failed("failed to open switch file `" + path);
         delete file;
-        LOG_ERROR_RETURN(0, nullptr, "new_switch_file(`) failed, `,:`", path, errno,
-                         strerror(errno));
+        LOG_ERRNO_RETURN(0, nullptr, "new_switch_file(`) failed", path);
     }
     file = switch_file;
 
@@ -89,7 +87,7 @@ IFile *ImageFile::__open_ro_target_file(const std::string &path) {
     auto file = open_localfile_adaptor(path.c_str(), O_RDONLY, 0644, 0);
     if (!file) {
         set_failed("failed to open local data file " + path);
-        LOG_ERROR_RETURN(0, nullptr, "open(`),`:`", path, errno, strerror(errno));
+        LOG_ERRNO_RETURN(0, nullptr, "open(`) failed", path);
     }
     return file;
 }
@@ -281,7 +279,7 @@ int ImageFile::open_lower_layer(IFile *&file, ImageConfigNS::LayerConfig &layer,
         auto gz_index = open_localfile_adaptor(layer.gzipIndex().c_str(), O_RDONLY, 0644, 0);
         if (!gz_index) {
             set_failed("failed to open gzip index " + layer.gzipIndex());
-            LOG_ERROR_RETURN(0, -1, "open(`),`:`", layer.gzipIndex(), errno, strerror(errno));
+            LOG_ERRNO_RETURN(0, -1, "open(`) failed", layer.gzipIndex());
         }
         target_file = new_gzfile(target_file, gz_index, true);
         if (image_service.global_conf.gzipCacheConfig().enable() && layer.targetDigest() != "") {
diff --git a/src/overlaybd/extfs/extfs.cpp b/src/overlaybd/extfs/extfs.cpp
@@ -57,15 +57,13 @@ ext2_filsys do_ext2fs_open(io_manager extfs_manager) {
     );
     if (ret) {
         errno = -parse_extfs_error(nullptr, 0, ret);
-        LOG_ERROR("failed ext2fs_open, errno `:`", errno, strerror(errno));
-        return nullptr;
+        LOG_ERRNO_RETURN(0, nullptr, "failed ext2fs_open");
     }
     ret = ext2fs_read_bitmaps(fs);
     if (ret) {
         errno = -parse_extfs_error(fs, 0, ret);
-        LOG_ERROR("failed ext2fs_read_bitmaps, errno `:`", errno, strerror(errno));
         ext2fs_close(fs);
-        return nullptr;
+        LOG_ERRNO_RETURN(0, nullptr, "failed ext2fs_read_bitmaps");
     }
     LOG_INFO("ext2fs opened");
     return fs;
diff --git a/src/overlaybd/tar/libtar.cpp b/src/overlaybd/tar/libtar.cpp
@@ -44,15 +44,13 @@ int UnTar::set_file_perms(const char *filename) {
     /* change owner/group */
     if (geteuid() == 0) {
         if (fs->lchown(filename, uid, gid) == -1) {
-            LOG_ERROR("lchown failed, filename `, `", filename, strerror(errno));
-            return -1;
+            LOG_ERRNO_RETURN(0, -1, "lchown failed, filename `, uid `, gid `", filename, uid, gid);
         }
     }
 
     /* change access/modification time */
     if (fs->lutimes(filename, tv) == -1) {
-        LOG_ERROR("lutimes failed, filename `, `", filename, strerror(errno));
-        return -1;
+        LOG_ERRNO_RETURN(0, -1, "lutimes failed, filename `", filename);
     }
 
     /* change permissions */
@@ -69,8 +67,7 @@ int UnTar::set_file_perms(const char *filename) {
         return 0;
     }
     if (fs->chmod(filename, mode) == -1) {
-        LOG_ERROR("chmod failed `", strerror(errno));
-        return -1;
+        LOG_ERRNO_RETURN(0, -1, "chmod failed, filename `, mode `", filename, mode);
     }
 
     return 0;
@@ -95,8 +92,7 @@ int UnTar::extract_all() {
 
     while ((i = read_header()) == 0) {
         if (extract_file() != 0) {
-            LOG_ERROR("extract failed, filename `, `", get_pathname(), strerror(errno));
-            return -1;
+            LOG_ERRNO_RETURN(0, -1, "extract failed, filename `", get_pathname());
         }
         if (TH_ISDIR(header)) {
             dirs.emplace_back(std::make_pair(std::string(get_pathname()), header.get_mtime()));
@@ -111,8 +107,7 @@ int UnTar::extract_all() {
         tv[0].tv_sec = tv[1].tv_sec = dir.second;
         tv[0].tv_usec = tv[1].tv_usec = 0;
         if (fs->lutimes(path.c_str(), tv) == -1) {
-            LOG_ERROR("utime failed, filename `, `", dir.first.c_str(), strerror(errno));
-            return -1;
+            LOG_ERRNO_RETURN(0, -1, "utime failed, filename `", dir.first.c_str());
         }
     }
 
@@ -151,15 +146,11 @@ int UnTar::extract_file() {
         } else {
             if (!S_ISDIR(s.st_mode)) {
                 if (fs->unlink(npath.c_str()) == -1 && errno != ENOENT) {
-                    LOG_ERROR("remove exist file ` failed, `", npath.c_str(), strerror(errno));
-                    errno = EEXIST;
-                    return -1;
+                    LOG_ERRNO_RETURN(EEXIST, -1, "remove exist file ` failed", npath.c_str());
                 }
             } else if (!TH_ISDIR(header)) {
                 if (remove_all(npath) == -1) {
-                    LOG_ERROR("remove exist dir ` failed, `", npath.c_str(), strerror(errno));
-                    errno = EEXIST;
-                    return -1;
+                    LOG_ERRNO_RETURN(EEXIST, -1, "remove exist dir ` failed", npath.c_str());
                 }
             }
         }
@@ -290,8 +281,7 @@ int UnTar::extract_hardlink(const char *filename) {
     char *linktgt = get_linkname();
     LOG_DEBUG("  ==> extracting: ` (link to `)", filename, linktgt);
     if (fs->link(linktgt, filename) == -1) {
-        LOG_ERROR("link failed, `", strerror(errno));
-        return -1;
+        LOG_ERRNO_RETURN(0, -1, "link failed, filename `, linktgt `", filename, linktgt);
     }
     return 0;
 }
@@ -300,8 +290,7 @@ int UnTar::extract_symlink(const char *filename) {
     char *linktgt = get_linkname();
     LOG_DEBUG("  ==> extracting: ` (symlink to `)", filename, linktgt);
     if (fs->symlink(linktgt, filename) == -1) {
-        LOG_ERROR("symlink failed, `", strerror(errno));
-        return -1;
+        LOG_ERRNO_RETURN(0, -1, "symlink failed, filename `, linktgt `", filename, linktgt);
     }
     return 0;
 }
@@ -327,8 +316,7 @@ int UnTar::extract_block_char_fifo(const char *filename) {
 
     LOG_DEBUG("  ==> extracting: ` (block/char/fifo `,`)", filename, devmaj, devmin);
     if (fs->mknod(filename, mode, makedev(devmaj, devmin)) == -1) {
-        LOG_ERROR("block/char/fifo failed, `", strerror(errno));
-        return -1;
+        LOG_ERRNO_RETURN(0, -1, "block/char/fifo failed, filename `", filename);
     }
 
     return 0;
diff --git a/src/overlaybd/tar/tar_file.cpp b/src/overlaybd/tar/tar_file.cpp
@@ -332,6 +332,9 @@ IFile *new_tar_file(IFile *file, bool create) {
 }
 
 IFile *open_tar_file(IFile *file) {
+    if (!file) {
+        LOG_ERROR_RETURN(0, nullptr, "file is nullptr");
+    }
     auto ret = is_tar_file(file);
     if (ret == 1) {
         LOG_INFO("open file as tar file");
diff --git a/src/overlaybd/tar/whiteout.cpp b/src/overlaybd/tar/whiteout.cpp
@@ -59,14 +59,12 @@ int UnTar::remove_all(const std::string &path, bool rmdir) {
             return 0;
         }
     } else {
-        LOG_ERROR("get path ` stat failed, errno `:`", path, errno, strerror(errno));
-        return -1;
+        LOG_ERRNO_RETURN(0, -1, "get path ` stat failed", path);
     }
 
     auto dirs = fs->opendir(path.c_str());
     if (dirs == nullptr) {
-        LOG_ERROR("open dir ` failed, errno `:`", path, errno, strerror(errno));
-        return -1;
+        LOG_ERRNO_RETURN(0, -1, "open dir ` failed", path);
     }
     dirent *dirInfo;
     while ((dirInfo = dirs->get()) != nullptr) {
diff --git a/src/switch_file.cpp b/src/switch_file.cpp
@@ -46,13 +46,12 @@ static IFile *try_open_zfile(IFile *file, bool verify, const char *file_path) {
     if (is_zfile == 1) {
         auto zf = ZFile::zfile_open_ro(file, verify, true);
         if (!zf) {
-            LOG_ERROR_RETURN(0, nullptr, "zfile_open_ro failed, path: `: error: `(`)", file_path,
-                             errno, strerror(errno));
+            LOG_ERRNO_RETURN(0, nullptr, "zfile_open_ro failed, path: `", file_path);
         }
-        LOG_INFO("open file as zfile");
+        LOG_INFO("open file as zfile format, path: `", file_path);
         return zf;
     }
-    LOG_INFO("file is not zfile format");
+    LOG_INFO("file is not zfile format, path: `", file_path);
     return file;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,7 @@ bool BkDownload::download_done() {`
`128`	`128`
`129`	`129`	`int ret = lfs->rename(old_name.c_str(), new_name.c_str());`
`130`	`130`	`if (ret != 0) {`
`131`		- LOG_ERROR("rename(`,`), `:`", old_name, new_name, errno, strerror(errno));
`132`		`- return false;`
	`131`	+ LOG_ERRNO_RETURN(0, false, "rename(`,`) failed", old_name, new_name);
`133`	`132`	`}`
`134`	`133`	LOG_INFO("download verify done. rename(`,`) success", old_name, new_name);
`135`	`134`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -44,15 +44,13 @@ int UnTar::set_file_perms(const char *filename) {`
`44`	`44`	`/* change owner/group */`
`45`	`45`	`if (geteuid() == 0) {`
`46`	`46`	`if (fs->lchown(filename, uid, gid) == -1) {`
`47`		- LOG_ERROR("lchown failed, filename `, `", filename, strerror(errno));
`48`		`- return -1;`
	`47`	+ LOG_ERRNO_RETURN(0, -1, "lchown failed, filename `, uid `, gid `", filename, uid, gid);
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`/* change access/modification time */`
`53`	`52`	`if (fs->lutimes(filename, tv) == -1) {`
`54`		- LOG_ERROR("lutimes failed, filename `, `", filename, strerror(errno));
`55`		`- return -1;`
	`53`	+ LOG_ERRNO_RETURN(0, -1, "lutimes failed, filename `", filename);
`56`	`54`	`}`
`57`	`55`
`58`	`56`	`/* change permissions */`
`@@ -69,8 +67,7 @@ int UnTar::set_file_perms(const char *filename) {`
`69`	`67`	`return 0;`
`70`	`68`	`}`
`71`	`69`	`if (fs->chmod(filename, mode) == -1) {`
`72`		- LOG_ERROR("chmod failed `", strerror(errno));
`73`		`- return -1;`
	`70`	+ LOG_ERRNO_RETURN(0, -1, "chmod failed, filename `, mode `", filename, mode);
`74`	`71`	`}`
`75`	`72`
`76`	`73`	`return 0;`
`@@ -95,8 +92,7 @@ int UnTar::extract_all() {`
`95`	`92`
`96`	`93`	`while ((i = read_header()) == 0) {`
`97`	`94`	`if (extract_file() != 0) {`
`98`		- LOG_ERROR("extract failed, filename `, `", get_pathname(), strerror(errno));
`99`		`- return -1;`
	`95`	+ LOG_ERRNO_RETURN(0, -1, "extract failed, filename `", get_pathname());
`100`	`96`	`}`
`101`	`97`	`if (TH_ISDIR(header)) {`
`102`	`98`	`dirs.emplace_back(std::make_pair(std::string(get_pathname()), header.get_mtime()));`
`@@ -111,8 +107,7 @@ int UnTar::extract_all() {`
`111`	`107`	`tv[0].tv_sec = tv[1].tv_sec = dir.second;`
`112`	`108`	`tv[0].tv_usec = tv[1].tv_usec = 0;`
`113`	`109`	`if (fs->lutimes(path.c_str(), tv) == -1) {`
`114`		- LOG_ERROR("utime failed, filename `, `", dir.first.c_str(), strerror(errno));
`115`		`- return -1;`
	`110`	+ LOG_ERRNO_RETURN(0, -1, "utime failed, filename `", dir.first.c_str());
`116`	`111`	`}`
`117`	`112`	`}`
`118`	`113`
`@@ -151,15 +146,11 @@ int UnTar::extract_file() {`
`151`	`146`	`} else {`
`152`	`147`	`if (!S_ISDIR(s.st_mode)) {`
`153`	`148`	`if (fs->unlink(npath.c_str()) == -1 && errno != ENOENT) {`
`154`		- LOG_ERROR("remove exist file ` failed, `", npath.c_str(), strerror(errno));
`155`		`- errno = EEXIST;`
`156`		`- return -1;`
	`149`	+ LOG_ERRNO_RETURN(EEXIST, -1, "remove exist file ` failed", npath.c_str());
`157`	`150`	`}`
`158`	`151`	`} else if (!TH_ISDIR(header)) {`
`159`	`152`	`if (remove_all(npath) == -1) {`
`160`		- LOG_ERROR("remove exist dir ` failed, `", npath.c_str(), strerror(errno));
`161`		`- errno = EEXIST;`
`162`		`- return -1;`
	`153`	+ LOG_ERRNO_RETURN(EEXIST, -1, "remove exist dir ` failed", npath.c_str());
`163`	`154`	`}`
`164`	`155`	`}`
`165`	`156`	`}`
`@@ -290,8 +281,7 @@ int UnTar::extract_hardlink(const char *filename) {`
`290`	`281`	`char *linktgt = get_linkname();`
`291`	`282`	LOG_DEBUG(" ==> extracting: ` (link to `)", filename, linktgt);
`292`	`283`	`if (fs->link(linktgt, filename) == -1) {`
`293`		- LOG_ERROR("link failed, `", strerror(errno));
`294`		`- return -1;`
	`284`	+ LOG_ERRNO_RETURN(0, -1, "link failed, filename `, linktgt `", filename, linktgt);
`295`	`285`	`}`
`296`	`286`	`return 0;`
`297`	`287`	`}`
`@@ -300,8 +290,7 @@ int UnTar::extract_symlink(const char *filename) {`
`300`	`290`	`char *linktgt = get_linkname();`
`301`	`291`	LOG_DEBUG(" ==> extracting: ` (symlink to `)", filename, linktgt);
`302`	`292`	`if (fs->symlink(linktgt, filename) == -1) {`
`303`		- LOG_ERROR("symlink failed, `", strerror(errno));
`304`		`- return -1;`
	`293`	+ LOG_ERRNO_RETURN(0, -1, "symlink failed, filename `, linktgt `", filename, linktgt);
`305`	`294`	`}`
`306`	`295`	`return 0;`
`307`	`296`	`}`
`@@ -327,8 +316,7 @@ int UnTar::extract_block_char_fifo(const char *filename) {`
`327`	`316`
`328`	`317`	LOG_DEBUG(" ==> extracting: ` (block/char/fifo `,`)", filename, devmaj, devmin);
`329`	`318`	`if (fs->mknod(filename, mode, makedev(devmaj, devmin)) == -1) {`
`330`		- LOG_ERROR("block/char/fifo failed, `", strerror(errno));
`331`		`- return -1;`
	`319`	+ LOG_ERRNO_RETURN(0, -1, "block/char/fifo failed, filename `", filename);
`332`	`320`	`}`
`333`	`321`
`334`	`322`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,9 @@ IFile new_tar_file(IFile file, bool create) {`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`IFile open_tar_file(IFile file) {`
	`335`	`+ if (!file) {`
	`336`	`+ LOG_ERROR_RETURN(0, nullptr, "file is nullptr");`
	`337`	`+ }`
`335`	`338`	`auto ret = is_tar_file(file);`
`336`	`339`	`if (ret == 1) {`
`337`	`340`	`LOG_INFO("open file as tar file");`
Original file line number	Diff line number	Diff line change
`@@ -59,14 +59,12 @@ int UnTar::remove_all(const std::string &path, bool rmdir) {`
`59`	`59`	`return 0;`
`60`	`60`	`}`
`61`	`61`	`} else {`
`62`		- LOG_ERROR("get path ` stat failed, errno `:`", path, errno, strerror(errno));
`63`		`- return -1;`
	`62`	+ LOG_ERRNO_RETURN(0, -1, "get path ` stat failed", path);
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`auto dirs = fs->opendir(path.c_str());`
`67`	`66`	`if (dirs == nullptr) {`
`68`		- LOG_ERROR("open dir ` failed, errno `:`", path, errno, strerror(errno));
`69`		`- return -1;`
	`67`	+ LOG_ERRNO_RETURN(0, -1, "open dir ` failed", path);
`70`	`68`	`}`
`71`	`69`	`dirent *dirInfo;`
`72`	`70`	`while ((dirInfo = dirs->get()) != nullptr) {`
Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,12 @@ static IFile try_open_zfile(IFile file, bool verify, const char *file_path) {`
`46`	`46`	`if (is_zfile == 1) {`
`47`	`47`	`auto zf = ZFile::zfile_open_ro(file, verify, true);`
`48`	`48`	`if (!zf) {`
`49`		- LOG_ERROR_RETURN(0, nullptr, "zfile_open_ro failed, path: `: error: `(`)", file_path,
`50`		`- errno, strerror(errno));`
	`49`	+ LOG_ERRNO_RETURN(0, nullptr, "zfile_open_ro failed, path: `", file_path);
`51`	`50`	`}`
`52`		`- LOG_INFO("open file as zfile");`
	`51`	+ LOG_INFO("open file as zfile format, path: `", file_path);
`53`	`52`	`return zf;`
`54`	`53`	`}`
`55`		`- LOG_INFO("file is not zfile format");`
	`54`	+ LOG_INFO("file is not zfile format, path: `", file_path);
`56`	`55`	`return file;`
`57`	`56`	`}`
`58`	`57`