]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: remove the redudant jugement in paxosservice is_writeable function 10240/head
authorsongbaisen <song.baisen@zte.com.cn>
Mon, 11 Jul 2016 06:30:08 +0000 (14:30 +0800)
committersongbaisen <song.baisen@zte.com.cn>
Mon, 11 Jul 2016 11:00:05 +0000 (19:00 +0800)
   From
  !is_proposing() &&
  !is_proposing() &&
     (paxos->is_active() || paxos->is_updating() || paxos->is_writing())&& have_pending&&
     (paxos->is_active() || paxos->is_updating() || paxos->is_writing())
   To
  !is_proposing() &&
     (paxos->is_active() || paxos->is_updating() || paxos->is_writing())&& have_pending

Signed-off-by: song baisen <song.baisen@zte.com.cn>
src/mon/PaxosService.h

index 4f74e0cbe5c5649dac28ca5029bcbbad71bd6e57..a3a32a18649b4b9f86e5ea46c8c0ba4e57914a9a 100644 (file)
@@ -576,10 +576,7 @@ public:
    * @returns true if writeable; false otherwise
    */
   bool is_writeable() {
-    return
-      !is_proposing() &&
-      is_write_ready() &&
-      (paxos->is_active() || paxos->is_updating() || paxos->is_writing());
+    return is_write_ready(); 
   }
 
   /**