grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

interop-testing: aggregate accumulated stats by RPC methods in xDS test client (#7603) 

Update xDS interop test proto to aggregate accumulated stats based on RPC methods (mirroring 643e5bcd1e8db931cf76a3be19cd9bba223ee987 in C-core's change). Updated the xDS interop test client to support querying accumulated stats aggregated to RPC methods.
This commit is contained in:
Chengyuan Zhang 2020-11-10 23:58:09 -08:00 committed by GitHub
parent fbc48a86fa
commit bf191cb5ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
interop-testing/src/main/java/io/grpc/testing/integration/XdsTestClient.java
View File

@ -60,7 +60,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -73,9 +72,9 @@ public final class XdsTestClient {
private final Set<XdsStatsWatcher> watchers = new HashSet<>(); private final Set<XdsStatsWatcher> watchers = new HashSet<>();
private final Object lock = new Object(); private final Object lock = new Object();
private final List<ManagedChannel> channels = new ArrayList<>(); private final List<ManagedChannel> channels = new ArrayList<>();
private final AtomicInteger rpcsStarted = new AtomicInteger(); private final Map<String, Integer> rpcsStartedByMethod = new HashMap<>();
private final AtomicInteger rpcsFailed = new AtomicInteger(); private final Map<String, Integer> rpcsFailedByMethod = new HashMap<>();
private final AtomicInteger rpcsSucceeded = new AtomicInteger(); private final Map<String, Integer> rpcsSucceededByMethod = new HashMap<>();
private int numChannels = 1; private int numChannels = 1;
private boolean printResponse = false; private boolean printResponse = false;
@ -333,7 +332,6 @@ public final class XdsTestClient {
@Override @Override
public void onNext(EmptyProtos.Empty response) {} public void onNext(EmptyProtos.Empty response) {}
}); });
rpcsStarted.getAndIncrement();
} else if (rpcType == RpcType.UNARY_CALL) { } else if (rpcType == RpcType.UNARY_CALL) {
SimpleRequest request = SimpleRequest.newBuilder().setFillServerId(true).build(); SimpleRequest request = SimpleRequest.newBuilder().setFillServerId(true).build();
stub.unaryCall( stub.unaryCall(
@ -373,19 +371,39 @@ public final class XdsTestClient {
} }
} }
}); });
rpcsStarted.getAndIncrement(); } else {
throw new AssertionError("Unknown RPC type: " + rpcType);
}
synchronized (lock) {
Integer startedBase = rpcsStartedByMethod.get(rpcType.name());
if (startedBase == null) {
startedBase = 0;
}
rpcsStartedByMethod.put(rpcType.name(), startedBase + 1);
} }
} }
private void handleRpcCompleted(long requestId, RpcType rpcType, String hostname, private void handleRpcCompleted(long requestId, RpcType rpcType, String hostname,
Set<XdsStatsWatcher> watchers) { Set<XdsStatsWatcher> watchers) {
rpcsSucceeded.getAndIncrement(); synchronized (lock) {
Integer succeededBase = rpcsSucceededByMethod.get(rpcType.name());
if (succeededBase == null) {
succeededBase = 0;
}
rpcsSucceededByMethod.put(rpcType.name(), succeededBase + 1);
}
notifyWatchers(watchers, rpcType, requestId, hostname); notifyWatchers(watchers, rpcType, requestId, hostname);
} }
private void handleRpcError(long requestId, RpcType rpcType, String hostname, private void handleRpcError(long requestId, RpcType rpcType, String hostname,
Set<XdsStatsWatcher> watchers) { Set<XdsStatsWatcher> watchers) {
rpcsFailed.getAndIncrement(); synchronized (lock) {
Integer failedBase = rpcsFailedByMethod.get(rpcType.name());
if (failedBase == null) {
failedBase = 0;
}
rpcsFailedByMethod.put(rpcType.name(), failedBase + 1);
}
notifyWatchers(watchers, rpcType, requestId, hostname); notifyWatchers(watchers, rpcType, requestId, hostname);
} }
} }
@ -457,12 +475,15 @@ public final class XdsTestClient {
@Override @Override
public void getClientAccumulatedStats(LoadBalancerAccumulatedStatsRequest request, public void getClientAccumulatedStats(LoadBalancerAccumulatedStatsRequest request,
StreamObserver<LoadBalancerAccumulatedStatsResponse> responseObserver) { StreamObserver<LoadBalancerAccumulatedStatsResponse> responseObserver) {
responseObserver.onNext( LoadBalancerAccumulatedStatsResponse.Builder responseBuilder =
LoadBalancerAccumulatedStatsResponse.newBuilder() LoadBalancerAccumulatedStatsResponse.newBuilder();
.setNumRpcsStarted(rpcsStarted.get()) synchronized (lock) {
.setNumRpcsSucceeded(rpcsSucceeded.get()) responseBuilder
.setNumRpcsFailed(rpcsFailed.get()) .putAllNumRpcsStartedByMethod(rpcsStartedByMethod)
.build()); .putAllNumRpcsSucceededByMethod(rpcsSucceededByMethod)
.putAllNumRpcsFailedByMethod(rpcsFailedByMethod);
}
responseObserver.onNext(responseBuilder.build());
responseObserver.onCompleted(); responseObserver.onCompleted();
} }
} }

12
interop-testing/src/main/proto/grpc/testing/messages.proto
View File

@ -208,12 +208,12 @@ message LoadBalancerAccumulatedStatsRequest {}
// Accumulated stats for RPCs sent by a test client. // Accumulated stats for RPCs sent by a test client.
message LoadBalancerAccumulatedStatsResponse { message LoadBalancerAccumulatedStatsResponse {
// The total number of RPCs have ever issued. // The total number of RPCs have ever issued for each type.
int32 num_rpcs_started = 1; map<string, int32> num_rpcs_started_by_method = 1;
// The total number of RPCs have ever completed successfully. // The total number of RPCs have ever completed successfully for each type.
int32 num_rpcs_succeeded = 2; map<string, int32> num_rpcs_succeeded_by_method = 2;
// The total number of RPCs have ever failed. // The total number of RPCs have ever failed for each type.
int32 num_rpcs_failed = 3; map<string, int32> num_rpcs_failed_by_method = 3;
} }
// Configurations for a test client. // Configurations for a test client.