RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10231 from yonghengdexin735/wip-zzz-paxosserver-type

Browse Source 
mon/PaxosService: make the return value type inconsistent

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Yuri Weinstein 2016-08-01 14:25:27 -07:00 committed by GitHub
commit e08022f566
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mon/OSDMonitor.cc
View File

@ -1841,7 +1841,7 @@ bool OSDMonitor::prepare_failure(MonOpRequestRef op)
if (m->if_osd_failed()) { if (m->if_osd_failed()) {
// add a report // add a report
mon->clog->debug() << m->get_target() << " reported failed by " 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]; failure_info_t& fi = failure_info[target_osd];
MonOpRequestRef old_op = fi.add_report(reporter, failed_since, op); MonOpRequestRef old_op = fi.add_report(reporter, failed_since, op);
if (old_op) { if (old_op) {

2
src/mon/PaxosService.cc
View File

@ -207,7 +207,7 @@ bool PaxosService::should_stash_full()
*/ */
return (!latest_full || return (!latest_full ||
(latest_full <= get_trim_to()) || (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() void PaxosService::restart()

2
src/tools/rados/rados.cc
View File

@ -377,7 +377,7 @@ static int do_copy_pool(Rados& rados, const char *src_pool, const char *target_p
if (locator.size()) if (locator.size())
src_name += "(@" + locator + ")"; src_name += "(@" + locator + ")";
cout << src_pool << ":" << src_name << " => " 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.locator_set_key(locator);
src_ctx.set_namespace(nspace); src_ctx.set_namespace(nspace);