From 3c606278800aea105ace4822ef783fe26a39e1e1 Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Sat, 25 Aug 2007 17:20:54 +0000
Subject: [PATCH] fixed osd_hack_fast_startup and monitor shutdown

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1688 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/mon/Monitor.cc | 1 -
 trunk/ceph/mon/Monitor.h  | 3 +++
 trunk/ceph/osd/PG.cc      | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/trunk/ceph/mon/Monitor.cc b/trunk/ceph/mon/Monitor.cc
index bca81c93329f3..7400f0fc107de 100644
--- a/trunk/ceph/mon/Monitor.cc
+++ b/trunk/ceph/mon/Monitor.cc
@@ -137,7 +137,6 @@ void Monitor::shutdown()
   
   // die.
   messenger->shutdown();
-  delete messenger;
 }
 
 
diff --git a/trunk/ceph/mon/Monitor.h b/trunk/ceph/mon/Monitor.h
index 934916760e28c..ba23175a1dad7 100644
--- a/trunk/ceph/mon/Monitor.h
+++ b/trunk/ceph/mon/Monitor.h
@@ -136,6 +136,9 @@ public:
     osdmon(0), mdsmon(0), clientmon(0)
   {
   }
+  ~Monitor() {
+    delete messenger;
+  }
 
   void init();
   void shutdown();
diff --git a/trunk/ceph/osd/PG.cc b/trunk/ceph/osd/PG.cc
index b7c1a9261163f..d49fcad38199a 100644
--- a/trunk/ceph/osd/PG.cc
+++ b/trunk/ceph/osd/PG.cc
@@ -883,8 +883,8 @@ void PG::activate(ObjectStore::Transaction& t,
   }
 
   // if primary..
-  if (role == 0) {
-    //&&      osd->osdmap->post_mkfs()) {
+  if (role == 0 &&
+      (!g_conf.osd_hack_fast_startup || osd->osdmap->post_mkfs())) {
     // who is clean?
     clean_set.clear();
     if (info.is_clean()) 
-- 
2.39.5