]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph: accept osd.* as a valid name
authorSage Weil <sage@inktank.com>
Wed, 12 Jun 2013 21:53:56 +0000 (14:53 -0700)
committerSage Weil <sage@inktank.com>
Wed, 12 Jun 2013 21:53:56 +0000 (14:53 -0700)
This will be used for 'ceph tell osd.* ...'

Signed-off-by: Sage Weil <sage@inktank.com>
src/ceph.in

index 18e518669dc395e55c036fe883b4fe8309918204..4e899ce0f75a8208bfc22fa44a8badb9d0dd2d47 100755 (executable)
@@ -365,10 +365,11 @@ class CephName(CephArgtype):
             if not t in ('osd', 'mon', 'client', 'mds'):
                 raise ArgumentValid('unknown type ' + self.t)
             if t == 'osd':
-                try:
-                    i = int(i)
-                except:
-                    raise ArgumentFormat('osd id ' + i + ' not integer')
+                if i != '*':
+                    try:
+                        i = int(i)
+                    except:
+                        raise ArgumentFormat('osd id ' + i + ' not integer')
             self.nametype = t
         self.val = s
         self.nameid = i