MB-20852: Remove unused 'force' parameter from scheduleVBStatePersist() 76/67876/6
authorDave Rigby <daver@couchbase.com>
Tue, 13 Sep 2016 13:06:04 +0000 (14:06 +0100)
committerDave Rigby <daver@couchbase.com>
Tue, 27 Sep 2016 13:48:41 +0000 (13:48 +0000)
'force' is always false, so remove it.

Change-Id: I02e245b2a0237697c9abc4d55e2a9117cf4ca214
Reviewed-on: http://review.couchbase.org/67876
Reviewed-by: Manu Dhundi <manu@couchbase.com>
Tested-by: buildbot <build@couchbase.com>
src/ep.cc
src/ep.h

index 1f76432..f207e45 100644 (file)
--- a/src/ep.cc
+++ b/src/ep.cc
@@ -1421,11 +1421,12 @@ void EventuallyPersistentStore::scheduleVBSnapshot(VBSnapshotTask::Priority prio
 }
 
 void EventuallyPersistentStore::scheduleVBStatePersist(VBStatePersistTask::Priority priority,
-                                                       uint16_t vbid,
-                                                       bool force) {
+                                                       uint16_t vbid) {
+
+
     bool inverse = false;
-    if (force ||
-        schedule_vbstate_persist[vbid].compare_exchange_strong(inverse, true)) {
+    if (schedule_vbstate_persist[vbid].compare_exchange_strong(inverse, true)) {
+
         if (priority == VBStatePersistTask::Priority::HIGH) {
             ExecutorPool::get()->schedule(new VBStatePersistTaskHigh(&engine, vbid, true), WRITER_TASK_IDX);
         } else {
index e29ce83..febe94d 100644 (file)
--- a/src/ep.h
+++ b/src/ep.h
@@ -703,8 +703,8 @@ public:
     /**
      * Schedule a vbstate persistence task for a given vbucket.
      */
-    void scheduleVBStatePersist(VBStatePersistTask::Priority prio, uint16_t vbid,
-                                bool force = false);
+    void scheduleVBStatePersist(VBStatePersistTask::Priority prio,
+                                uint16_t vbid);
 
     /**
      * Persist a vbucket's state.