From: xie xingguo Date: Fri, 20 May 2016 09:31:31 +0000 (+0800) Subject: mon: fix assert triggerred by the deprecated "scrubq" state X-Git-Tag: v11.0.0~383^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db9ac7ea7e11975a92ce7f861a06c2856b955500;p=ceph.git mon: fix assert triggerred by the deprecated "scrubq" state Signed-off-by: xie xingguo --- diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index 7fe688de1de0..040b3c6b3c56 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1330,6 +1330,7 @@ function test_mon_pg() ceph pg ls ceph pg ls 0 ceph pg ls stale + expect_false ceph pg ls scrubq ceph pg ls active stale repair recovering ceph pg ls 0 active ceph pg ls 0 active stale diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index 36120f991db1..0d84b2579aef 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -141,21 +141,21 @@ COMMAND("pg dump_stuck " \ "pg", "r", "cli,rest") COMMAND("pg ls-by-pool " \ "name=poolstr,type=CephString " \ - "name=states,type=CephChoices,strings=active|clean|down|replay|splitting|scrubbing|scrubq|degraded|inconsistent|peering|repair|recovering|backfill_wait|incomplete|stale|remapped|deep_scrub|backfill|backfill_toofull|recovery_wait|undersized|activating|peered,n=N,req=false ", \ + "name=states,type=CephChoices,strings=active|clean|down|replay|splitting|scrubbing|degraded|inconsistent|peering|repair|recovering|backfill_wait|incomplete|stale|remapped|deep_scrub|backfill|backfill_toofull|recovery_wait|undersized|activating|peered,n=N,req=false ", \ "list pg with pool = [poolname | poolid]", "pg", "r", "cli,rest") COMMAND("pg ls-by-primary " \ "name=osd,type=CephOsdName " \ "name=pool,type=CephInt,req=false " \ - "name=states,type=CephChoices,strings=active|clean|down|replay|splitting|scrubbing|scrubq|degraded|inconsistent|peering|repair|recovering|backfill_wait|incomplete|stale|remapped|deep_scrub|backfill|backfill_toofull|recovery_wait|undersized|activating|peered,n=N,req=false ", \ + "name=states,type=CephChoices,strings=active|clean|down|replay|splitting|scrubbing|degraded|inconsistent|peering|repair|recovering|backfill_wait|incomplete|stale|remapped|deep_scrub|backfill|backfill_toofull|recovery_wait|undersized|activating|peered,n=N,req=false ", \ "list pg with primary = [osd]", "pg", "r", "cli,rest") COMMAND("pg ls-by-osd " \ "name=osd,type=CephOsdName " \ "name=pool,type=CephInt,req=false " \ - "name=states,type=CephChoices,strings=active|clean|down|replay|splitting|scrubbing|scrubq|degraded|inconsistent|peering|repair|recovering|backfill_wait|incomplete|stale|remapped|deep_scrub|backfill|backfill_toofull|recovery_wait|undersized|activating|peered,n=N,req=false ", \ + "name=states,type=CephChoices,strings=active|clean|down|replay|splitting|scrubbing|degraded|inconsistent|peering|repair|recovering|backfill_wait|incomplete|stale|remapped|deep_scrub|backfill|backfill_toofull|recovery_wait|undersized|activating|peered,n=N,req=false ", \ "list pg on osd [osd]", "pg", "r", "cli,rest") COMMAND("pg ls " \ "name=pool,type=CephInt,req=false " \ - "name=states,type=CephChoices,strings=active|clean|down|replay|splitting|scrubbing|scrubq|degraded|inconsistent|peering|repair|recovering|backfill_wait|incomplete|stale|remapped|deep_scrub|backfill|backfill_toofull|recovery_wait|undersized|activating|peered,n=N,req=false ", \ + "name=states,type=CephChoices,strings=active|clean|down|replay|splitting|scrubbing|degraded|inconsistent|peering|repair|recovering|backfill_wait|incomplete|stale|remapped|deep_scrub|backfill|backfill_toofull|recovery_wait|undersized|activating|peered,n=N,req=false ", \ "list pg with specific pool, osd, state", "pg", "r", "cli,rest") COMMAND("pg map name=pgid,type=CephPgid", "show mapping of pg to osds", \ "pg", "r", "cli,rest")