X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fmon%2FMonCommands.h;h=97d77d625eb8b7b719db14075c395fb25fa5e897;hb=c07f9fc5a4f48397831383549fb0482b93480643;hp=bd255fe5b2e5470774f7876893f801ee825f4a69;hpb=9439ae556f035e65c9c107ae13ddd09457dbbecd;p=ceph.git diff --git a/ceph/src/mon/MonCommands.h b/ceph/src/mon/MonCommands.h index bd255fe5b..97d77d625 100644 --- a/ceph/src/mon/MonCommands.h +++ b/ceph/src/mon/MonCommands.h @@ -154,7 +154,9 @@ COMMAND("auth print-key name=entity,type=CephString", "display requested key", \ "auth", "rx", "cli,rest") COMMAND("auth print_key name=entity,type=CephString", "display requested key", \ "auth", "rx", "cli,rest") -COMMAND("auth list", "list authentication state", "auth", "rx", "cli,rest") +COMMAND_WITH_FLAG("auth list", "list authentication state", "auth", "rx", "cli,rest", + FLAG(DEPRECATED)) +COMMAND("auth ls", "list authentication state", "auth", "rx", "cli,rest") COMMAND("auth import", "auth import: read keyring file from -i ", \ "auth", "rwx", "cli,rest") COMMAND("auth add " \ @@ -204,11 +206,15 @@ COMMAND("log last " "name=level,type=CephChoices,strings=debug|info|sec|warn|error,req=false " "name=channel,type=CephChoices,strings=*|cluster|audit,req=false", \ "print last few lines of the cluster log", \ - "mon", "rw", "cli,rest") + "mon", "r", "cli,rest") COMMAND_WITH_FLAG("injectargs " \ "name=injected_args,type=CephString,n=N", \ "inject config arguments into monitor", "mon", "rw", "cli,rest", FLAG(NOFORWARD)) +COMMAND("config set " \ + "name=key,type=CephString name=value,type=CephString", + "Set a configuration option at runtime (not persistent)", + "mon", "rw", "cli,rest") COMMAND("status", "show cluster status", "mon", "r", "cli,rest") COMMAND("health name=detail,type=CephChoices,strings=detail,req=false", \ "show cluster health", "mon", "r", "cli,rest") @@ -273,6 +279,10 @@ COMMAND("mon count-metadata name=property,type=CephString", COMMAND("mon versions", "check running versions of monitors", "mon", "r", "cli,rest") +COMMAND("versions", + "check running versions of ceph daemons", + "mon", "r", "cli,rest") + /* @@ -450,7 +460,7 @@ COMMAND("osd dump " \ "print summary of OSD map", "osd", "r", "cli,rest") COMMAND("osd tree " \ "name=epoch,type=CephInt,range=0,req=false " \ - "name=states,type=CephChoices,strings=up|down|in|out,n=N,req=false", \ + "name=states,type=CephChoices,strings=up|down|in|out|destroyed,n=N,req=false", \ "print OSD tree", "osd", "r", "cli,rest") COMMAND("osd ls " \ "name=epoch,type=CephInt,range=0,req=false", \ @@ -492,7 +502,8 @@ COMMAND("osd lspools " \ COMMAND("osd blacklist ls", "show blacklisted clients", "osd", "r", "cli,rest") COMMAND("osd blacklist clear", "clear all blacklisted clients", "osd", "rw", "cli,rest") -COMMAND("osd crush rule list", "list crush rules", "osd", "r", "cli,rest") +COMMAND_WITH_FLAG("osd crush rule list", "list crush rules", "osd", "r", "cli,rest", + FLAG(DEPRECATED)) COMMAND("osd crush rule ls", "list crush rules", "osd", "r", "cli,rest") COMMAND("osd crush rule dump " \ "name=name,type=CephString,goodchars=[A-Za-z0-9-_.],req=false", \ @@ -535,6 +546,11 @@ COMMAND("osd crush set-device-class " \ "set the of the osd(s) [...]," \ "or use to set all.", \ "osd", "rw", "cli,rest") +COMMAND("osd crush rm-device-class " \ + "name=ids,type=CephString,n=N", \ + "remove class of the osd(s) [...]," \ + "or use to remove all.", \ + "osd", "rw", "cli,rest") COMMAND("osd crush create-or-move " \ "name=id,type=CephOsdName " \ "name=weight,type=CephFloat,range=0.0 " \ @@ -596,7 +612,7 @@ COMMAND("osd crush set-tunable " \ COMMAND("osd crush get-tunable " \ "name=tunable,type=CephChoices,strings=straw_calc_version", "get crush tunable ", - "osd", "rw", "cli,rest") + "osd", "r", "cli,rest") COMMAND("osd crush show-tunables", \ "show current crush tunables", "osd", "r", "cli,rest") COMMAND("osd crush rule create-simple " \ @@ -621,22 +637,14 @@ COMMAND("osd crush rule create-erasure " \ COMMAND("osd crush rule rm " \ "name=name,type=CephString,goodchars=[A-Za-z0-9-_.] ", \ "remove crush rule ", "osd", "rw", "cli,rest") -COMMAND("osd crush tree", +COMMAND("osd crush tree " + "name=shadow,type=CephChoices,strings=--show-shadow,req=false", \ "dump crush buckets and items in a tree view", "osd", "r", "cli,rest") -COMMAND("osd crush class create " \ - "name=class,type=CephString,goodchars=[A-Za-z0-9-_]", \ - "create crush device class ", \ - "osd", "rw", "cli,rest") COMMAND("osd crush class rm " \ "name=class,type=CephString,goodchars=[A-Za-z0-9-_]", \ "remove crush device class ", \ "osd", "rw", "cli,rest") -COMMAND("osd crush class rename " \ - "name=srcname,type=CephString,goodchars=[A-Za-z0-9-_] " \ - "name=dstname,type=CephString,goodchars=[A-Za-z0-9-_]", \ - "rename crush device class to ", \ - "osd", "rw", "cli,rest") COMMAND("osd crush class ls", \ "list all crush device classes", \ "osd", "r", "cli,rest") @@ -644,6 +652,37 @@ COMMAND("osd crush class ls-osd " \ "name=class,type=CephString,goodchars=[A-Za-z0-9-_]", \ "list all osds belonging to the specific ", \ "osd", "r", "cli,rest") +COMMAND("osd crush weight-set ls", + "list crush weight sets", + "osd", "r", "cli,rest") +COMMAND("osd crush weight-set dump", + "dump crush weight sets", + "osd", "r", "cli,rest") +COMMAND("osd crush weight-set create-compat", + "create a default backward-compatible weight-set", + "osd", "rw", "cli,rest") +COMMAND("osd crush weight-set create " \ + "name=pool,type=CephPoolname "\ + "name=mode,type=CephChoices,strings=flat|positional", + "create a weight-set for a given pool", + "osd", "rw", "cli,rest") +COMMAND("osd crush weight-set rm name=pool,type=CephPoolname", + "remove the weight-set for a given pool", + "osd", "rw", "cli,rest") +COMMAND("osd crush weight-set rm-compat", + "remove the backward-compatible weight-set", + "osd", "rw", "cli,rest") +COMMAND("osd crush weight-set reweight " \ + "name=pool,type=CephPoolname " \ + "name=item,type=CephString " \ + "name=weight,type=CephFloat,range=0.0,n=N", + "set weight for an item (bucket or osd) in a pool's weight-set", + "osd", "rw", "cli,rest") +COMMAND("osd crush weight-set reweight-compat " \ + "name=item,type=CephString " \ + "name=weight,type=CephFloat,range=0.0,n=N", + "set weight for an item (bucket or osd) in the backward-compatible weight-set", + "osd", "rw", "cli,rest") COMMAND("osd setmaxosd " \ "name=newmax,type=CephInt,range=0", \ "set new maximum osd value", "osd", "rw", "cli,rest") @@ -683,7 +722,7 @@ COMMAND("osd erasure-code-profile ls", \ "list all erasure code profiles", \ "osd", "r", "cli,rest") COMMAND("osd set " \ - "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|require_jewel_osds|require_kraken_osds", \ + "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|recovery_deletes|require_jewel_osds|require_kraken_osds", \ "set ", "osd", "rw", "cli,rest") COMMAND("osd unset " \ "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent", \ @@ -766,6 +805,10 @@ COMMAND("osd reweightn " \ "name=weights,type=CephString", "reweight osds with {: ,...})", "osd", "rw", "cli,rest") +COMMAND("osd force-create-pg " \ + "name=pgid,type=CephPgid ", + "force creation of pg ", + "osd", "rw", "cli,rest") COMMAND("osd pg-temp " \ "name=pgid,type=CephPgid " \ "name=id,type=CephOsdName,n=N,req=false", \ @@ -893,6 +936,31 @@ COMMAND("osd pool get-quota " \ "name=pool,type=CephPoolname ", "obtain object or byte limits for pool", "osd", "r", "cli,rest") +COMMAND("osd pool application enable " \ + "name=pool,type=CephPoolname " \ + "name=app,type=CephString,goodchars=[A-Za-z0-9-_.] " \ + "name=force,type=CephChoices,strings=--yes-i-really-mean-it,req=false", \ + "enable use of an application [cephfs,rbd,rgw] on pool ", + "osd", "rw", "cli,rest") +COMMAND("osd pool application disable " \ + "name=pool,type=CephPoolname " \ + "name=app,type=CephString " \ + "name=force,type=CephChoices,strings=--yes-i-really-mean-it,req=false", \ + "disables use of an application on pool ", + "osd", "rw", "cli,rest") +COMMAND("osd pool application set " \ + "name=pool,type=CephPoolname " \ + "name=app,type=CephString " \ + "name=key,type=CephString,goodchars=[A-Za-z0-9-_.] " \ + "name=value,type=CephString,goodchars=[A-Za-z0-9-_.=]", + "sets application metadata key to on pool ", + "osd", "rw", "cli,rest") +COMMAND("osd pool application rm " \ + "name=pool,type=CephPoolname " \ + "name=app,type=CephString " \ + "name=key,type=CephString", + "removes application metadata key on pool ", + "osd", "rw", "cli,rest") COMMAND("osd utilization", "get basic pg distribution stats", "osd", "r", "cli,rest") @@ -944,10 +1012,15 @@ COMMAND("osd tier add-cache " \ COMMAND("config-key get " \ "name=key,type=CephString", \ "get ", "config-key", "r", "cli,rest") -COMMAND("config-key put " \ +COMMAND("config-key set " \ "name=key,type=CephString " \ "name=val,type=CephString,req=false", \ - "put , value ", "config-key", "rw", "cli,rest") + "set to value ", "config-key", "rw", "cli,rest") +COMMAND_WITH_FLAG("config-key put " \ + "name=key,type=CephString " \ + "name=val,type=CephString,req=false", \ + "put , value ", "config-key", "rw", "cli,rest", + FLAG(DEPRECATED)) COMMAND("config-key del " \ "name=key,type=CephString", \ "delete ", "config-key", "rw", "cli,rest") @@ -957,7 +1030,9 @@ COMMAND("config-key rm " \ COMMAND("config-key exists " \ "name=key,type=CephString", \ "check for 's existence", "config-key", "r", "cli,rest") -COMMAND("config-key list ", "list keys", "config-key", "r", "cli,rest") +COMMAND_WITH_FLAG("config-key list ", "list keys", "config-key", "r", "cli,rest", + FLAG(DEPRECATED)) +COMMAND("config-key ls ", "list keys", "config-key", "r", "cli,rest") COMMAND("config-key dump", "dump keys and values", "config-key", "r", "cli,rest") @@ -979,3 +1054,12 @@ COMMAND("mgr module enable " \ COMMAND("mgr module disable " \ "name=module,type=CephString", "disable mgr module", "mgr", "rw", "cli,rest") +COMMAND("mgr metadata name=id,type=CephString,req=false", + "dump metadata for all daemons or a specific daemon", + "mgr", "r", "cli,rest") +COMMAND("mgr count-metadata name=property,type=CephString", + "count ceph-mgr daemons by metadata field property", + "mgr", "r", "cli,rest") +COMMAND("mgr versions", \ + "check running versions of ceph-mgr daemons", + "mgr", "r", "cli,rest")