summaryrefslogtreecommitdiffstats
path: root/src/mon/MonCommands.h
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2014-03-04 06:11:17 +0100
committerSage Weil <sage@inktank.com>2014-03-04 06:11:17 +0100
commit08efb45889a5d91d105678bf10724aee1851d8f9 (patch)
tree65ddff74df5e3c5b44a3af82de38ab2fec7c6a30 /src/mon/MonCommands.h
parentMerge pull request #1331 from ceph/wip-cache-pool (diff)
downloadceph-08efb45889a5d91d105678bf10724aee1851d8f9.tar.xz
ceph-08efb45889a5d91d105678bf10724aee1851d8f9.zip
OSDMonitor: do not add non-empty tier pool unless forced
In general, users should not use non-empty pools as new tiers or else things can behave strangely: - the data sets are unrelated behavior will be... strange. - if the cache pool is not "new" and does not do the OMAP flag, the OSD will not know not to flush omap objects to an EC base tier - probably other random stuff I'm forgetting Allow a user to shoot themselves in the foot with --force-nonempty. Implements: #7457 Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/mon/MonCommands.h')
-rw-r--r--src/mon/MonCommands.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index b84b26567c5..230bd1014b1 100644
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -552,7 +552,8 @@ COMMAND("osd thrash " \
// tiering
COMMAND("osd tier add " \
"name=pool,type=CephPoolname " \
- "name=tierpool,type=CephPoolname",
+ "name=tierpool,type=CephPoolname " \
+ "name=force_nonempty,type=CephChoices,strings=--force-nonempty,req=false",
"add the tier <tierpool> to base pool <pool>", "osd", "rw", "cli,rest")
COMMAND("osd tier remove " \
"name=pool,type=CephPoolname " \