snapshot - still working on orchestrated tests; more complex test work - there is progress.

thsc42 · thsc42 · commit 4c22dd7fde3d · 2025-12-06T11:15:11.000+01:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/net/sharksystem/ui/messenger/cli/ProductionUI.java b/src/net/sharksystem/ui/messenger/cli/ProductionUI.java
@@ -154,6 +154,7 @@ public ProductionUI(String[] args) throws SharkException, IOException {
         smUI.addCommand(new UICommandScriptRQ(snmTestSupport, smUI, "scriptRQ", false));
         smUI.addCommand(new UICommandRelease(snmTestSupport, smUI, TestLanguageCompiler.CLI_RELEASE, false));
         smUI.addCommand(new UICommandOrchestrateTest(snmTestSupport, smUI, "orchestrateTest", false));
+        smUI.addCommand(new UICommandTimeBomb(snmTestSupport, smUI, TestLanguageCompiler.CLI_TIME_BOMB, false));
 
         smUI.addCommand(new UICommandSaveLog(sharkMessengerApp, smUI, "saveLog", false));
         smUI.addCommand(new UICommandShowLog(sharkMessengerApp, smUI, "showLog", false));
diff --git a/src/net/sharksystem/ui/messenger/cli/SharkNetMessengerAppSupportingDistributedTesting.java b/src/net/sharksystem/ui/messenger/cli/SharkNetMessengerAppSupportingDistributedTesting.java
@@ -8,6 +8,7 @@
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.ui.messenger.cli.commands.testing.*;
 import net.sharksystem.ui.messenger.cli.testlanguage.TestLanguageCompiler;
+import net.sharksystem.utils.Log;
 import net.sharksystem.utils.SerializationHelper;
 
 import java.io.IOException;
@@ -136,9 +137,11 @@ public void becomeTestPeer() throws IOException, SharkException {
                 false // no encryption
         );
         this.tellUI("script request sent: " + scriptRQMessage);
+        Log.writeLog(this, "script request sent: " + scriptRQMessage);
     }
 
     private int lastReceivedScriptIndex = -1;
+    private List<TestScriptDescription> handledScripts = new ArrayList<>();
     // peers willing to execute test script sent its environment description
     public void receivedTestScript(CharSequence testScriptChannel) {
         if(!this.beTestPeer) {
@@ -149,7 +152,7 @@ public void receivedTestScript(CharSequence testScriptChannel) {
         try {
             SharkNetMessageList scriptMessages =
                     this.getSharkMessengerComponent().getChannel(testScriptChannel).getMessages();
-            for (int scriptIndex = this.lastScriptRQIndex + 1; scriptIndex < scriptMessages.size(); scriptIndex++) {
+            for (int scriptIndex = this.lastReceivedScriptIndex + 1; scriptIndex < scriptMessages.size(); scriptIndex++) {
                 this.lastReceivedScriptIndex = scriptIndex; // update each round - before possible exceptions
 
                 SharkNetMessage testSharkMessage = scriptMessages.getSharkMessage(scriptIndex, false);
@@ -159,6 +162,23 @@ public void receivedTestScript(CharSequence testScriptChannel) {
                 // for me?
                 if(testScriptDescription.peerID.equalsIgnoreCase(this.getSharkPeer().getPeerID().toString())) {
                     this.tellUI("test script received - prepare script runner" + testScriptDescription);
+                    Log.writeLog(this, "test script addressed to me received: " + testScriptDescription);
+
+                    // this is script is for - alright. Is it a copy?
+                    boolean copy = false;
+                    for(TestScriptDescription oldScript : this.handledScripts) {
+                        Log.writeLog(this, "copy? " + testScriptDescription + " | " + oldScript);
+                        if(TestScriptDescription.same(oldScript, testScriptDescription)) {
+                            copy = true;
+                            break;
+                        }
+                    }
+                    if(copy) {
+                        String log = "received copy of an already handled test case, ignore: " + testScriptDescription;
+                        Log.writeLog(this, log);
+                        this.tellUI(log);
+                        continue;
+                    }
 
                     /*
                     // produce test running thread
@@ -173,12 +193,17 @@ public void receivedTestScript(CharSequence testScriptChannel) {
                             Integer.toString(testScriptDescription.testNumber),
                             testScriptDescription.script).start();
                     this.tellUI("running script: " + testScriptDescription.script);
+                    Log.writeLog(this, "script running, remember to avoid redo it: " + testScriptDescription);
+                    this.handledScripts.add(testScriptDescription);
                 } else {
-                    this.tellUI("test script received, not for me though. Index: " + scriptIndex);
+                    this.tellUI("test script received, not for me though. Index: " + testScriptDescription);
+                    Log.writeLog(this, "test script received, not for me: " + testScriptDescription);
                 }
             }
         } catch (IOException | SharkException e) {
-            this.tellUIError("problems handling test script received channel: " + e.getLocalizedMessage());
+            String log = "problems handling test script received channel: " + e.getLocalizedMessage();
+            this.tellUIError(log);
+            Log.writeLogErr(this, log);
         }
     }
 
@@ -234,6 +259,7 @@ public void receivedScriptRQ(CharSequence scriptRQChannel) {
             this.tellUI("script request received - ignore - not a test orchestrator");
             return;
         } else {
+            Log.writeLog(this, "script request received - try to stage a test");
             this.tellUI("script request received - try to stage a test");
         }
         // add information of this new volunteer and see if we have enough participant for one new test
@@ -250,12 +276,16 @@ public void receivedScriptRQ(CharSequence scriptRQChannel) {
 
                     // add or replace information
                     this.availablePeers.put(peerHostDescription.peerID, peerHostDescription);
+                    String log = "added volunteering peer: " + peerHostDescription;
+                    this.tellUI(log);
+                    Log.writeLog(this, log);
 
                     // try to set up a test(s).
                     this.stageTests();
                 }
             } catch (SharkNetMessengerException | IOException | ASAPException e) {
                 this.tellUIError("problems handling script RQ channel: " + e.getLocalizedMessage());
+                Log.writeLogErr(this, "problems handling script RQ channel: " + e.getLocalizedMessage());
             }
         }
     }
@@ -266,6 +296,9 @@ private void stageTests() throws UnknownHostException {
         do {
             testEnsemble = this.findFittingPeers();
             if (testEnsemble != null) {
+                String log = "found enough peers for a new test run: test#" + testEnsemble.waitingTestIndex;
+                this.tellUI(log);
+                Log.writeLog(this, log);
                 // we found an ensemble to run a test
                 OrchestratedTest waitingTest = this.orchestratedTestsWaiting.get(testEnsemble.waitingTestIndex);
                 // add actual test ensemble
@@ -292,9 +325,11 @@ private void stageTests() throws UnknownHostException {
         if(!this.orchestratedTestsReady.isEmpty()) {
             // launch tests
             this.tellUI("test staged .. going to launch");
+            Log.writeLog(this, "test(s) staged .. going to launch");
             this.launchTests();
         } else {
             this.tellUI("couldn't stage a test - not enough peers");
+            Log.writeLog(this, "couldn't stage a test - not enough peers");
         }
     }
 
@@ -313,10 +348,14 @@ private class OrchestratedTestLauncher extends Thread {
         public static final String ORCHESTRATOR_PEER_NAME = "orchest";
         public static final String LAUNCH_TEST_TAG_PREAMBLE = "launchTest_";
         public final static int FINAL_WAIT_PERIODE_BEFORE_LAUNCH = 1000;
+        public final static int MAX_TEST_DURATION_IN_MILLIS = 10000;
 
         private static String scriptStartOrchestrator_SyncWithPeers = null;
         private static String scriptStartPeer_SyncWithOrchestator = null;
         private static String scriptEnd_Exit = null;
+        private static String scriptSetTimeBomb =
+                TestLanguageCompiler.CLI_TIME_BOMB + TestLanguageCompiler.CLI_SPACE
+                        + MAX_TEST_DURATION_IN_MILLIS + TestLanguageCompiler.LANGUAGE_SEPARATOR;
 
         OrchestratedTestLauncher(OrchestratedTest test2run) throws UnknownHostException {
             this.test2run = test2run;
@@ -390,6 +429,10 @@ public void run() {
             String[] effectiveScripts = new String[this.test2run.scripts.size()];
             for(int peerIndex = 0; peerIndex < this.test2run.scripts.size(); peerIndex++) {
                 sb = new StringBuilder();
+                // set time bomb to avoid orphan processes
+                SharkNetMessengerAppSupportingDistributedTesting.
+                        this.tellUI("WARNING: set timeBock in each peer script. Adopt this code for longer lasting test scenarios. <<<< WARNING");
+                sb.append(scriptSetTimeBomb);
                 // add open connection to orchestrator
                 sb.append(scriptStartPeer_SyncWithOrchestator);
 
@@ -420,15 +463,16 @@ public void run() {
             }
 
             // run orchestrator script first - wait to collect logs
+            Log.writeLog(this, "launching orchestrator: ");
             try {
                 ScriptRunnerProcess scriptRunnerProcess =
                         scriptRunnerProcess = new ScriptRunnerProcess(ORCHESTRATOR_PEER_NAME,
                         Integer.toString(this.testNumber), orchestratorScript);
                 scriptRunnerProcess.start();
             } catch (IOException e) {
-                SharkNetMessengerAppSupportingDistributedTesting.
-                        this.tellUIError("could not start orchestrator process / don't send scripts to peers: "
-                        + e.getStackTrace());
+                String log = "could not start orchestrator process / don't send scripts to peers: " + e.getStackTrace();
+                SharkNetMessengerAppSupportingDistributedTesting.this.tellUIError(log);
+                Log.writeLogErr(this, log);
                 return;
             }
 
@@ -447,6 +491,7 @@ public void run() {
             try { Thread.sleep(1000); } catch (InterruptedException e) {}
 
             SharkNetMessengerAppSupportingDistributedTesting.this.tellUI("sending test scripts to peers");
+            Log.writeLog(this, "sending test scripts to peers");
 
             try {
                 for (int i = 0; i < this.test2run.peerEnvironment.size(); i++) {
@@ -468,9 +513,13 @@ public void run() {
                             false, // no signing
                             false // no encryption
                     );
+                    Log.writeLog(this, "sent script: ip | test# | script"
+                            + peerEnvironment.peerID + " | "
+                            + this.testNumber + " | "
+                            + effectiveScripts[i]);
 
                     SharkNetMessengerAppSupportingDistributedTesting.this.
-                            tellUI("test scripts sent to " + peerEnvironment.ipAddress);
+                            tellUI("test scripts sent to " + peerEnvironment.peerID + "@" + peerEnvironment.ipAddress);
                 }
             }
             catch(IOException | SharkNetMessengerException ioe) {
@@ -487,7 +536,6 @@ private void launchTests() throws UnknownHostException {
         while(!this.orchestratedTestsReady.isEmpty()) {
             OrchestratedTest readyTest = this.orchestratedTestsReady.remove(0);
             OrchestratedTestLauncher readyTestLauncher = new OrchestratedTestLauncher(readyTest);
-
             readyTestLauncher.start();
         }
     }
diff --git a/src/net/sharksystem/ui/messenger/cli/commands/testing/ScriptRunnerProcess.java b/src/net/sharksystem/ui/messenger/cli/commands/testing/ScriptRunnerProcess.java
@@ -10,19 +10,21 @@
 
 public class ScriptRunnerProcess {
     private final ProcessBuilder pb;
-    private String command;
 
     public ScriptRunnerProcess(String peerName, String testName, String script) throws IOException {
         // produce command line to launch a new SNM CLI
         peerName = Helper.getFriendlyPeerName(peerName);
+        peerName = peerName + "_" + testName;
+
+        Log.writeLog(this, "building process: " + peerName + " | " + script);
 
         List<String> args = new ArrayList<>();
         args.add("java");
         args.add("-jar");
         args.add(Helper.SNM_CLI_JAR_FILENAME);
-        args.add(peerName + "_" + testName);
+        args.add(peerName);
         args.add(String.valueOf(ASAPHubManager.DEFAULT_WAIT_INTERVAL_IN_SECONDS));
-        args.add("sendMessage Hi;exit");
+        args.add(script);
         this.pb = new ProcessBuilder(args);
 
         File log = new File(peerName + "_uiOutErr.txt");
diff --git a/src/net/sharksystem/ui/messenger/cli/commands/testing/TestScriptDescription.java b/src/net/sharksystem/ui/messenger/cli/commands/testing/TestScriptDescription.java
@@ -14,6 +14,13 @@ public class TestScriptDescription {
     public final int testNumber;
     public final String peerID;
 
+    public static boolean same(TestScriptDescription a, TestScriptDescription b) {
+        return a.testNumber == b.testNumber
+                && a.peerIndex == b.peerIndex
+                && a.ipAddress.equalsIgnoreCase(b.ipAddress)
+                && a.peerID.equalsIgnoreCase(b.peerID);
+    }
+
     public TestScriptDescription(String ipAddress, int peerIndex, String script, int testNumber, String peerID) {
         this.ipAddress = ipAddress;
         this.peerIndex = peerIndex;
@@ -46,6 +53,8 @@ public byte[] getMessageBytes() throws IOException {
 
     public String toString() {
         return "ip: " + this.ipAddress + " | peerIndex: " + this.peerIndex
-                + " | peerID: " + this.peerID + " | script: " + this.script;
+                + " | peerID: " + this.peerID
+                + " | test#: " + this.testNumber
+                + " | script: " + this.script;
     }
 }
diff --git a/src/net/sharksystem/ui/messenger/cli/commands/testing/UICommandOrchestrateTest.java b/src/net/sharksystem/ui/messenger/cli/commands/testing/UICommandOrchestrateTest.java
@@ -45,6 +45,7 @@ protected void execute() throws Exception {
         scripts.add(script0_A);
         scripts.add(script0_B);
          */
+
         scripts.add(script1_A);
         scripts.add(script1_B);
 
diff --git a/src/net/sharksystem/ui/messenger/cli/commands/testing/UICommandTimeBomb.java b/src/net/sharksystem/ui/messenger/cli/commands/testing/UICommandTimeBomb.java
@@ -0,0 +1,42 @@
+package net.sharksystem.ui.messenger.cli.commands.testing;
+
+import net.sharksystem.SharkException;
+import net.sharksystem.ui.messenger.cli.SharkNetMessengerApp;
+import net.sharksystem.ui.messenger.cli.SharkNetMessengerUI;
+import net.sharksystem.ui.messenger.cli.commands.helper.AbstractCommandNoParameter;
+import net.sharksystem.ui.messenger.cli.commands.helper.AbstractCommandWithSingleInteger;
+
+/**
+ * Command for terminating the messenger.
+ */
+public class UICommandTimeBomb extends AbstractCommandWithSingleInteger {
+    public UICommandTimeBomb(SharkNetMessengerApp sharkMessengerApp, SharkNetMessengerUI sharkMessengerUI,
+                             String identifier, boolean rememberCommand) {
+        super(sharkMessengerApp, sharkMessengerUI, identifier, rememberCommand);
+    }
+
+    @Override
+    public void execute() throws Exception {
+        int millis = this.getIntegerArgument();
+        this.getSharkMessengerApp().tellUI("going to kill this process in " + millis +" ms");
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(UICommandTimeBomb.this.getIntegerArgument());
+                    UICommandTimeBomb.this.getSharkMessengerApp().tellUI("max time ended: end CLI for peer " +
+                            UICommandTimeBomb.this.getSharkMessengerApp().getSharkPeer().getPeerID());
+                } catch (SharkException | InterruptedException e) {
+                    UICommandTimeBomb.this.getSharkMessengerApp().tellUI("max time ended: end CLI");
+                }
+                System.exit(0);
+            }
+        }).start();
+    }
+
+    @Override
+    public String getDescription() {
+        return "Terminates the messenger after some milliseconds";
+    }
+}
diff --git a/src/net/sharksystem/ui/messenger/cli/testlanguage/TestLanguageCompiler.java b/src/net/sharksystem/ui/messenger/cli/testlanguage/TestLanguageCompiler.java
@@ -20,6 +20,7 @@ public class TestLanguageCompiler {
     public static final String CLI_RELEASE = "release";
     public static final String CLI_EXIT = "exit";
     public static final String CLI_WAIT = "wait";
+    public static final String CLI_TIME_BOMB = "timeBomb";
 
     /**
      * sentence -> command SEPARATOR command
