Merge pull request #815 from oracle/suppress-exceptions

Suppress exceptions in operator log

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/Main.java

@@ -10,8 +10,11 @@
 import io.kubernetes.client.models.V1PodList;
 import io.kubernetes.client.models.V1Service;
 import io.kubernetes.client.models.V1ServiceList;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -34,6 +37,7 @@
 import oracle.kubernetes.operator.helpers.CRDHelper;
 import oracle.kubernetes.operator.helpers.CallBuilder;
 import oracle.kubernetes.operator.helpers.CallBuilderFactory;
+import oracle.kubernetes.operator.helpers.ClientPool;
 import oracle.kubernetes.operator.helpers.ConfigMapHelper;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.helpers.HealthCheckHelper;
@@ -89,6 +93,13 @@ public Thread newThread(Runnable r) {
 
   static {
     try {
+      // suppress System.err since we catch all necessary output with Logger
+      OutputStream output = new FileOutputStream("/dev/null");
+      PrintStream nullOut = new PrintStream(output);
+      System.setErr(nullOut);
+
+      ClientPool.initialize(threadFactory);
+
       TuningParameters.initializeInstance(wrappedExecutorService, "/operator/config");
       tuningAndConfig = TuningParameters.getInstance();
     } catch (IOException e) {

operator/src/main/java/oracle/kubernetes/operator/helpers/ClientPool.java

@@ -4,10 +4,16 @@
 
 package oracle.kubernetes.operator.helpers;
 
+import com.squareup.okhttp.Dispatcher;
 import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.Configuration;
 import io.kubernetes.client.util.Config;
 import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
@@ -18,9 +24,28 @@
 public class ClientPool extends Pool<ApiClient> {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
   private static ClientPool SINGLETON = new ClientPool();
+  private static ThreadFactory threadFactory;
 
   private static final ClientFactory FACTORY = new DefaultClientFactory();
 
+  public static void initialize(ThreadFactory threadFactory) {
+    ClientPool.threadFactory = threadFactory;
+  }
+
+  private static Runnable wrapRunnable(Runnable r) {
+    return new Runnable() {
+      @Override
+      public void run() {
+        try {
+          r.run();
+        } catch (Throwable t) {
+          // These will almost always be spurious exceptions
+          LOGGER.finer(MessageKeys.EXCEPTION, t);
+        }
+      }
+    };
+  }
+
   public static ClientPool getInstance() {
     return SINGLETON;
   }
@@ -71,6 +96,24 @@ public ApiClient get() {
         if (first.getAndSet(false)) {
           Configuration.setDefaultApiClient(client);
         }
+
+        if (threadFactory != null) {
+          ExecutorService exec =
+              new ThreadPoolExecutor(
+                  0,
+                  Integer.MAX_VALUE,
+                  60,
+                  TimeUnit.SECONDS,
+                  new SynchronousQueue<Runnable>(),
+                  threadFactory) {
+                @Override
+                public void execute(Runnable command) {
+                  super.execute(wrapRunnable(command));
+                }
+              };
+          client.getHttpClient().setDispatcher(new Dispatcher(exec));
+        }
+
         return client;
       } catch (IOException e) {
         throw new RuntimeException(e);

operator/src/main/java/oracle/kubernetes/operator/helpers/FileGroupReader.java

@@ -117,7 +117,6 @@ class JarScriptPath implements ScriptPath {
     private FileSystem fileSystem;
 
     JarScriptPath(URI uri) throws IOException {
-      System.out.println("loading from " + uri);
       fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap());
     }
 

src/scripts/logstash.properties

@@ -1,4 +1,5 @@
-.level=INFO
+.level=WARNING
+Operator.level=INFO
 handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler
 java.util.logging.ConsoleHandler.level=INFO
 java.util.logging.ConsoleHandler.formatter=oracle.kubernetes.operator.logging.LoggingFormatter

src/scripts/operator.sh

@@ -2,8 +2,6 @@
 # Copyright 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
-set -x
-
 export PATH=$PATH:/operator
 
 echo "Launching Oracle WebLogic Server Kubernetes Operator..."
@@ -52,7 +50,7 @@ if [[ ! -z "$JAVA_LOGGING_LEVEL" ]]; then
      [ $JAVA_LOGGING_LEVEL != $FINEST  ]; then
     echo "WARNING: Ignoring invalid JAVA_LOGGING_LEVEL: \"${JAVA_LOGGING_LEVEL}\". Valid values are $SEVERE, $WARNING, $INFO, $CONFIG, $FINE, $FINER and $FINEST."
   else
-    sed -i -e "s|\(.*\.level=\).*|\1${JAVA_LOGGING_LEVEL}|g" $LOGGING_CONFIG
+    sed -i -e "s|INFO|${JAVA_LOGGING_LEVEL}|g" $LOGGING_CONFIG
   fi
 fi