From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Tue, 16 Jul 2013 15:46:53 +0000 (+0100)
Subject: mon: Monitor: StoreConverter: sanitize 'store' pointer on init
X-Git-Tag: v0.67-rc1~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e752c40c2332395e3ec93c1c861cf9365d518f27;p=ceph.git

mon: Monitor: StoreConverter: sanitize 'store' pointer on init

We are supposed to have umount'ed the store and set the pointer to NULL.
We should not tolerate any other case on init().

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 5bf0c0ef962f..82b08816702b 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -788,6 +788,7 @@ public:
     bool _check_gv_store();
 
     void _init() {
+      assert(!store);
       MonitorStore *store_ptr = new MonitorStore(path);
       store.reset(store_ptr);
     }