From 973023c4592f53d11ddaa50f9b8a7e41da9fdcdf Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Tue, 18 Mar 2025 09:12:08 +0100 Subject: [PATCH 1/2] casadm: Don't try to resolve detached cache path Signed-off-by: Michal Mielewczyk --- casadm/cas_lib.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/casadm/cas_lib.c b/casadm/cas_lib.c index 9e0f201..49c32e9 100644 --- a/casadm/cas_lib.c +++ b/casadm/cas_lib.c @@ -2827,13 +2827,17 @@ int list_caches(unsigned int list_format, bool by_id_path) char cache_ctrl_dev[MAX_STR_LEN] = "-"; float cache_flush_prog; float core_flush_prog; - bool cache_device_detached; + bool cache_device_detached = + ((curr_cache->state & (1 << ocf_cache_state_standby)) | + (curr_cache->state & (1 << ocf_cache_state_detached))); - if (!by_id_path && !curr_cache->standby_detached) { + if (!by_id_path && !cache_device_detached) { if (get_dev_path(curr_cache->device, curr_cache->device, sizeof(curr_cache->device))) { - cas_printf(LOG_WARNING, "WARNING: Cannot resolve path " - "to cache. By-id path will be shown for that cache.\n"); + cas_printf(LOG_WARNING, + "WARNING: Cannot resolve path to " + "cache. By-id path will be shown for " + "that cache.\n"); } } @@ -2859,11 +2863,6 @@ int list_caches(unsigned int list_format, bool by_id_path) } } - cache_device_detached = - ((curr_cache->state & (1 << ocf_cache_state_standby)) | - (curr_cache->state & (1 << ocf_cache_state_detached))) - ; - fprintf(intermediate_file[1], TAG(TREE_BRANCH) "%s,%u,%s,%s,%s,%s\n", "cache", /* type */ From c6f2371aea4d8e5e95f3e673318da7d018bc4235 Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Tue, 18 Mar 2025 09:15:13 +0100 Subject: [PATCH 2/2] casadm: More specific warn for irresolvable cache Signed-off-by: Michal Mielewczyk --- casadm/cas_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/casadm/cas_lib.c b/casadm/cas_lib.c index 49c32e9..bc9acea 100644 --- a/casadm/cas_lib.c +++ b/casadm/cas_lib.c @@ -2836,8 +2836,8 @@ int list_caches(unsigned int list_format, bool by_id_path) sizeof(curr_cache->device))) { cas_printf(LOG_WARNING, "WARNING: Cannot resolve path to " - "cache. By-id path will be shown for " - "that cache.\n"); + "cache %d. By-id path will be shown " + "for that cache.\n", curr_cache->id); } }