From 328ab2d9f0a27aa38d153469f8ed11e21a6c3ae8 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Tue, 27 Nov 2018 14:39:09 +0300 Subject: [PATCH] osd/OSD: OSD::mkfs asserts when reusing disk with existing superblock. Fixes: http://tracker.ceph.com/issues/37404 Signed-off-by: Igor Fedotov --- src/osd/OSD.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 9b3a7a361040..18c183222ee3 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1935,6 +1935,9 @@ int OSD::mkfs(CephContext *cct, ObjectStore *store, uuid_d fsid, int whoami) } umount_store: + if (ch) { + ch.reset(); + } store->umount(); free_store: delete store; -- 2.47.3