RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10548 from xiexingguo/xxg-wip-osd-2016-08-02

Browse Source 
osd: more cleanups

Reviewed-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Yuri Weinstein 2016-08-08 16:24:16 -07:00 committed by GitHub
commit 94b5837b59
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/osd/OSD.cc
View File

@ -465,7 +465,6 @@ void OSDService::start_shutdown()
{
{
Mutex::Locker l(agent_timer_lock);
agent_timer.cancel_all_events();
agent_timer.shutdown();
}
}
@ -1116,6 +1115,7 @@ void OSDService::dec_scrubs_active()
dout(20) << "dec_scrubs_active " << scrubs_active << " -> " << (scrubs_active-1)
<< " (max " << cct->_conf->osd_max_scrubs << ", pending " << scrubs_pending << ")" << dendl;
--scrubs_active;
assert(scrubs_active >= 0);
sched_scrub_lock.Unlock();
}

2
src/osd/OSD.h
View File

@ -1234,7 +1234,7 @@ protected:
bool asok_command(string command, cmdmap_t& cmdmap, string format, ostream& ss);
public:
ClassHandler *class_handler;
ClassHandler *class_handler = nullptr;
int get_nodeid() { return whoami; }
static ghobject_t get_osdmap_pobject_name(epoch_t epoch) {

2
src/osd/ReplicatedPG.h
View File

@ -176,7 +176,7 @@ public:
protected:
CopyCallback() {}
/**
* results.get<0>() is the return code: 0 for success; -ECANCELLED if
* results.get<0>() is the return code: 0 for success; -ECANCELED if
* the operation was cancelled by the local OSD; -errno for other issues.
* results.get<1>() is a pointer to a CopyResults object, which you are
* responsible for deleting.