cleanup post-rebase

Author: ajkr

include/rocksdb/rate_limiter.h

@@ -150,10 +150,6 @@ class RateLimiter {
 // @auto_tuned: Enables dynamic adjustment of rate limit within the range
 //              `[rate_bytes_per_sec / 20, rate_bytes_per_sec]`, according to
 //              the recent demand for background I/O.
-//
-// Thread-safety notes:
-// - The object returned by this function is not thread-safe to use with
-//   Configurable APIs, e.g., `GetOptionsFromString()`.
 extern RateLimiter* NewGenericRateLimiter(
     int64_t rate_bytes_per_sec, int64_t refill_period_us = 100 * 1000,
     int32_t fairness = 10,

util/rate_limiter.cc

@@ -97,12 +97,16 @@ GenericRateLimiter::~GenericRateLimiter() {
 
 // This API allows user to dynamically change rate limiter's bytes per second.
 void GenericRateLimiter::SetBytesPerSecond(int64_t bytes_per_second) {
-  assert(bytes_per_second > 0);
-  // TODO: Configurable may simultaneously mutate `options_` (a
-  // `GenericRateLimiterOptions`) without locking internally.
   MutexLock g(&request_mutex_);
-  options_.max_bytes_per_sec = bytes_per_second;
-  InitializeLocked();
+  SetBytesPerSecondLocked(bytes_per_second);
+}
+
+void GenericRateLimiter::SetBytesPerSecondLocked(int64_t bytes_per_second) {
+  assert(bytes_per_second > 0);
+  rate_bytes_per_sec_.store(bytes_per_second, std::memory_order_relaxed);
+  refill_bytes_per_period_.store(
+      CalculateRefillBytesPerPeriodLocked(bytes_per_second),
+      std::memory_order_relaxed);
 }
 
 void GenericRateLimiter::Request(int64_t bytes, const Env::IOPriority pri,
@@ -351,9 +355,7 @@ Status GenericRateLimiter::TuneLocked() {
     new_bytes_per_sec = prev_bytes_per_sec;
   }
   if (new_bytes_per_sec != prev_bytes_per_sec) {
-    rate_bytes_per_sec_ = new_bytes_per_sec;
-    refill_bytes_per_period_ =
-        CalculateRefillBytesPerPeriodLocked(rate_bytes_per_sec_);
+    SetBytesPerSecondLocked(new_bytes_per_sec);
   }
   num_drains_ = 0;
   return Status::OK();

util/rate_limiter.h

@@ -98,14 +98,15 @@ class GenericRateLimiter : public RateLimiter {
   virtual void TEST_SetClock(std::shared_ptr<SystemClock> clock) {
     MutexLock g(&request_mutex_);
     clock_ = std::move(clock);
-    next_refill_us_ = NowMicrosMonotonic();
+    next_refill_us_ = NowMicrosMonotonicLocked();
   }
 
  private:
   void RefillBytesAndGrantRequestsLocked();
   std::vector<Env::IOPriority> GeneratePriorityIterationOrderLocked();
   int64_t CalculateRefillBytesPerPeriodLocked(int64_t rate_bytes_per_sec);
   Status TuneLocked();
+  void SetBytesPerSecondLocked(int64_t bytes_per_second);
 
   uint64_t NowMicrosMonotonicLocked() {
     return clock_->NowNanos() / std::milli::den;