mon/MonCommands: 'invalidate+forward' -> 'forward'

Commit 4e439857a694 introduced invalidate+forward cache mode, commit
81279e3bb6e0 renamed it to forward, but missed the CLI.  Fix it.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index ed2bddacaf4187dcbe135a56066d6db973511fc8..6d476322da2592f9957325febf6be24e805ff0d3 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -553,7 +553,7 @@ COMMAND("osd tier remove " \
        "remove the tier <tierpool> from base pool <pool>", "osd", "rw", "cli,rest")
 COMMAND("osd tier cache-mode " \
        "name=pool,type=CephPoolname " \
-       "name=mode,type=CephChoices,strings=none|writeback|invalidate+forward|readonly", \
+       "name=mode,type=CephChoices,strings=none|writeback|forward|readonly", \
        "specify the caching mode for cache tier <pool>", "osd", "rw", "cli,rest")
 COMMAND("osd tier set-overlay " \
        "name=pool,type=CephPoolname " \

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index fbd0b431419a42d92430571a60572c0c7d7f1007..48dea81447a887d72a09e6163e3a787a1d7ddbbf 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -1004,7 +1004,7 @@ class TestOSD(TestArgparse):
                                                         'toomany']))
 
     def test_tier_cache_mode(self):
-        for mode in ('none', 'writeback', 'invalidate+forward', 'readonly'):
+        for mode in ('none', 'writeback', 'forward', 'readonly'):
             self.assert_valid_command(['osd', 'tier', 'cache-mode',
                                        'poolname', mode])
         assert_equal({}, validate_command(sigdict, ['osd', 'tier',