From: Ilya Dryomov <ilya.dryomov@inktank.com>
Date: Tue, 21 Jan 2014 22:27:09 +0000 (+0200)
Subject: mon/MonCommands: 'invalidate+forward' -> 'forward'
X-Git-Tag: v0.78~290^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=339bed1b3b01aa948ee6b08033f311d3d0d3b59b;p=ceph.git

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 ed2bddacaf41..6d476322da25 100644
--- 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 fbd0b431419a..48dea81447a8 100755
--- 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',