]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: sort the list of inferred fsids
authorMichael Fritch <mfritch@suse.com>
Mon, 15 Jun 2020 21:22:08 +0000 (15:22 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Jul 2020 09:39:06 +0000 (11:39 +0200)
$ cephadm shell
ERROR: Cannot infer an fsid, one must be specified: ['1d5df33f-eb94-4a4f-b192-1d5e770ed0e7', 'unknown']
$ cephadm shell
ERROR: Cannot infer an fsid, one must be specified: ['unknown', '1d5df33f-eb94-4a4f-b192-1d5e770ed0e7']

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 320956eb5ea5a43f0a0cd93fe580bc8d699eff1b)

src/cephadm/cephadm

index db15be9eec425293d7b3a8a681de1357c8309680..0ff70b01c943e48d8957859fefc8260804b33902 100755 (executable)
@@ -1079,7 +1079,7 @@ def infer_fsid(func):
                 fsids.add(daemon['fsid'])
             elif daemon['name'] == args.name:
                 fsids.add(daemon['fsid'])
-        fsids = list(fsids)
+        fsids = sorted(fsids)
 
         if not fsids:
             # some commands do not always require an fsid