From 59379658b403e02afbf242585e0dc35cbb795abf Mon Sep 17 00:00:00 2001 From: "zhang.zezhu" Date: Mon, 11 Jul 2016 01:53:00 +0000 Subject: [PATCH] mon/PaxosService.cc:the returned value type is inconsistent Signed-off-by: zhang.zezhu --- src/mon/OSDMonitor.cc | 2 +- src/mon/PaxosService.cc | 2 +- src/tools/rados/rados.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 801ae887f80..8cefaf7f61d 100644 --- 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 7c8ae8e5ad8..28d94c1c8be 100644 --- 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 79d03f8f877..06aa2a79e87 100644 --- 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); -- 2.39.5