Added Timeout option to TRex Daemon

- Added asynchronomous call of TRex Start call (it can take long)

Author: EgorBlagov

src/main/java/com/exalttech/trex/ui/controllers/daemon/TRexDaemonDialogController.java

@@ -30,6 +30,7 @@
 import com.google.common.base.Charsets;
 import com.google.common.net.HttpHeaders;
 import com.google.common.net.MediaType;
+import javafx.concurrent.Task;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
@@ -56,6 +57,7 @@
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 /**
  * TRex Daemon FXM controller
@@ -87,6 +89,11 @@ public String pass(@NotNull String request) throws IOException {
         }
     }
 
+    @FunctionalInterface
+    interface ExceptionHandler {
+        void handle(Throwable ex);
+    }
+
     @FXML
     private ComboBox<String> hostnamesComboBox;
 
@@ -117,6 +124,8 @@ public String pass(@NotNull String request) throws IOException {
     @FXML
     private Button startTRexButton;
 
+    @FXML TextField startTRexTimeoutTextField;
+
     @FXML
     private Button loadDefaultConfigButton;
 
@@ -130,21 +139,31 @@ public String pass(@NotNull String request) throws IOException {
 
     private UserConfigModel userConfigModel;
     private String configFilename;
+    private Task<Void> currentPendingTask;
 
     private List<Control> controlsDisabledOnDisconnected;
     private List<Control> controlsDisabledOnConnected;
     private List<Control> controlsDisabledOnMetadataNotExists;
     private List<Control> controlsDisabledOnConfigInvalid;
-
+    private List<Control> controlsDisabledOnPendingTask;
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         initHostnamesComboBox();
         controlsDisabledOnConnected = Arrays.asList(hostnamesComboBox, rpcPortTextField, connectButton);
-        controlsDisabledOnDisconnected = Arrays.asList(disconnectButton, startTRexButton, stopTRexButton);
+        controlsDisabledOnDisconnected = Arrays.asList(disconnectButton, startTRexButton, startTRexTimeoutTextField, stopTRexButton);
         controlsDisabledOnMetadataNotExists = Arrays.asList(configEditTitledPane, loadDefaultConfigButton);
-        controlsDisabledOnConfigInvalid = Arrays.asList(startTRexButton);
+        controlsDisabledOnConfigInvalid = Collections.singletonList(startTRexButton);
+        controlsDisabledOnPendingTask = Arrays.asList(hostnamesComboBox, rpcPortTextField, connectButton, startTRexButton, startTRexTimeoutTextField, stopTRexButton, loadDefaultConfigButton);
+
         configEditTitledPane.expandedProperty().bind(configEditTitledPane.disableProperty().not());
-        this.configFilename = System.getProperty("user.name");
+        configFilename = System.getProperty("user.name");
+
+        startTRexTimeoutTextField.textProperty().addListener((observable, oldValue, newValue) -> {
+            if (!newValue.matches("\\d*")) {
+                startTRexTimeoutTextField.setText(newValue.replaceAll("[^\\d]", ""));
+            }
+        });
+
         refreshControlsAvailability();
     }
 
@@ -208,6 +227,12 @@ private void refreshControlsAvailability() {
                 control.setDisable(true);
             }
         }
+
+        if (currentPendingTask != null) {
+            for (Control control : controlsDisabledOnPendingTask) {
+                control.setDisable(true);
+            }
+        }
     }
 
     private boolean isConnected() {
@@ -216,6 +241,12 @@ private boolean isConnected() {
 
     private void disconnect() {
         if (isConnected()) {
+
+            if (currentPendingTask != null){
+                currentPendingTask.cancel();
+                currentPendingTask = null;
+            }
+
             client = null;
             metadata = null;
 
@@ -256,6 +287,10 @@ private String getPort() {
         return rpcPortTextField.getText();
     }
 
+    private Integer getStartTimeout() {
+        return Integer.valueOf(startTRexTimeoutTextField.getText());
+    }
+
     private String getHostname() {
         return hostnamesComboBox.getSelectionModel().getSelectedItem();
     }
@@ -291,58 +326,93 @@ private void getMetadata() {
     }
 
     private void startTRex() {
-        Boolean configUploaded = false;
-        try {
-            configUploaded = client.createRequest()
-                    .id(getId())
-                    .method("push_file")
-                    .param("filename", configFilename)
-                    .param("bin_data", Base64.getEncoder().encodeToString(
-                            userConfigModel.getYAMLString().getBytes(Charsets.US_ASCII)))
-                    .returnAs(Boolean.class)
-                    .execute();
-
-            if (!configUploaded) {
-                log(LogType.ERROR, "Config upload to TRex host failed (TRex Daemon IO error)");
-            }
+        scheduleTask(() -> {
+                    try {
+                        Boolean configUploaded = client.createRequest()
+                                .id(getId())
+                                .method("push_file")
+                                .param("filename", configFilename)
+                                .param("bin_data", Base64.getEncoder().encodeToString(
+                                        userConfigModel.getYAMLString().getBytes(Charsets.US_ASCII)))
+                                .returnAs(Boolean.class)
+                                .execute();
+
+                        if (!configUploaded) {
+                            throw new RuntimeException("Config upload to TRex host failed (TRex Daemon IO error)");
+                        }
+
+                        log(LogType.INFO, "Config was uploaded successfully");
+                    } catch (RuntimeException ex) {
+                        throw new RuntimeException(MessageFormat.format("Config upload to TRex host failed: {0}", ex));
+                    } catch (JsonProcessingException ex) {
+                        throw new RuntimeException(MessageFormat.format("Config serialization failed: {0}", ex));
+                    }
+
+                    Map<String, Object> cmdParams = new HashMap<>();
+                    try {
+                        String files_path = client.createRequest()
+                                .id(getId())
+                                .method("get_files_path")
+                                .returnAs(String.class)
+                                .execute();
+
+                        cmdParams.put("cfg", FilenameUtils.separatorsToUnix(Paths.get(files_path, configFilename).toString()));
+                    } catch (RuntimeException ex) {
+                        throw new RuntimeException(MessageFormat.format("Unable to get user configs path: {0}", ex));
+                    }
+
+                    try {
+                        log(LogType.INFO, MessageFormat.format("Starting TRex... (timeout is {0} sec)", getStartTimeout()));
+                        client.createRequest()
+                                .id(getId())
+                                .method("start_trex")
+                                .param("trex_cmd_options", cmdParams)
+                                .param("user", System.getProperty("user.name"))
+                                .param("stateless", true)
+                                .returnAs(Integer.class)
+                                .param("timeout", getStartTimeout())
+                                .execute();
+
+                    } catch (RuntimeException ex) {
+                        throw new RuntimeException(MessageFormat.format("Unable to start TRex: {0} ", ex));
+                    }
+                    return null;
+                },
+                ex -> log(LogType.ERROR, ex.getMessage()),
+                () -> log(LogType.INFO, "TRex was started successfully"),
+                () -> log(LogType.WARNING, "TRex start was cancelled")
+        );
+    }
 
-            log(LogType.INFO, "Config uploaded successfully");
-        } catch (RuntimeException ex) {
-            log(LogType.ERROR, MessageFormat.format("Config upload to TRex host failed: {0}", ex));
-        } catch (JsonProcessingException ex) {
-            log(LogType.ERROR, MessageFormat.format("Config serialization failed: {0}", ex));
+    private void scheduleTask(Callable<Void> mainAction, ExceptionHandler onException, Runnable onSucceed, Runnable onCanceled) {
+        if (currentPendingTask != null) {
+            currentPendingTask.cancel();
         }
 
-        Map<String, Object> cmdParams = new HashMap<>();
-
-        if (configUploaded) {
-            try {
-                String files_path = client.createRequest()
-                        .id(getId())
-                        .method("get_files_path")
-                        .returnAs(String.class)
-                        .execute();
-
-                cmdParams.put("cfg", FilenameUtils.separatorsToUnix(Paths.get(files_path, configFilename).toString()));
-            } catch (RuntimeException ex) {
-                log(LogType.ERROR, MessageFormat.format("Unable to get user configs path: {0}", ex));
+        currentPendingTask = new Task<Void>() {
+            @Override
+            protected Void call() throws Exception {
+                return mainAction.call();
             }
-        }
+        };
+        currentPendingTask.setOnFailed(event -> {
+            onException.handle(currentPendingTask.getException());
+            currentPendingTask = null;
+            refreshControlsAvailability();
+        });
+        currentPendingTask.setOnSucceeded(event -> {
+            onSucceed.run();
+            currentPendingTask = null;
+            refreshControlsAvailability();
+        });
+        currentPendingTask.setOnCancelled(event -> {
+            onCanceled.run();
+            currentPendingTask = null;
+            refreshControlsAvailability();
+        });
 
-        try {
-            Integer trexSessionHandler = client.createRequest()
-                    .id(getId())
-                    .method("start_trex")
-                    .param("trex_cmd_options", cmdParams)
-                    .param("user", System.getProperty("user.name"))
-                    .param("stateless", true)
-                    .returnAs(Integer.class)
-                    .param("timeout", 15)
-                    .execute();
-            log(LogType.INFO, "TRex started successfully");
-        } catch (RuntimeException ex) {
-            log(LogType.ERROR, MessageFormat.format("Unable to start TRex: {0} ", ex));
-        }
+        new Thread(currentPendingTask).start();
+        refreshControlsAvailability();
     }
 
     private void stopTRex() {

src/main/java/com/exalttech/trex/ui/views/logs/LogType.java

@@ -31,6 +31,10 @@ public enum LogType {
      *
      */
     INFO("Info  ", "logInfo"),
+    /**
+     *
+     */
+    WARNING("Warning  ", "logWarning"),
     /**
      *
      */

src/main/resources/fxml/TRexDaemonDialog.fxml

@@ -12,6 +12,7 @@
 <?import javafx.scene.control.TitledPane?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 
 <?import com.exalttech.trex.ui.views.logs.LogsView?>
@@ -36,7 +37,7 @@
                      <Insets bottom="5.0" left="15.0" right="5.0" top="5.0" />
                   </padding>
                </Label>
-               <TextField fx:id="rpcPortTextField" text="8090">
+               <TextField fx:id="rpcPortTextField" maxWidth="60.0" text="8090">
                   <HBox.margin>
                      <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
                   </HBox.margin>
@@ -52,12 +53,6 @@
                   </HBox.margin>
                </Button>
             </children>
-            <VBox.margin>
-               <Insets />
-            </VBox.margin>
-            <opaqueInsets>
-               <Insets />
-            </opaqueInsets>
          </HBox>
          <TitledPane fx:id="configEditTitledPane" animated="true" text="TRex config edit">
            <content>
@@ -106,13 +101,23 @@
                </Tab>
            </tabs>
          </TabPane>
-         <HBox alignment="TOP_RIGHT" VBox.vgrow="NEVER">
+         <HBox alignment="CENTER_RIGHT" VBox.vgrow="NEVER">
             <children>
                <Button fx:id="stopTRexButton" mnemonicParsing="false" onAction="#handleStopClicked" styleClass="normalButton" text="Stop">
                   <HBox.margin>
                      <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
                   </HBox.margin>
                </Button>
+                <Label text="Start timeout">
+                    <padding>
+                        <Insets bottom="5.0" left="15.0" right="5.0" top="5.0" />
+                    </padding>
+                </Label>
+                <TextField fx:id="startTRexTimeoutTextField" maxWidth="60.0" text="40">
+                    <HBox.margin>
+                        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+                    </HBox.margin>
+                </TextField>
                <Button fx:id="startTRexButton" mnemonicParsing="false" onAction="#handleStartClicked" styleClass="normalButton" text="Start">
                   <HBox.margin>
                      <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />

src/main/resources/styles/mainStyle.css

@@ -878,6 +878,9 @@ connectContent .titled-pane:focused .title .arrow-button .arrow {
 .logInfo{
     -fx-text-fill:#29bf4c;
 }
+.logWarning{
+    -fx-text-fill:#ff9514;
+}
 .logError{
     -fx-text-fill:#ea2323;
 }