Skip to content

[fix](feut) fix flakey MetaServiceProxyTest #66219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mymeiyi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix](feut) fix flakey MetaServiceProxyTest #66219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions fe/fe-core/src/test/java/org/apache/doris/cloud/rpc/MetaServiceProxyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.doris.common.jmockit.Deencapsulation;
import org.apache.doris.rpc.RpcException;

import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import org.junit.After;
import org.junit.Assert;
Expand Down Expand Up @@ -315,11 +316,18 @@ public void testGetInstanceRateLimitedBeforeRpc() throws RpcException {

@Test
public void testGetVisibleVersionAsyncRateLimitedBeforeRpc() throws RpcException {
enableRateLimit(1, "", 1, 0);
// Consume limitForPeriod = qpsPerCore * CPU_CORES * burstSeconds in one weighted request.
// A long burst window also prevents a refresh before the assertion if the scheduler stalls.
int qpsPerCore = 1;
int rateLimitBurstSeconds = 60;
int limitForPeriod = qpsPerCore * CPU_CORES * rateLimitBurstSeconds;
enableRateLimit(qpsPerCore, "", rateLimitBurstSeconds, 0);
MetaServiceProxy proxy = new MetaServiceProxy();
MetaServiceClient client = mockNormalClient();
putClient(proxy, client);
consumeRateLimitPermits(proxy, "getPartitionVersion");
Mockito.when(client.getVisibleVersionAsync(Mockito.any()))
.thenReturn(Futures.immediateFuture(okGetVersionResponse()));
proxy.getVisibleVersionAsync(buildBatchPartitionVersionRequest(limitForPeriod));

try {
proxy.getVisibleVersionAsync(Cloud.GetVersionRequest.newBuilder().build());
Expand All @@ -328,7 +336,7 @@ public void testGetVisibleVersionAsyncRateLimitedBeforeRpc() throws RpcException
Assert.assertTrue(e.getMessage().contains("meta service rpc rate limited"));
}

Mockito.verify(client, Mockito.never()).getVisibleVersionAsync(Mockito.any());
Mockito.verify(client, Mockito.times(1)).getVisibleVersionAsync(Mockito.any());
Mockito.verify(client, Mockito.never()).shutdown(Mockito.anyBoolean());
}

Expand All @@ -338,8 +346,8 @@ public void testBatchGetVisibleVersionAsyncConsumesMultipleRateLimitPermits() th
MetaServiceProxy proxy = new MetaServiceProxy();
MetaServiceClient client = mockNormalClient();
putClient(proxy, client);
SettableFuture<Cloud.GetVersionResponse> future = SettableFuture.create();
Mockito.when(client.getVisibleVersionAsync(Mockito.any())).thenReturn(future);
Mockito.when(client.getVisibleVersionAsync(Mockito.any()))
.thenReturn(Futures.immediateFuture(okGetVersionResponse()));

proxy.getVisibleVersionAsync(buildBatchTableVersionRequest(CPU_CORES));

Expand Down
Loading