github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

casadm: improve cache conf stats in standby mode

Browse Source 
When cache is in standby mode config section of cache stats should contain only
relevant information.

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2022-03-03 09:41:45 +01:00
parent a628833ae1
commit 4c991a9dec
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
casadm/statistics_model.c
View File

@ -537,6 +537,9 @@ int cache_stats_conf(int ctrl_fd, const struct kcas_cache_info *cache_info,
const char *cache_path; const char *cache_path;
char dev_path[MAX_STR_LEN]; char dev_path[MAX_STR_LEN];
int inactive_cores; int inactive_cores;
bool standby = (cache_info->info.state & (1 << ocf_cache_state_standby));
bool standby_detached = cache_info->info.standby_detached;
bool cache_exported_obj_exists = (standby && !standby_detached);
if (strnlen(cache_info->cache_path_name, sizeof(cache_info->cache_path_name)) == 0) { if (strnlen(cache_info->cache_path_name, sizeof(cache_info->cache_path_name)) == 0) {
cache_path = "-"; cache_path = "-";
@ -561,6 +564,12 @@ int cache_stats_conf(int ctrl_fd, const struct kcas_cache_info *cache_info,
print_kv_pair(outfile, "Cache Device", "%s", print_kv_pair(outfile, "Cache Device", "%s",
cache_path); cache_path);
if (cache_exported_obj_exists) {
print_kv_pair(outfile, "Exported Object", "/dev/cas-cache-%d",
cache_info->cache_id);
} else {
print_kv_pair(outfile, "Exported Object", "-");
}
print_kv_pair(outfile, "Core Devices", "%d", print_kv_pair(outfile, "Core Devices", "%d",
cache_info->info.core_count); cache_info->info.core_count);
inactive_cores = get_inactive_core_count(cache_info); inactive_cores = get_inactive_core_count(cache_info);
@ -568,11 +577,11 @@ int cache_stats_conf(int ctrl_fd, const struct kcas_cache_info *cache_info,
return FAILURE; return FAILURE;
print_kv_pair(outfile, "Inactive Core Devices", "%d", inactive_cores); print_kv_pair(outfile, "Inactive Core Devices", "%d", inactive_cores);
print_kv_pair(outfile, "Write Policy", "%s", print_kv_pair(outfile, "Write Policy", "%s", standby ? "-" :
cache_mode_to_name(cache_info->info.cache_mode)); cache_mode_to_name(cache_info->info.cache_mode));
print_kv_pair(outfile, "Cleaning Policy", "%s", print_kv_pair(outfile, "Cleaning Policy", "%s", standby ? "-" :
cleaning_policy_to_name(cache_info->info.cleaning_policy)); cleaning_policy_to_name(cache_info->info.cleaning_policy));
print_kv_pair(outfile, "Promotion Policy", "%s", print_kv_pair(outfile, "Promotion Policy", "%s", standby ? "-" :
promotion_policy_to_name(cache_info->info.promotion_policy)); promotion_policy_to_name(cache_info->info.promotion_policy));
print_kv_pair(outfile, "Cache line size", "%llu, [KiB]", print_kv_pair(outfile, "Cache line size", "%llu, [KiB]",
cache_info->info.cache_line_size / KiB); cache_info->info.cache_line_size / KiB);