util: exclude client cancellations and deadline exceeded from outlier detection call counter

Author: AgraVator

core/src/main/java/io/grpc/internal/AbstractClientStream.java

@@ -197,6 +197,9 @@ public final void halfClose() {
   @Override
   public final void cancel(Status reason) {
     Preconditions.checkArgument(!reason.isOk(), "Should not cancel with OK status");
+    if (cancelled || transportState().isListenerClosed()) {
+      return;
+    }
     cancelled = true;
     abstractClientStreamSink().cancel(reason);
   }
@@ -251,6 +254,10 @@ protected TransportState(
       }
     }
 
+    protected final boolean isListenerClosed() {
+      return listenerClosed;
+    }
+
     private void setFullStreamDecompression(boolean fullStreamDecompression) {
       this.fullStreamDecompression = fullStreamDecompression;
     }

util/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java

@@ -477,41 +477,22 @@ public ClientStreamTracer newClientStreamTracer(StreamInfo info, Metadata header
         if (delegateFactory != null) {
           ClientStreamTracer delegateTracer = delegateFactory.newClientStreamTracer(info, headers);
           return new ForwardingClientStreamTracer() {
-            private volatile boolean cancelled;
-
             @Override
             protected ClientStreamTracer delegate() {
               return delegateTracer;
             }
 
-            @Override
-            public void cancelled(Status status) {
-              cancelled = true;
-              delegate().cancelled(status);
-            }
-
             @Override
             public void streamClosed(Status status) {
-              if (!cancelled) {
-                tracker.incrementCallCount(status.isOk());
-              }
+              tracker.incrementCallCount(status);
               delegate().streamClosed(status);
             }
           };
         } else {
           return new ClientStreamTracer() {
-            private volatile boolean cancelled;
-
-            @Override
-            public void cancelled(Status status) {
-              cancelled = true;
-            }
-
             @Override
             public void streamClosed(Status status) {
-              if (!cancelled) {
-                tracker.incrementCallCount(status.isOk());
-              }
+              tracker.incrementCallCount(status);
             }
           };
         }
@@ -571,13 +552,18 @@ Set<OutlierDetectionSubchannel> getSubchannels() {
       return ImmutableSet.copyOf(subchannels);
     }
 
-    void incrementCallCount(boolean success) {
+    void incrementCallCount(Status status) {
       // If neither algorithm is configured, no point in incrementing counters.
       if (config.successRateEjection == null && config.failurePercentageEjection == null) {
         return;
       }
 
-      if (success) {
+      if (status.getCode() == Status.Code.CANCELLED
+          || status.getCode() == Status.Code.DEADLINE_EXCEEDED) {
+        return;
+      }
+
+      if (status.isOk()) {
         activeCallCounter.successCount.getAndIncrement();
       } else {
         activeCallCounter.failureCount.getAndIncrement();