mirror of
https://github.com/ceph/ceph
synced 2025-02-24 19:47:44 +00:00
test/cli/monmaptool: adjust for the squid monmap features
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
parent
7fc77efe2b
commit
4a81193f70
@ -76,7 +76,7 @@ Compatsets
|
||||
- [x] mon/Monitor.cc (include in `get_supported_features()`)
|
||||
- [x] mon/Monitor.cc (`apply_monmap_to_compatset_features()`)
|
||||
- [x] mon/Monitor.cc (`calc_quorum_requirements()`)
|
||||
- [ ] test/cli/monmaptool/feature-set-unset-list.t (`supported`, `persistent`)
|
||||
- [x] test/cli/monmaptool/feature-set-unset-list.t (`supported`, `persistent`)
|
||||
|
||||
Mon
|
||||
---
|
||||
|
@ -12,21 +12,21 @@
|
||||
required: [none]
|
||||
|
||||
AVAILABLE FEATURES:
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
MONMAP FEATURES:
|
||||
persistent: [none]
|
||||
optional: [none]
|
||||
required: [none]
|
||||
|
||||
AVAILABLE FEATURES:
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
monmap:persistent:[none]
|
||||
monmap:optional:[none]
|
||||
monmap:required:[none]
|
||||
available:supported:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
available:persistent:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
available:supported:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
available:persistent:[kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
|
||||
$ monmaptool --feature-set foo /tmp/test.monmap.1234
|
||||
unknown features name 'foo' or unable to parse value: Expected option value to be integer, got 'foo'
|
||||
@ -45,8 +45,8 @@
|
||||
required: [kraken(1),octopus(32),unknown(4096)]
|
||||
|
||||
AVAILABLE FEATURES:
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
|
||||
$ monmaptool --feature-unset 32 --optional --feature-list /tmp/test.monmap.1234
|
||||
monmaptool: monmap file /tmp/test.monmap.1234
|
||||
@ -56,8 +56,8 @@
|
||||
required: [kraken(1),octopus(32),unknown(4096)]
|
||||
|
||||
AVAILABLE FEATURES:
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
|
||||
|
||||
$ monmaptool --feature-unset 32 --persistent --feature-unset 4096 --optional --feature-list /tmp/test.monmap.1234
|
||||
@ -68,8 +68,8 @@
|
||||
required: [kraken(1)]
|
||||
|
||||
AVAILABLE FEATURES:
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
|
||||
|
||||
$ monmaptool --feature-unset kraken --feature-list /tmp/test.monmap.1234
|
||||
@ -80,8 +80,8 @@
|
||||
required: [none]
|
||||
|
||||
AVAILABLE FEATURES:
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512)]
|
||||
supported: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
persistent: [kraken(1),luminous(2),mimic(4),osdmap-prune(8),nautilus(16),octopus(32),pacific(64),elector-pinging(128),quincy(256),reef(512),squid(1024)]
|
||||
monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
|
||||
|
||||
$ rm /tmp/test.monmap.1234
|
||||
|
Loading…
Reference in New Issue
Block a user