ceph: drop --threshold hack for 'pg dump_stuck'

We can live with the incompatibility here; the hack is currently
not working anyway (see #5623).

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 1fec78e7c2ffd0d6e77e825ba80aceb71871836b..e5993ca52d04eb115975e92412621d3a64f67ec4 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -4,3 +4,7 @@ v0.67
 * The output of 'ceph status --format=json' or 'ceph -s --format=json'
   has changed to return status information in a more structured and
   usable format.
+
+* The 'ceph pg dump_stuck [threshold]' command used to require a
+  --threshold or -t prefix to the threshold argument, but now does
+  not.

diff --git a/src/ceph.in b/src/ceph.in
index 1118d6cba93f5a058ea1eadec8ab341e0f123dd1..b5b6f4b0d384460a10ac9f0d1470fd75450b683e 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -142,8 +142,6 @@ def parse_cmdargs(args=None, target=''):
 
     parser.add_argument('-f', '--format', choices=['json', 'json-pretty',
                         'xml', 'xml-pretty', 'plain'], dest='output_format')
-    # for pg dump_stuck
-    parser.add_argument('--threshold', type=int, help='number of seconds for a pg to be considered stuck for pg dump_stuck')
 
     # returns a Namespace with the parsed args, and a list of all extras
     parsed_args, extras = parser.parse_known_args(args)
@@ -683,8 +681,6 @@ def main():
             compat = True
             if parsed_args.output_format:
                 childargs.extend(['--format', parsed_args.output_format])
-            if parsed_args.threshold:
-                childargs.extend(['--threshold', parsed_args.threshold])
             ret, outbuf, outs = send_command(cluster_handle, target, childargs,
                                              inbuf)
         elif ret:

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 9ec74673a9ea64dc5df2ff17efed99969f105fe8..9236462edd95b1b3a001b805ffd4b49482cc6803 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -122,7 +122,7 @@ COMMAND("pg dump_pools_json", "show pg pools info in json only",\
 COMMAND("pg dump_stuck " \
        "name=stuckops,type=CephChoices,strings=inactive|unclean|stale,n=N,req=false " \
        "name=threshold,type=CephInt,req=false",
-       "show information about stuck pgs [--threshold=seconds to consider stuck]",\
+       "show information about stuck pgs",\
        "pg", "r", "cli,rest")
 COMMAND("pg map name=pgid,type=CephPgid", "show mapping of pg to osds", \
        "pg", "r", "cli,rest")

diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py
index 6b0bc8a82435ae9d1a0bb509f5f20f2e90fc4cd0..15b04a8e06c3181a3943d81e3b8e2e33cece807d 100644 (file)
--- a/src/pybind/ceph_argparse.py
+++ b/src/pybind/ceph_argparse.py
@@ -874,9 +874,6 @@ def validate_command(parsed_args, sigdict, args, verbose=False):
         if parsed_args.output_format:
             valid_dict['format'] = parsed_args.output_format
 
-        if parsed_args.threshold:
-            valid_dict['threshold'] = parsed_args.threshold
-
         return valid_dict
 
 def send_command(cluster, target=('mon', ''), cmd=[], inbuf='', timeout=0,