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

osd: more cleanups Reviewed-by: Samuel Just <sjust@redhat.com>
ceph · Aug 8, 2016 · 94b5837 · 94b5837
2 parents 9efb018 + 30cffa0
commit 94b5837
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -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();
 }
 

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
@@ -1234,7 +1234,7 @@ class OSD : public Dispatcher,
   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) {

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
@@ -176,7 +176,7 @@ class ReplicatedPG : public PG, public PGBackend::Listener {
   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.