Merge pull request #541 from oracle/fix-take10

Synchronization on config map script loading

Author: rjeberhard

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

@@ -189,6 +189,9 @@ 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);
+
       try {
         return new BatchV1Api(client)
             .listNamespacedJobCall(

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

@@ -39,7 +39,7 @@ public class ConfigMapHelper {
   private static final String SCRIPT_LOCATION = "/scripts";
   private static final ConfigMapComparator COMPARATOR = new ConfigMapComparatorImpl();
 
-  private static FileGroupReader scriptReader = new FileGroupReader(SCRIPT_LOCATION);
+  private static final FileGroupReader scriptReader = new FileGroupReader(SCRIPT_LOCATION);
 
   private ConfigMapHelper() {}
 

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

@@ -45,13 +45,15 @@ class FileGroupReader {
    * @return a map of file paths to string contents.
    */
   Map<String, String> loadFilesFromClasspath() {
-    try {
-      try (ScriptPath scriptPath = getScriptPath()) {
-        return loadContents(scriptPath.getScriptsDir());
+    synchronized (FileGroupReader.class) {
+      try {
+        try (ScriptPath scriptPath = getScriptPath()) {
+          return loadContents(scriptPath.getScriptsDir());
+        }
+      } catch (Exception e) {
+        LOGGER.warning(MessageKeys.EXCEPTION, e);
+        throw new RuntimeException(e);
       }
-    } catch (Exception e) {
-      LOGGER.warning(MessageKeys.EXCEPTION, e);
-      throw new RuntimeException(e);
     }
   }