From 0cfd05db57beb994a788ece6af685abb606c6907 Mon Sep 17 00:00:00 2001
From: Yan Jun <yan.jun8@zte.com.cn>
Date: Wed, 12 Jul 2017 14:20:33 +0800
Subject: [PATCH] osd: cleanups

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
---
 src/common/config.cc          |  4 ++--
 src/global/global_init.cc     |  2 +-
 src/os/filestore/FileStore.cc | 12 ++++++------
 src/osd/OSD.cc                | 11 +++++++----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/common/config.cc b/src/common/config.cc
index 2981e4f01fe08..5cbbd85e97be0 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -711,11 +711,11 @@ void md_config_t::call_all_observers()
 
     expand_all_meta();
 
-    for (obs_map_t::iterator r = observers.begin(); r != observers.end(); ++r) {
+    for (auto r = observers.begin(); r != observers.end(); ++r) {
       obs[r->second].insert(r->first);
     }
   }
-  for (std::map<md_config_obs_t*,std::set<std::string> >::iterator p = obs.begin();
+  for (auto p = obs.begin();
        p != obs.end();
        ++p) {
     p->first->handle_conf_change(this, p->second);
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index a8833c5eb19c5..e5e19e0796f30 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -114,7 +114,7 @@ void global_pre_init(std::vector < const char * > *alt_def_args,
         dout_emergency(oss.str());
         _exit(1);
       } else {
-        derr <<"did not load config file, using default settings." << dendl;
+        derr << "did not load config file, using default settings." << dendl;
       }
     }
   }
diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 8a3a5a1db9f61..15a83dac0a736 100644
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -820,7 +820,7 @@ int FileStore::mkfs()
   basedir_fd = ::open(basedir.c_str(), O_RDONLY);
   if (basedir_fd < 0) {
     ret = -errno;
-    derr << "mkfs failed to open base dir " << basedir << ": " << cpp_strerror(ret) << dendl;
+    derr << __FUNC__ << ": failed to open base dir " << basedir << ": " << cpp_strerror(ret) << dendl;
     return ret;
   }
 
@@ -829,7 +829,7 @@ int FileStore::mkfs()
   fsid_fd = ::open(fsid_fn, O_RDWR|O_CREAT, 0644);
   if (fsid_fd < 0) {
     ret = -errno;
-    derr << "mkfs: failed to open " << fsid_fn << ": " << cpp_strerror(ret) << dendl;
+    derr << __FUNC__ << ": failed to open " << fsid_fn << ": " << cpp_strerror(ret) << dendl;
     goto close_basedir_fd;
   }
 
@@ -841,9 +841,9 @@ int FileStore::mkfs()
   if (read_fsid(fsid_fd, &old_fsid) < 0 || old_fsid.is_zero()) {
     if (fsid.is_zero()) {
       fsid.generate_random();
-      dout(1) << "mkfs generated fsid " << fsid << dendl;
+      dout(1) << __FUNC__ << ": generated fsid " << fsid << dendl;
     } else {
-      dout(1) << "mkfs using provided fsid " << fsid << dendl;
+      dout(1) << __FUNC__ << ": using provided fsid " << fsid << dendl;
     }
 
     fsid.print(fsid_str);
@@ -867,7 +867,7 @@ int FileStore::mkfs()
 	   << cpp_strerror(ret) << dendl;
       goto close_fsid_fd;
     }
-    dout(10) << "mkfs fsid is " << fsid << dendl;
+    dout(10) << __FUNC__ << ": fsid is " << fsid << dendl;
   } else {
     if (!fsid.is_zero() && fsid != old_fsid) {
       derr << __FUNC__ << ": on-disk fsid " << old_fsid << " != provided " << fsid << dendl;
@@ -907,7 +907,7 @@ int FileStore::mkfs()
 #if defined(__linux__)
   if (basefs.f_type == BTRFS_SUPER_MAGIC &&
       !g_ceph_context->check_experimental_feature_enabled("btrfs")) {
-    derr <<__FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
+    derr << __FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
     goto close_fsid_fd;
   }
 #endif
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 90b11fe484f26..4c9ad76fba2f9 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1717,7 +1717,8 @@ int OSD::mkfs(CephContext *cct, ObjectStore *store, const string &dev,
 
   ret = store->mkfs();
   if (ret) {
-    derr << "OSD::mkfs: ObjectStore::mkfs failed with error " << ret << dendl;
+    derr << "OSD::mkfs: ObjectStore::mkfs failed with error "
+         << cpp_strerror(ret) << dendl;
     goto free_store;
   }
 
@@ -1725,7 +1726,8 @@ int OSD::mkfs(CephContext *cct, ObjectStore *store, const string &dev,
 
   ret = store->mount();
   if (ret) {
-    derr << "OSD::mkfs: couldn't mount ObjectStore: error " << ret << dendl;
+    derr << "OSD::mkfs: couldn't mount ObjectStore: error "
+         << cpp_strerror(ret) << dendl;
     goto free_store;
   }
 
@@ -1764,7 +1766,7 @@ int OSD::mkfs(CephContext *cct, ObjectStore *store, const string &dev,
     ret = store->apply_transaction(osr.get(), std::move(t));
     if (ret) {
       derr << "OSD::mkfs: error while writing OSD_SUPERBLOCK_GOBJECT: "
-	   << "apply_transaction returned " << ret << dendl;
+	   << "apply_transaction returned " << cpp_strerror(ret) << dendl;
       goto umount_store;
     }
   }
@@ -1775,7 +1777,8 @@ int OSD::mkfs(CephContext *cct, ObjectStore *store, const string &dev,
 
   ret = write_meta(store, sb.cluster_fsid, sb.osd_fsid, whoami);
   if (ret) {
-    derr << "OSD::mkfs: failed to write fsid file: error " << ret << dendl;
+    derr << "OSD::mkfs: failed to write fsid file: error "
+         << cpp_strerror(ret) << dendl;
     goto umount_store;
   }
 
-- 
2.39.5