73 lines
3.1 KiB
Diff
73 lines
3.1 KiB
Diff
From a446152d676cf5616784e3f8f80dea8fd2ac221a Mon Sep 17 00:00:00 2001
|
|
From: haozi007 <liuhao27@huawei.com>
|
|
Date: Thu, 7 Sep 2023 14:34:01 +0800
|
|
Subject: [PATCH 13/33] improve report error message of client
|
|
|
|
Signed-off-by: haozi007 <liuhao27@huawei.com>
|
|
---
|
|
src/daemon/executor/container_cb/execution_stream.c | 4 ++--
|
|
src/daemon/modules/service/service_container.c | 2 +-
|
|
src/utils/tar/isulad_tar.c | 4 ++--
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/daemon/executor/container_cb/execution_stream.c b/src/daemon/executor/container_cb/execution_stream.c
|
|
index aae9c234..7db96b19 100644
|
|
--- a/src/daemon/executor/container_cb/execution_stream.c
|
|
+++ b/src/daemon/executor/container_cb/execution_stream.c
|
|
@@ -536,7 +536,7 @@ static container_path_stat *do_container_stat_path(const char *rootpath, const c
|
|
nret = lstat(resolvedpath, &st);
|
|
if (nret < 0) {
|
|
SYSERROR("lstat %s failed.", resolvedpath);
|
|
- isulad_set_error_message("lstat %s failed.", resolvedpath);
|
|
+ isulad_set_error_message("Check %s failed, get more information from log.", resolvedpath);
|
|
goto cleanup;
|
|
}
|
|
|
|
@@ -922,7 +922,7 @@ static int copy_to_container_check_path_valid(const container_t *cont, const cha
|
|
nret = lstat(resolvedpath, &st);
|
|
if (nret < 0) {
|
|
SYSERROR("lstat %s failed", resolvedpath);
|
|
- isulad_set_error_message("lstat %s failed", resolvedpath);
|
|
+ isulad_set_error_message("Check %s failed, get more information from log.", resolvedpath);
|
|
goto cleanup;
|
|
}
|
|
|
|
diff --git a/src/daemon/modules/service/service_container.c b/src/daemon/modules/service/service_container.c
|
|
index 370ba059..83d82201 100644
|
|
--- a/src/daemon/modules/service/service_container.c
|
|
+++ b/src/daemon/modules/service/service_container.c
|
|
@@ -596,7 +596,7 @@ static int valid_mount_point(container_config_v2_common_config_mount_points_elem
|
|
|
|
if (lstat(mp->source, &st) != 0) {
|
|
SYSERROR("lstat %s failed", mp->source);
|
|
- isulad_set_error_message("lstat %s failed", mp->source);
|
|
+ isulad_set_error_message("Check %s failed, get more information from log.", mp->source);
|
|
return -1;
|
|
}
|
|
|
|
diff --git a/src/utils/tar/isulad_tar.c b/src/utils/tar/isulad_tar.c
|
|
index bffbb43b..2e61d823 100644
|
|
--- a/src/utils/tar/isulad_tar.c
|
|
+++ b/src/utils/tar/isulad_tar.c
|
|
@@ -192,7 +192,7 @@ struct archive_copy_info *copy_info_source_path(const char *path, bool follow_li
|
|
nret = lstat(resolved_path, &st);
|
|
if (nret < 0) {
|
|
SYSERROR("lstat %s failed", resolved_path);
|
|
- format_errorf(err, "lstat %s failed", resolved_path);
|
|
+ format_errorf(err, "Check %s failed, get more information from log.", resolved_path);
|
|
goto cleanup;
|
|
}
|
|
|
|
@@ -429,7 +429,7 @@ static int tar_resource_rebase(const char *path, const char *rebase, const char
|
|
|
|
if (lstat(path, &st) < 0) {
|
|
SYSERROR("lstat %s failed", path);
|
|
- format_errorf(err, "lstat %s failed", path);
|
|
+ format_errorf(err, "Check %s failed, get more information from log.", path);
|
|
return -1;
|
|
}
|
|
if (util_split_path_dir_entry(path, &srcdir, &srcbase) < 0) {
|
|
--
|
|
2.40.1
|
|
|