Merge pull request #629 from oracle/socket-timeout

Suppress socket read timeout for watches

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/builders/WatchBuilder.java

@@ -91,8 +91,7 @@ private class ListNamespacedServiceCall implements BiFunction<ApiClient, CallPar
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      // Ensure that client doesn't time out before call or watch
-      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
+      setReadTimeout(client);
 
       try {
         return new CoreV1Api(client)
@@ -136,8 +135,7 @@ private class ListPodCall implements BiFunction<ApiClient, CallParams, Call> {
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      // Ensure that client doesn't time out before call or watch
-      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
+      setReadTimeout(client);
 
       try {
         return new CoreV1Api(client)
@@ -181,8 +179,7 @@ private class ListJobCall implements BiFunction<ApiClient, CallParams, Call> {
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      // Ensure that client doesn't time out before call or watch
-      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
+      setReadTimeout(client);
 
       try {
         return new BatchV1Api(client)
@@ -226,8 +223,7 @@ private class ListEventCall implements BiFunction<ApiClient, CallParams, Call> {
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      // Ensure that client doesn't time out before call or watch
-      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
+      setReadTimeout(client);
 
       try {
         return new CoreV1Api(client)
@@ -262,6 +258,11 @@ public WatchI<Domain> createDomainWatch(String namespace) throws ApiException {
         ClientPool.getInstance(), callParams, Domain.class, new ListDomainsCall(namespace));
   }
 
+  private static void setReadTimeout(ApiClient client) {
+    // Ensure that client doesn't time out before call or watch
+    client.getHttpClient().setReadTimeout(0, TimeUnit.SECONDS);
+  }
+
   private class ListDomainsCall implements BiFunction<ApiClient, CallParams, Call> {
     private String namespace;
 
@@ -271,8 +272,7 @@ private class ListDomainsCall implements BiFunction<ApiClient, CallParams, Call>
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      // Ensure that client doesn't time out before call or watch
-      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
+      setReadTimeout(client);
 
       try {
         return new WeblogicApi(client)
@@ -319,8 +319,7 @@ private class ListNamespacedConfigMapCall implements BiFunction<ApiClient, CallP
 
     @Override
     public Call apply(ApiClient client, CallParams callParams) {
-      // Ensure that client doesn't time out before call or watch
-      client.getHttpClient().setReadTimeout(callParams.getTimeoutSeconds(), TimeUnit.SECONDS);
+      setReadTimeout(client);
 
       try {
         return new CoreV1Api(client)

operator/src/main/java/oracle/kubernetes/operator/calls/AsyncRequestStep.java

@@ -110,6 +110,7 @@ public NextAction apply(Packet packet) {
 
     AtomicBoolean didResume = new AtomicBoolean(false);
     ApiClient client = helper.take();
+    client.getHttpClient().setReadTimeout(timeoutSeconds, TimeUnit.SECONDS);
     return doSuspend(
         (fiber) -> {
           ApiCallback<T> callback =