mon/PaxosService.cc:the returned value type is inconsistent

Signed-off-by: zhang.zezhu <zhang.zezhu@zte.com.cn>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 801ae887f80621f22b9da5b0f19e1f3a97f733e8..8cefaf7f61d72540f86f0ae202de0eefbdff8c35 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1833,7 +1833,7 @@ bool OSDMonitor::prepare_failure(MonOpRequestRef op)
   if (m->if_osd_failed()) {
     // add a report
     mon->clog->debug() << m->get_target() << " reported failed by "
-                     << m->get_orig_source_inst() << "\n";
+                       << m->get_orig_source_inst() << "\n";
     failure_info_t& fi = failure_info[target_osd];
     MonOpRequestRef old_op = fi.add_report(reporter, failed_since, op);
     if (old_op) {

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index 7c8ae8e5ad841b1c234dc58d96ce0bf1ae81913f..28d94c1c8bed44a4def05a40b0506d88a7d73657 100644 (file)
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -207,7 +207,7 @@ bool PaxosService::should_stash_full()
    */
   return (!latest_full ||
          (latest_full <= get_trim_to()) ||
-         (get_last_committed() - latest_full > (unsigned)g_conf->paxos_stash_full_interval));
+         (get_last_committed() - latest_full > (version_t)g_conf->paxos_stash_full_interval));
 }
 
 void PaxosService::restart()

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 79d03f8f87781bf90e54522f473fb1ffa6d38bff..06aa2a79e870d0f361b63b6b5a62e34a2de8aa41 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -374,7 +374,7 @@ static int do_copy_pool(Rados& rados, const char *src_pool, const char *target_p
     if (locator.size())
         src_name += "(@" + locator + ")";
     cout << src_pool << ":" << src_name  << " => "
-      << target_pool << ":" << target_name << std::endl;
+         << target_pool << ":" << target_name << std::endl;
 
     src_ctx.locator_set_key(locator);
     src_ctx.set_namespace(nspace);