From: David Disseldorp <ddiss@suse.de>
Date: Wed, 2 Dec 2015 00:46:40 +0000 (+0100)
Subject: ceph-disk: warn for prepare partitions with bad GUIDs
X-Git-Tag: v10.0.3~144^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ca41e1d2345979e9e25c358cdbd12724bf898c6;p=ceph.git

ceph-disk: warn for prepare partitions with bad GUIDs

If ceph-disk is a given partition device argument for prepare, it leaves
the GPT GUID as is and doesn't check whether the partition's existing
GUID matches the expected value. Print a warning in such cases.

Fixes: #13943

Signed-off-by: David Disseldorp <ddiss@suse.de>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 7f4a00988f3..83f85eb4fa0 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1599,6 +1599,11 @@ def prepare_dev(
     if is_partition(data):
         LOG.debug('OSD data device %s is a partition', data)
         rawdev = data
+
+        ptype = get_partition_type(rawdev)
+        if ptype != ptype_osd:
+                LOG.warning('incorrect partition UUID: %s, expected %s'
+                            % (ptype, ptype_osd))
     else:
         LOG.debug('Creating osd partition on %s', data)
         try: