From c1f5f82a2e02597ac2c486caed1bf56b6467ad87 Mon Sep 17 00:00:00 2001 From: gaohuatao Date: Fri, 23 Apr 2021 14:47:34 +0800 Subject: [PATCH 082/104] devmapper: decrease log level of check dm device Signed-off-by: gaohuatao --- .../storage/layer_store/graphdriver/devmapper/deviceset.c | 6 +++--- .../layer_store/graphdriver/devmapper/wrapper_devmapper.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c index 3a271c3a..6ed546bc 100644 --- a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c +++ b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c @@ -437,7 +437,7 @@ static image_devmapper_device_info *load_metadata(const struct device_set *devse } if (!util_file_exists(metadata_file)) { - ERROR("No such file:%s, need not to load", metadata_file); + WARN("No such file:%s, need not to load", metadata_file); goto out; } @@ -2405,6 +2405,7 @@ static int do_check_all_devices(struct device_set *devset) struct stat st; int nret = 0; + // Equal to "dmsetup ls" . That is to say, devices_len is not zero, because isulad-thinpool exists. if (dev_get_device_list(&devices_list, &devices_len) != 0) { ERROR("devicemapper: failed to get device list"); ret = -1; @@ -2511,10 +2512,9 @@ static int do_devmapper_init(struct device_set *devset) goto out; } + // If checking failed, we just print a log, there is no need to process the error that do not affect isulad starting if (do_check_all_devices(devset) != 0) { ERROR("Failed to check all devset devices"); - ret = -1; - goto out; } if (do_init_metadate(devset) != 0) { diff --git a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c index 38ed5615..07d64318 100644 --- a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c +++ b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c @@ -556,8 +556,6 @@ out: return ret; } -// from devmapper_wrapper.go -// FIXME: how to use dm_task_get_names directly static char **local_dm_task_get_names(struct dm_task *dmt, size_t *size) { struct dm_names *ns, *ns1; @@ -566,6 +564,7 @@ static char **local_dm_task_get_names(struct dm_task *dmt, size_t *size) int i = 0; if (!(ns = dm_task_get_names(dmt))) { + ERROR("Failed to get device names list from dm task"); return NULL; } @@ -585,6 +584,7 @@ static char **local_dm_task_get_names(struct dm_task *dmt, size_t *size) result = malloc(sizeof(char *) * (*size)); if (!result) { + ERROR("Out of memory"); return NULL; } @@ -624,7 +624,7 @@ int dev_get_device_list(char ***list, size_t *length) *list = local_dm_task_get_names(dmt, length); if (*list == NULL) { *length = 0; - ERROR("devicemapper: get device list failed"); + ERROR("devicemapper: get device list empty"); ret = -1; goto cleanup; } -- 2.25.1