From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Mar 2015 17:30:20 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/hammer'
X-Git-Tag: v9.0.0~86
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2724ce2d1b7411b5027a34005ec2eff0bba78a09;p=ceph.git

Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock
---

2724ce2d1b7411b5027a34005ec2eff0bba78a09
diff --cc src/rgw/rgw_main.cc
index 84c0eda8f14,d15695885bb..5b412777e5c
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@@ -1071,9 -1064,13 +1071,14 @@@ int main(int argc, const char **argv
    FCGX_Init();
  
    int r = 0;
 -  RGWRados *store = RGWStoreManager::get_storage(g_ceph_context, true, true);
 +  RGWRados *store = RGWStoreManager::get_storage(g_ceph_context,
 +      g_conf->rgw_enable_gc_threads, g_conf->rgw_enable_quota_threads);
    if (!store) {
+     mutex.Lock();
+     init_timer.cancel_all_events();
+     init_timer.shutdown();
+     mutex.Unlock();
+ 
      derr << "Couldn't init storage provider (RADOS)" << dendl;
      return EIO;
    }