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

Merge pull request #505 from Ostrokrzew/fix

Browse Source 
Few fixes after recent changes
This commit is contained in:
Robert Baldyga 2020-08-26 10:59:53 +02:00 committed by GitHub
commit ecebb52b46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
casadm/cas_lib.c
View File

@ -971,9 +971,7 @@ int start_cache(uint16_t cache_id, unsigned int cache_init,
if (!cmd.metadata_mode_optimal) if (!cmd.metadata_mode_optimal)
cas_printf(LOG_NOTICE, "Selected metadata mode is not optimal for device %s.\n" cas_printf(LOG_NOTICE, "Selected metadata mode is not optimal for device %s.\n"
"You can improve cache performance by formating your device\n" "You can improve cache performance by formatting your device\n",
"to use optimal metadata mode with following command:\n"
"casadm --nvme --format atomic --device %s\n",
cache_device, cache_device); cache_device, cache_device);
check_cache_scheduler(cache_device, check_cache_scheduler(cache_device,

11
test/functional/api/cas/cli_help_messages.py
View File

@ -22,7 +22,6 @@ casadm_help = [
r"-E --flush-core Flush dirty data of a given core from the caching device " r"-E --flush-core Flush dirty data of a given core from the caching device "
r"to this core device", r"to this core device",
r"-C --io-class Manage IO classes", r"-C --io-class Manage IO classes",
r"-N --nvme Manage NVMe namespace",
r"-V --version Print CAS version", r"-V --version Print CAS version",
r"-H --help Print help", r"-H --help Print help",
r"--zero-metadata Clear metadata from caching device", r"--zero-metadata Clear metadata from caching device",
@ -45,16 +44,6 @@ version_help = [
r"-o --output-format \<FORMAT\> Output format: \{table|csv\}" r"-o --output-format \<FORMAT\> Output format: \{table|csv\}"
] ]
nvme_help = [
r"Usage: casadm --nvme --format \<MODE\> --device \<DEVICE\> \[option\.\.\.\]",
r"Manage NVMe namespace",
r"Options that are valid with --nvme \(-N\) are:",
r"-F --format \<MODE\> Change NVMe metadata mode \{normal|atomic\} "
r"WARNING: Reboot required\!",
r"-d --device \<DEVICE\> NVMe device to be formatted",
r"-f --force Force NVMe format"
]
ioclass_help = [ ioclass_help = [
r"Usage: casadm --io-class \{--load-config|--list\}", r"Usage: casadm --io-class \{--load-config|--list\}",
r"Manage IO classes", r"Manage IO classes",

6
test/functional/tests/cli/test_cli_help_and_version.py
View File

@ -81,10 +81,6 @@ def test_cli_help(shortcut):
+ (" -H" if shortcut else " --help")) + (" -H" if shortcut else " --help"))
check_stdout_msg(output, ioclass_help) check_stdout_msg(output, ioclass_help)
output = TestRun.executor.run("casadm" + (" -N" if shortcut else " --nvme")
+ (" -H" if shortcut else " --help"))
check_stdout_msg(output, nvme_help)
output = TestRun.executor.run("casadm" + (" -V" if shortcut else " --version") output = TestRun.executor.run("casadm" + (" -V" if shortcut else " --version")
+ (" -H" if shortcut else " --help")) + (" -H" if shortcut else " --help"))
check_stdout_msg(output, version_help) check_stdout_msg(output, version_help)
@ -126,5 +122,5 @@ def names_in_output(output):
def versions_in_output(output): def versions_in_output(output):
version_pattern = re.compile(r"(\d){2}\.(\d){2}\.(\d){2}\.(\d){8}") version_pattern = re.compile(r"(\d){2}\.(\d){2}\.(\d)\.(\d){4}.(\S)")
return len(version_pattern.findall(output)) == 3 return len(version_pattern.findall(output)) == 3