merge flush core and cache commands

Signed-off-by: Damian Raczkowski <damian.raczkowski@intel.com>
This commit is contained in:
Damian Raczkowski 2022-09-29 14:55:25 +02:00
parent 5069652fb4
commit 4a933f603b
2 changed files with 8 additions and 34 deletions

View File

@ -1262,25 +1262,16 @@ int handle_reset_counters()
command_args_values.core_id);
}
static cli_option flush_core_options[] = {
{'i', "cache-id", CACHE_ID_DESC, 1, "ID", CLI_OPTION_REQUIRED},
{'j', "core-id", CORE_ID_DESC, 1, "ID", CLI_OPTION_REQUIRED},
{0}
};
int handle_flush_core()
{
return flush_core(command_args_values.cache_id,
command_args_values.core_id);
}
static cli_option flush_cache_options[] = {
{'i', "cache-id", CACHE_ID_DESC, 1, "ID", CLI_OPTION_REQUIRED},
{'j', "core-id", CORE_ID_DESC, 1, "ID", CLI_OPTION_OPTIONAL_ARG},
{0}
};
int handle_flush_cache()
{
if(command_args_values.core_id != OCF_CORE_ID_INVALID)
return flush_core(command_args_values.cache_id, command_args_values.core_id);
return flush_cache(command_args_values.cache_id);
}
@ -2342,17 +2333,6 @@ static cli_command cas_commands[] = {
.flags = CLI_SU_REQUIRED,
.help = NULL,
},
{
.name = "flush-core",
.short_name = 'E',
.desc = "Flush dirty data of a given core from the caching device to this core device",
.long_desc = NULL,
.options = flush_core_options,
.command_handle_opts = command_handle_option,
.handle = handle_flush_core,
.flags = CLI_SU_REQUIRED,
.help = NULL,
},
{
.name = "io-class",
.short_name = 'C',

View File

@ -48,7 +48,7 @@ cleaning. Cleaning may be required if cache is full and eviction (replacement)
policy needs to remove stale data to make space for incoming blocks. Open CAS
provides mechanism which automatically cleans dirty data in background. This is
cleaning (flushing) thread. User can also invoke manual cleaning procedure (see
-E, --flush-cache and -F --flush-core options). Write-Back cache, also known as
--flush-cache, -F options). Write-Back cache, also known as
Write Cache, improves performance of both read and write IO operations.
.TP
@ -123,9 +123,6 @@ Reset statistics of given cache/core instance.
.B -F, --flush-cache
Flush all dirty data from the caching device to core devices.
.TP
.B -E, --flush-core
Flush dirty data of a given core from the caching device to this core device.
.TP
.B -C, --io-class {--load-config|--list}
@ -554,14 +551,11 @@ is not specified, statistics are reset for all cores within given cache instance
.B -i, --cache-id <ID>
Identifier of cache instance <1-16384>.
.SH Options that are valid with --flush-core (-E) are:
.TP
.B -i, --cache-id <ID>
Identifier of cache instance <1-16384>.
.TP
.B -j, --core-id <ID>
Identifier of core instance <0-4095> within given cache instance.
Identifier of core instance <0-4095> within given cache instance. This is an
optional parameter When provided, it will flush core with provided id
connected to cache. In other case it will flush cache.
.SH Options that are valid with --io-class --load-config (-C -C) are:
.TP