diff options
author | Sage Weil <sage@inktank.com> | 2013-07-13 14:09:10 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-07-15 14:05:21 -0700 |
commit | daf767230913c56eef32856f09e75f884a32f6d0 (patch) | |
tree | bc0a749a17d6c45412c8b9098aaf5ee89643d8a9 | |
parent | 4282971d47b90484e681ff1a71ae29569dbd1d32 (diff) | |
download | ceph-daf767230913c56eef32856f09e75f884a32f6d0.tar.gz |
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>
-rw-r--r-- | PendingReleaseNotes | 4 | ||||
-rwxr-xr-x | src/ceph.in | 4 | ||||
-rw-r--r-- | src/mon/MonCommands.h | 2 | ||||
-rw-r--r-- | src/pybind/ceph_argparse.py | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 1fec78e7c2f..e5993ca52d0 100644 --- 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 1118d6cba93..b5b6f4b0d38 100755 --- 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 9ec74673a9e..9236462edd9 100644 --- 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 6b0bc8a8243..15b04a8e06c 100644 --- 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, |