]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Cosmetic ceph_osd.cc.
authorMatt Benjamin <matt@cohortfs.com>
Tue, 23 Dec 2014 21:37:38 +0000 (16:37 -0500)
committerMatt Benjamin <matt@cohortfs.com>
Wed, 14 Jan 2015 21:43:08 +0000 (16:43 -0500)
Signed-off-by: Matt Benjamin <matt@cohortfs.com>
src/ceph_osd.cc

index 827e06e857a9899205b5bce088905d3541a034ce..a4595da54d0fc3dea69745e72ad5ba9f764e742e 100644 (file)
@@ -31,7 +31,6 @@ using namespace std;
 
 #include "mon/MonMap.h"
 
-
 #include "msg/Messenger.h"
 
 #include "common/Timer.h"
@@ -431,7 +430,7 @@ int main(int argc, const char **argv)
   //try to poison pill any OSD connections on the wrong address
   ms_public->set_policy(entity_name_t::TYPE_OSD,
                        Messenger::Policy::stateless_server(0,0));
-  
+
   ms_cluster->set_default_policy(Messenger::Policy::stateless_server(0, 0));
   ms_cluster->set_policy(entity_name_t::TYPE_MON, Messenger::Policy::lossy_client(0,0));
   ms_cluster->set_policy(entity_name_t::TYPE_OSD,
@@ -488,16 +487,17 @@ int main(int argc, const char **argv)
     return -1;
 
   osd = new OSD(g_ceph_context,
-               store,
-               whoami,
-               ms_cluster,
-               ms_public,
-               ms_hbclient,
-               ms_hb_front_server,
-               ms_hb_back_server,
-               ms_objecter,
-               &mc,
-               g_conf->osd_data, g_conf->osd_journal);
+                store,
+                whoami,
+                ms_cluster,
+                ms_public,
+                ms_hbclient,
+                ms_hb_front_server,
+                ms_hb_back_server,
+                ms_objecter,
+                &mc,
+                g_conf->osd_data,
+                g_conf->osd_journal);
 
   int err = osd->pre_init();
   if (err < 0) {
@@ -552,6 +552,7 @@ int main(int argc, const char **argv)
   delete ms_hb_back_server;
   delete ms_cluster;
   delete ms_objecter;
+
   client_byte_throttler.reset();
   client_msg_throttler.reset();
   g_ceph_context->put();