From: John Spray Date: Sun, 19 Jan 2014 18:00:10 +0000 (+0000) Subject: Remove some almost-duplicate COMMAND definitions X-Git-Tag: v0.78~210^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c78c3002381fbf2fd594e0e99f7b9006af0c9444;p=ceph.git Remove some almost-duplicate COMMAND definitions These seem to have been added twice in 8985e1c9e and then in 7b42deef3. The second version looks more correct. Signed-off-by: John Spray --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index f192f479c2e..e356070c473 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3936,8 +3936,6 @@ COMMAND("list_missing " \ "list missing objects on this pg, perhaps starting at an offset given in JSON", "osd", "r", "cli,rest") -// tell commands. Validation of osd.n must be special-cased in client - // tell commands. Validation of osd.n must be special-cased in client COMMAND("version", "report version of OSD", "osd", "r", "cli,rest") COMMAND("injectargs " \ @@ -3968,19 +3966,6 @@ COMMAND("dump_pg_recovery_stats", "dump pg recovery statistics", "osd", "r", "cli,rest") COMMAND("reset_pg_recovery_stats", "reset pg recovery statistics", "osd", "rw", "cli,rest") - -// experiment: restate pg commands as "tell ". Validation of -// pgid must be special-cased in client. -COMMAND("query", - "show details of a specific pg", "osd", "r", "cli,rest") -COMMAND("mark_unfound_lost revert " \ - "name=mulcmd,type=CephChoices,strings=revert", \ - "mark all unfound objects in this pg as lost, either removing or reverting to a prior version if one is available", - "osd", "rw", "cli,rest") -COMMAND("list_missing " \ - "name=offset,type=CephString,req=false", - "list missing objects on this pg, perhaps starting at an offset given in JSON", - "osd", "rw", "cli,rest") }; void OSD::do_command(Connection *con, tid_t tid, vector& cmd, bufferlist& data)