diff options
| author | Joao Eduardo Luis <joao.luis@inktank.com> | 2013-07-16 16:45:39 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-16 10:33:37 -0700 |
| commit | 0ea89760def73f76d8100889eca3c25b0a6eb772 (patch) | |
| tree | cb233d5c3136a1341a07cdafbce8bb435cb1b795 | |
| parent | 595c09df9134fb0d62144fe1594914c90e567dca (diff) | |
| download | ceph-0ea89760def73f76d8100889eca3c25b0a6eb772.tar.gz | |
mon: Monitor: do not reopen MonitorDBStore during conversion
We already open the store on ceph_mon.cc, before we start the conversion.
Given we are unable to reproduce this every time a conversion is triggered,
we are led to believe that this causes a race in leveldb that will lead
to 'store.db/LOCK' being locked upon the open this patch removes.
Regardless, reopening the db here is pointless as we already did it when
we reach Monitor::StoreConverter::convert().
Fixes: #5640
Backport: cuttlefish
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 036e6739a4e873863bae3d7d00f310c015dfcdb3)
| -rw-r--r-- | src/mon/Monitor.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 127754f01f6..6aae6fe3510 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -4525,7 +4525,6 @@ out: int Monitor::StoreConverter::convert() { _init(); - assert(!db->create_and_open(std::cerr)); assert(!store->mount()); if (db->exists("mon_convert", "on_going")) { dout(0) << __func__ << " found a mon store in mid-convertion; abort!" |