]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk-prepare: assume parted failure means no partition table
authorSage Weil <sage@inktank.com>
Fri, 26 Oct 2012 01:14:47 +0000 (18:14 -0700)
committerSage Weil <sage@inktank.com>
Tue, 30 Oct 2012 17:40:58 +0000 (10:40 -0700)
If the disk has no valid label we get an error like

  Error: /dev/sdi: unrecognised disk label

Assume any error we get is that and go with an id label of 1.

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

index ec3dd8250f3c05349587d93c81351cb34974b738..66f889aff428260ccff88968a96e71518642901c 100755 (executable)
@@ -227,7 +227,8 @@ def get_free_partition_index(dev):
                 ],
             )
     except subprocess.CalledProcessError as e:
-        raise PrepareError('cannot read partition index', e)
+        print 'cannot read partition index; assume it isn\'t present\n'
+        return 1
 
     if not lines:
         raise PrepareError('parted failed to output anything')