diff --git a/fdbserver/TagThrottler.actor.cpp b/fdbserver/TagThrottler.actor.cpp index 979ddff53e..043999848a 100644 --- a/fdbserver/TagThrottler.actor.cpp +++ b/fdbserver/TagThrottler.actor.cpp @@ -137,19 +137,12 @@ class TagThrottlerImpl { } } - /* - Optional autoThrottleTag(TransactionTag tag, double busyness) { - return throttledTags.autoThrottleTag(id, tag, busyness); - } - */ - Future tryUpdateAutoThrottling(TransactionTag tag, double rate, double busyness, TagThrottledReason reason) { // NOTE: before the comparison with MIN_TAG_COST, the busiest tag rate also compares with MIN_TAG_PAGES_RATE // currently MIN_TAG_PAGES_RATE > MIN_TAG_COST in our default knobs. if (busyness > SERVER_KNOBS->AUTO_THROTTLE_TARGET_TAG_BUSYNESS && rate > SERVER_KNOBS->MIN_TAG_COST) { TEST(true); // Transaction tag auto-throttled - Optional clientRate = - throttledTags.autoThrottleTag(id, tag, busyness); // autoThrottleTag(tag, busyness); + Optional clientRate = throttledTags.autoThrottleTag(id, tag, busyness); if (clientRate.present()) { TagSet tags; tags.addTag(tag); diff --git a/fdbserver/TagThrottler.h b/fdbserver/TagThrottler.h index 99ce15126e..69e3909c7d 100644 --- a/fdbserver/TagThrottler.h +++ b/fdbserver/TagThrottler.h @@ -28,7 +28,7 @@ class TagThrottler { public: TagThrottler(Database db, UID id); - ~ITagThrottler(); + ~TagThrottler(); // Poll the system keyspace looking for updates made through the tag throttling API Future monitorThrottlingChanges(); @@ -36,7 +36,7 @@ public: // Increment the number of known requests associated with the specified tag void addRequests(TransactionTag tag, int count); - // This throttled tag change ID is used to coordinate updates with the + // This throttled tag change ID is used to coordinate updates with the GRV proxies uint64_t getThrottledTagChangeId() const; // For each tag and priority combination, return the throughput limit and expiration time @@ -50,5 +50,5 @@ public: // Based on the busiest read and write tags in the provided storage queue info, update // tag throttling limits. - Future tryAutoThrottleTag(StorageQueueInfo&, int64_t storageQueue, int64_t storageDurabilityLag); + Future tryUpdateAutoThrottling(StorageQueueInfo const&); };