add timeout option to rce

Author: Daishan Peng

code/implementation/docker/machine/src/main/java/io/cattle/platform/docker/machine/launch/ComposeExecutorLauncher.java

@@ -9,6 +9,8 @@
 import io.cattle.platform.service.launcher.GenericServiceLauncher;
 import io.cattle.platform.util.type.InitializationTask;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -20,6 +22,7 @@
 public class ComposeExecutorLauncher extends GenericServiceLauncher implements InitializationTask {
 
     private static final DynamicStringProperty COMPOSE_EXECUTOR_BINARY = ArchaiusUtil.getString("compose.executor.service.executable");
+    private static final DynamicStringProperty COMPOSE_EXECUTOR_CLIENT_TIMEOUT = ArchaiusUtil.getString("compose.executor.service.executable.timeout");
     private static final DynamicBooleanProperty LAUNCH_COMPOSE_EXECUTOR = ArchaiusUtil.getBoolean("compose.executor.execute");
 
     @Inject
@@ -41,6 +44,7 @@ protected void setEnvironment(Map<String, String> env) {
         env.put("CATTLE_ACCESS_KEY", cred.getPublicValue());
         env.put("CATTLE_SECRET_KEY", cred.getSecretValue());
         env.put("CATTLE_URL", ServerContext.getLocalhostUrl(BaseProtocol.HTTP));
+        env.put("RANCHER_CLIENT_TIMEOUT", COMPOSE_EXECUTOR_CLIENT_TIMEOUT.get());
     }
 
     @Override
@@ -52,5 +56,12 @@ protected LockDefinition getLock() {
     protected boolean isReady() {
         return true;
     }
+    
+    @Override
+    protected List<DynamicStringProperty> getReloadSettings() {
+        List<DynamicStringProperty> list = new ArrayList<>();
+        list.add(COMPOSE_EXECUTOR_CLIENT_TIMEOUT);
+        return list;
+    }
 
 }

code/packaging/app-config/src/main/resources/META-INF/cattle/process/defaults.properties

@@ -94,6 +94,7 @@ machine.execute=false
 machine.driver.config=file:///var/lib/rancher/etc/machinedrivers.json
 
 compose.executor.service.executable=rancher-compose-executor
+compose.executor.service.executable.timeout=0
 compose.executor.execute=false
 
 catalog.service.executable=rancher-catalog-service