add condition timeout

Author: gy2006

core/src/main/java/com/flowci/core/job/config/JobConfig.java

@@ -18,6 +18,7 @@
 
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CacheHelper;
+import com.flowci.core.common.helper.ThreadHelper;
 import com.flowci.core.job.domain.Step;
 import com.flowci.tree.NodeTree;
 import com.flowci.util.FileHelper;
@@ -26,11 +27,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * @author yang
@@ -58,4 +61,9 @@ public Path pluginDir() throws IOException {
         Path pluginDir = Paths.get(workspace, "repos");
         return FileHelper.createDirectory(pluginDir);
     }
+
+    @Bean("jobConditionExecutor")
+    public ThreadPoolTaskExecutor jobConditionExecutor() {
+        return ThreadHelper.createTaskExecutor(20, 20, 100, "job-cond-");
+    }
 }

core/src/main/java/com/flowci/core/job/manager/ConditionManagerImpl.java

@@ -7,13 +7,21 @@
 import groovy.lang.GroovyShell;
 import groovy.util.ScriptException;
 import lombok.extern.log4j.Log4j2;
-import org.codehaus.groovy.control.CompilationFailedException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
+import java.util.concurrent.*;
+
 @Log4j2
 @Component
 public class ConditionManagerImpl implements ConditionManager {
 
+    private final int DefaultTimeout = 2; // seconds
+
+    @Autowired
+    private ThreadPoolTaskExecutor jobConditionExecutor;
+
     @Override
     public boolean run(CmdIn in) throws ScriptException {
         if (!(in instanceof ShellIn)) {
@@ -25,18 +33,31 @@ public boolean run(CmdIn in) throws ScriptException {
             return true;
         }
 
-        Binding binding = new Binding();
-        shell.getInputs().forEach(binding::setVariable);
+        Future<Boolean> submit = jobConditionExecutor.submit(() -> {
+            Binding binding = new Binding();
+            shell.getInputs().forEach(binding::setVariable);
 
-        try {
-            GroovyShell groovy = new GroovyShell(binding);
-            Object value = groovy.evaluate(shell.getCondition());
-            if (value instanceof Boolean) {
-                return (Boolean) value;
+            try {
+                GroovyShell groovy = new GroovyShell(binding);
+                Object value = groovy.evaluate(shell.getCondition());
+                if (value instanceof Boolean) {
+                    return (Boolean) value;
+                }
+                throw new Exception("The return type is not boolean");
+            } catch (GroovyRuntimeException e) {
+                throw new Exception(e.getMessage());
             }
-            throw new ScriptException("The return type is not boolean");
-        } catch (GroovyRuntimeException e) {
+        });
+
+        try {
+            return submit.get(DefaultTimeout, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            throw new ScriptException("Condition script interrupted");
+        } catch (ExecutionException e) {
             throw new ScriptException(e.getMessage());
+        } catch (TimeoutException e) {
+            submit.cancel(true);
+            throw new ScriptException("Condition script timeout");
         }
     }
 }

core/src/test/java/com/flowci/core/test/job/ConditionManagerTest.java

@@ -37,4 +37,18 @@ public void should_throw_exception_if_wrong_return_type() throws ScriptException
 
         conditionManager.run(in);
     }
+
+    @Test(expected = ScriptException.class)
+    public void should_throw_exception_if_timeout() throws ScriptException {
+        ShellIn in = new ShellIn();
+        in.getInputs().put("foo", "helloword");
+        in.setCondition(
+                "sleep(6000); "
+                        + "println \"$foo\"; "
+                        + "hello = \"1234\";"
+                        + "return true;"
+        );
+
+        conditionManager.run(in);
+    }
 }