remove health check from this PR

Author: AngerM-DD

build.gradle

@@ -53,7 +53,7 @@ dependencies {
     errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
     errorprone('com.google.errorprone:error_prone_core:2.3.4')
 
-    compile group: 'com.uber.tchannel', name: 'tchannel-core', version: '0.8.30'
+    compile group: 'com.uber.tchannel', name: 'tchannel-core', version: '0.8.5'
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
     compile group: 'org.apache.thrift', name: 'libthrift', version: '0.9.3'
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6'

src/main/java/com/uber/cadence/internal/sync/SyncWorkflowWorker.java

@@ -39,7 +39,10 @@
 import java.lang.reflect.Type;
 import java.time.Duration;
 import java.util.Objects;
-import java.util.concurrent.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -56,7 +59,6 @@ public class SyncWorkflowWorker
   private final ScheduledExecutorService ldaHeartbeatExecutor = Executors.newScheduledThreadPool(4);
   private SuspendableWorker ldaWorker;
   private POJOActivityTaskHandler ldaTaskHandler;
-  private final IWorkflowService service;
 
   public SyncWorkflowWorker(
       IWorkflowService service,
@@ -72,7 +74,6 @@ public SyncWorkflowWorker(
       ThreadPoolExecutor workflowThreadPool) {
     Objects.requireNonNull(workflowThreadPool);
     this.dataConverter = workflowOptions.getDataConverter();
-    this.service = service;
 
     factory =
         new POJOWorkflowImplementationFactory(
@@ -251,8 +252,4 @@ public <R> R queryWorkflowExecution(
   public void accept(PollForDecisionTaskResponse pollForDecisionTaskResponse) {
     workflowWorker.accept(pollForDecisionTaskResponse);
   }
-
-  public CompletableFuture<Boolean> isHealthy() {
-    return service.isHealthy();
-  }
 }

src/main/java/com/uber/cadence/internal/sync/TestActivityEnvironmentInternal.java

@@ -46,7 +46,6 @@
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -318,11 +317,6 @@ private class WorkflowServiceWrapper implements IWorkflowService {
 
     private final IWorkflowService impl;
 
-    @Override
-    public CompletableFuture<Boolean> isHealthy() {
-      return impl.isHealthy();
-    }
-
     private WorkflowServiceWrapper(IWorkflowService impl) {
       if (impl == null) {
         // Create empty implementation that just ignores all requests.

src/main/java/com/uber/cadence/internal/sync/TestWorkflowEnvironmentInternal.java

@@ -484,11 +484,6 @@ public void GetWorkflowExecutionHistoryWithTimeout(
       impl.GetWorkflowExecutionHistoryWithTimeout(getRequest, resultHandler, timeoutInMillis);
     }
 
-    @Override
-    public CompletableFuture<Boolean> isHealthy() {
-      return impl.isHealthy();
-    }
-
     @Override
     public void PollForDecisionTask(
         PollForDecisionTaskRequest pollRequest, AsyncMethodCallback resultHandler)

src/main/java/com/uber/cadence/internal/testservice/TestWorkflowService.java

@@ -845,13 +845,6 @@ public void GetWorkflowExecutionHistoryWithTimeout(
     GetWorkflowExecutionHistory(getRequest, resultHandler);
   }
 
-  @Override
-  public CompletableFuture<Boolean> isHealthy() {
-    CompletableFuture<Boolean> rval = new CompletableFuture<>();
-    rval.complete(Boolean.TRUE);
-    return rval;
-  }
-
   @Override
   public void PollForDecisionTask(
       PollForDecisionTaskRequest pollRequest, AsyncMethodCallback resultHandler) throws TException {

src/main/java/com/uber/cadence/serviceclient/IWorkflowService.java

@@ -23,7 +23,6 @@
 import com.uber.cadence.StartWorkflowExecutionRequest;
 import com.uber.cadence.WorkflowService.AsyncIface;
 import com.uber.cadence.WorkflowService.Iface;
-import java.util.concurrent.CompletableFuture;
 import org.apache.thrift.TException;
 import org.apache.thrift.async.AsyncMethodCallback;
 
@@ -71,7 +70,6 @@ void GetWorkflowExecutionHistoryWithTimeout(
       AsyncMethodCallback resultHandler,
       Long timeoutInMillis)
       throws TException;
-
   /**
    * SignalWorkflowExecutionWithTimeout signal workflow same as SignalWorkflowExecution but with
    * timeout
@@ -86,6 +84,4 @@ void SignalWorkflowExecutionWithTimeout(
       AsyncMethodCallback resultHandler,
       Long timeoutInMillis)
       throws TException;
-
-  CompletableFuture<Boolean> isHealthy();
 }

src/main/java/com/uber/cadence/serviceclient/WorkflowServiceTChannel.java

@@ -104,7 +104,6 @@
 import com.uber.tchannel.errors.ErrorType;
 import com.uber.tchannel.messages.ThriftRequest;
 import com.uber.tchannel.messages.ThriftResponse;
-import com.uber.tchannel.messages.generated.Meta;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
@@ -128,7 +127,7 @@ public class WorkflowServiceTChannel implements IWorkflowService {
   private final ClientOptions options;
   private final Map<String, String> thriftHeaders;
   private final TChannel tChannel;
-  private SubChannel subChannel;
+  private final SubChannel subChannel;
 
   /**
    * Creates Cadence client that connects to the specified host and port using specified options.
@@ -160,13 +159,6 @@ public WorkflowServiceTChannel(ClientOptions options) {
             + Version.FEATURE_VERSION);
   }
 
-  public void resetSubchannelPeers() throws UnknownHostException {
-    InetAddress address = InetAddress.getByName(options.getHost());
-    ArrayList<InetSocketAddress> peers = new ArrayList<>();
-    peers.add(new InetSocketAddress(address, options.getPort()));
-    this.subChannel.setPeers(peers);
-  }
-
   /**
    * Creates Cadence client with specified sub channel and options.
    *
@@ -215,45 +207,6 @@ private <T> ThriftRequest<T> buildThriftRequest(String apiName, T body) {
     return buildThriftRequest(apiName, body, null);
   }
 
-  @Override
-  public CompletableFuture<Boolean> isHealthy() {
-    final ThriftRequest<Meta.health_args> req =
-        new ThriftRequest.Builder<Meta.health_args>("cadence-frontend", "Meta::health")
-            .setBody(new Meta.health_args())
-            .build();
-    final CompletableFuture<Boolean> result = new CompletableFuture<>();
-    try {
-
-      final TFuture<ThriftResponse<Meta.health_result>> future = this.subChannel.send(req);
-      future.addCallback(
-          response -> {
-            req.releaseQuietly();
-            if (response.isError()) {
-              try {
-                this.resetSubchannelPeers();
-              } catch (final Exception inner_e) {
-              }
-              result.completeExceptionally(new TException("Rpc error:" + response.getError()));
-            } else {
-              result.complete(response.getBody(Meta.health_result.class).getSuccess().isOk());
-            }
-            try {
-              response.release();
-            } catch (final Exception e) {
-              // ignore
-            }
-          });
-    } catch (final TChannelError e) {
-      req.releaseQuietly();
-      try {
-        this.resetSubchannelPeers();
-      } catch (final Exception inner_e) {
-      }
-      result.complete(Boolean.FALSE);
-    }
-    return result;
-  }
-
   private <T> ThriftRequest<T> buildThriftRequest(String apiName, T body, Long rpcTimeoutOverride) {
     String endpoint = getEndpoint(INTERFACE_NAME, apiName);
     ThriftRequest.Builder<T> builder =
@@ -284,11 +237,6 @@ private <T> ThriftResponse<T> doRemoteCall(ThriftRequest<?> request) throws TExc
     } catch (ExecutionException e) {
       throw new TException(e);
     } catch (TChannelError e) {
-      try {
-        resetSubchannelPeers();
-      } catch (UnknownHostException uhe) {
-        // do nothing?
-      }
       throw new TException("Rpc error", e);
     }
     this.throwOnRpcError(response);
@@ -301,11 +249,6 @@ private <T> CompletableFuture<ThriftResponse<T>> doRemoteCallAsync(ThriftRequest
     try {
       future = subChannel.send(request);
     } catch (TChannelError tChannelError) {
-      try {
-        resetSubchannelPeers();
-      } catch (UnknownHostException uhe) {
-        // do nothing?
-      }
       result.completeExceptionally(new TException(tChannelError));
     }
     future.addCallback(

src/main/java/com/uber/cadence/worker/Worker.java

@@ -336,8 +336,4 @@ public void resumePolling() {
   public boolean isSuspended() {
     return workflowWorker.isSuspended() && activityWorker.isSuspended();
   }
-
-  public CompletableFuture<Boolean> isHealthy() {
-    return workflowWorker.isHealthy();
-  }
 }

src/main/java/com/uber/cadence/worker/WorkerFactory.java

@@ -39,12 +39,10 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -289,16 +287,6 @@ public synchronized void shutdownNow() {
     }
   }
 
-  public CompletableFuture<Boolean> isHealthy() {
-    List<CompletableFuture<Boolean>> healthyList =
-        workers.stream().map(Worker::isHealthy).collect(Collectors.toList());
-    CompletableFuture<Boolean> result = CompletableFuture.supplyAsync(() -> true);
-    for (CompletableFuture<Boolean> future : healthyList) {
-      result = result.thenCombine(future, (current, other) -> current && other);
-    }
-    return result;
-  }
-
   /**
    * Blocks until all tasks have completed execution after a shutdown request, or the timeout
    * occurs, or the current thread is interrupted, whichever happens first.

src/test/java/com/uber/cadence/workerFactory/WorkerFactoryTests.java

@@ -17,7 +17,8 @@
 
 package com.uber.cadence.workerFactory;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.serviceclient.ClientOptions;
@@ -64,11 +65,6 @@ public void whenAFactoryIsStartedAllWorkersStart() {
 
     factory.start();
     assertTrue(factory.isStarted());
-    try {
-      assertTrue(factory.isHealthy().get());
-    } catch (Exception e) {
-      assertNull("Failed to check if cluster is health!", e);
-    }
     factory.shutdown();
     factory.awaitTermination(1, TimeUnit.SECONDS);
   }

src/test/resources/logback-test.xml

@@ -28,4 +28,4 @@
     <root level="INFO">
         <appender-ref ref="STDOUT" />
     </root>
-</configuration>
+</configuration>