remove unused variables from MaintenanceFeature (arangodb#11762)

jsteemann · web-flow · commit 9730fba626bb · 2020-06-04T12:45:05.000+02:00
diff --git a/arangod/Cluster/MaintenanceFeature.cpp b/arangod/Cluster/MaintenanceFeature.cpp
@@ -68,8 +68,7 @@ MaintenanceFeature::MaintenanceFeature(application_features::ApplicationServer&
     : ApplicationFeature(server, "Maintenance"),
       _forceActivation(false),
       _maintenanceThreadsMax(2),
-      _resignLeadershipOnShutdown(false),
-      _currentCounter(0) {
+      _resignLeadershipOnShutdown(false) {
   // the number of threads will be adjusted later. it's just that we want to
   // initialize all members properly
 
@@ -354,16 +353,6 @@ void MaintenanceFeature::beginShutdown() {
 }  // MaintenanceFeature
 
 void MaintenanceFeature::stop() {
-  // There should be no new workers.
-  // Current workers could be stuck on the condition variable.
-  // Let's wake them up now.
-  {
-    // Only if we have flagged shutdown this operation is safe, all other threads potentially
-    // trying to get this mutex get into the shutdown case now, instead of getting into wait state.
-    TRI_ASSERT(_isShuttingDown);
-    std::unique_lock<std::mutex> guard(_currentCounterLock);
-    _currentCounterCondition.notify_all();
-  }
   for (auto const& itWorker : _activeWorkers) {
     CONDITION_LOCKER(cLock, _workerCompletion);
 
diff --git a/arangod/Cluster/MaintenanceFeature.h b/arangod/Cluster/MaintenanceFeature.h
@@ -34,6 +34,8 @@
 #include "ProgramOptions/ProgramOptions.h"
 #include "RestServer/MetricsFeature.h"
 
+#include <memory>
+#include <mutex>
 #include <queue>
 
 namespace arangodb {
@@ -423,15 +425,6 @@ class MaintenanceFeature : public application_features::ApplicationFeature {
 
   std::atomic<std::chrono::steady_clock::duration> _pauseUntil;
 
-  /// @brief Mutex for the current counter condition variable
-  mutable std::mutex _currentCounterLock;
-
-  /// @brief Condition variable where Actions can wait on until _currentCounter increased
-  std::condition_variable _currentCounterCondition;
-
-  /// @brief  counter for load_current requests.
-  uint64_t _currentCounter;
-
  public:
   std::optional<std::reference_wrapper<Histogram<log_scale_t<uint64_t>>>> _phase1_runtime_msec;
   std::optional<std::reference_wrapper<Histogram<log_scale_t<uint64_t>>>> _phase2_runtime_msec;
