Skip to content

Commit 93f0f19

Browse files
committed
Remove rate limit divisor
1 parent 2ad8fe7 commit 93f0f19

File tree

6 files changed

+0
-41
lines changed

6 files changed

+0
-41
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/RequestExecutor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ public interface RequestExecutor {
2121

2222
void shutdown();
2323

24-
void updateRateLimitDivisor(int newDivisor);
25-
2624
boolean isShutdown();
2725

2826
boolean isTerminated();

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/sender/HttpRequestSender.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,6 @@ public void start() {
113113
}
114114
}
115115

116-
public void updateRateLimitDivisor(int rateLimitDivisor) {
117-
service.updateRateLimitDivisor(rateLimitDivisor);
118-
}
119-
120116
private void waitForStartToComplete() {
121117
try {
122118
if (startCompleted.await(START_COMPLETED_WAIT_TIME.getSeconds(), TimeUnit.SECONDS) == false) {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/sender/RequestExecutorService.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -162,19 +162,6 @@ public int queueSize() {
162162
return rateLimitGroupings.values().stream().mapToInt(RateLimitingEndpointHandler::queueSize).sum();
163163
}
164164

165-
@Override
166-
public void updateRateLimitDivisor(int numResponsibleNodes) {
167-
// in the unlikely case where we get an invalid value, we'll just ignore it
168-
if (numResponsibleNodes <= 0) {
169-
return;
170-
}
171-
172-
rateLimitDivisor.set(numResponsibleNodes);
173-
for (var rateLimitingEndpointHandler : rateLimitGroupings.values()) {
174-
rateLimitingEndpointHandler.updateTokensPerTimeUnit(rateLimitDivisor.get());
175-
}
176-
}
177-
178165
/**
179166
* Begin servicing tasks.
180167
* <p>
@@ -393,22 +380,12 @@ static class RateLimitingEndpointHandler {
393380
rateLimitSettings.requestsPerTimeUnit(),
394381
rateLimitSettings.timeUnit()
395382
);
396-
397-
this.updateTokensPerTimeUnit(rateLimitDivisor);
398383
}
399384

400385
public void init() {
401386
requestExecutorServiceSettings.registerQueueCapacityCallback(id, this::onCapacityChange);
402387
}
403388

404-
/**
405-
* @param divisor - divisor to divide the initial requests per time unit by
406-
*/
407-
private synchronized void updateTokensPerTimeUnit(Integer divisor) {
408-
double updatedTokensPerTimeUnit = (double) originalRequestsPerTimeUnit / divisor;
409-
rateLimiter.setRate(ACCUMULATED_TOKENS_LIMIT, updatedTokensPerTimeUnit, rateLimitSettings.timeUnit());
410-
}
411-
412389
public String id() {
413390
return id;
414391
}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/sender/Sender.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ void send(
2727
ActionListener<InferenceServiceResults> listener
2828
);
2929

30-
void updateRateLimitDivisor(int rateLimitDivisor);
31-
3230
void sendWithoutQueuing(
3331
Logger logger,
3432
Request request,

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/client/AmazonBedrockRequestSender.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ protected AmazonBedrockRequestSender(
9797
this.startCompleted = Objects.requireNonNull(startCompleted);
9898
}
9999

100-
@Override
101-
public void updateRateLimitDivisor(int rateLimitDivisor) {
102-
executorService.updateRateLimitDivisor(rateLimitDivisor);
103-
}
104-
105100
@Override
106101
public void start() {
107102
if (started.compareAndSet(false, true)) {

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/amazonbedrock/client/AmazonBedrockMockRequestSender.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ public void start() {
7070
// do nothing
7171
}
7272

73-
@Override
74-
public void updateRateLimitDivisor(int rateLimitDivisor) {
75-
// do nothing
76-
}
77-
7873
@Override
7974
public void send(
8075
RequestManager requestCreator,

0 commit comments

Comments
 (0)