#2043 add BasicHaTest and first simple resync scenario

.github/workflows/mvn-test.yml

@@ -67,50 +67,50 @@
           key: maven-repo-${{ github.run_id }}-${{ github.run_attempt }}
 
   unit-tests:
     runs-on: ubuntu-latest
     needs: build-and-package
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
           java-version: 21
           cache: "maven"
 
       - name: Restore Maven artifacts
         uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ~/.m2/repository
           key: maven-repo-${{ github.run_id }}-${{ github.run_attempt }}
 
       - name: Run Unit Tests with Coverage
         # verify because it runs the tests and generates the coverage report, ITs are skipped
         run: ./mvnw verify -Pcoverage --batch-mode --errors --fail-never --show-version -pl !e2e,!e2e-perf
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Unit Tests Reporter
         uses: dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3 # v2.1.1
         if: success() || failure()
         with:
           name: Unit Tests Report
           path: "**/surefire-reports/TEST*.xml"
           list-suites: "failed"
           list-tests: "failed"
           reporter: java-junit
 
       - name: Upload unit test coverage reports
         if: success() || failure()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: unit-coverage-reports
           path: |
             **/jacoco*.xml
           retention-days: 1
 
   integration-tests:
     runs-on: ubuntu-latest
     needs: build-and-package
     steps:
@@ -130,7 +130,7 @@
           key: maven-repo-${{ github.run_id }}-${{ github.run_attempt }}
 
       - name: Run Integration Tests with Coverage
-        run: ./mvnw verify -DskipTests -Pintegration -Pcoverage  --batch-mode --errors --fail-never --show-version -pl !e2e,!e2e-perf
+        run: ./mvnw verify -DskipTests -Pintegration -Pcoverage  --batch-mode --errors --fail-never --show-version -pl !e2e,!e2e-perf,!resilience
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -241,6 +241,50 @@
           list-tests: "failed"
           reporter: java-junit
 
+  java-resilience-tests:
+    runs-on: ubuntu-latest
+    needs: build-and-package
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: "temurin"
+          java-version: 21
+          cache: "maven"
+
+      - name: Restore Maven artifacts
+        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        with:
+          path: ~/.m2/repository
+          key: maven-repo-${{ github.run_id }}-${{ github.run_attempt }}
+
+      - name: Restore Docker image
+        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        with:
+          path: /tmp/arcadedb-image.tar
+          key: docker-image-${{ github.run_id }}-${{ github.run_attempt }}
+
+      - name: Load Docker image
+        run: docker load < /tmp/arcadedb-image.tar
+
+      - name: Resilience Tests
+        run: ./mvnw verify -Pintegration -pl resilience
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ARCADEDB_DOCKER_IMAGE: ${{ needs.build-and-package.outputs.image-tag }}
+
+      - name: Resilinece Tests Reporter
+        uses: dorny/test-reporter@6e6a65b7a0bd2c9197df7d0ae36ac5cee784230c # v2.0.0
+        if: success() || failure()
+        with:
+          name: Java Resilience Tests Report
+          path: "resilience/target/failsafe-reports/TEST*.xml"
+          list-suites: "failed"
+          list-tests: "failed"
+          reporter: java-junit
+
   js-e2e-tests:
     runs-on: ubuntu-latest
     needs: build-and-package

e2e/pom.xml

@@ -59,6 +59,12 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>com.arcadedb</groupId>
+            <artifactId>arcadedb-network</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -79,14 +85,14 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>toxiproxy</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.arcadedb</groupId>
-            <artifactId>arcadedb-network</artifactId>
-            <version>${project.parent.version}</version>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

engine/src/main/java/com/arcadedb/database/Database.java

@@ -33,8 +33,8 @@
 import com.arcadedb.schema.Schema;
 import com.arcadedb.utility.ExcludeFromJacocoGeneratedReport;
 
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Map;
+import java.util.concurrent.Callable;
 
 @ExcludeFromJacocoGeneratedReport
 public interface Database extends BasicDatabase {

engine/src/main/java/com/arcadedb/database/TransactionContext.java

@@ -39,12 +39,21 @@
 import com.arcadedb.log.LogManager;
 import com.arcadedb.schema.LocalSchema;
 
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.logging.*;
-import java.util.stream.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 /**
  * Manage the transaction context. When the transaction begins, the modifiedPages map is initialized. This allows to always delegate

engine/src/main/java/com/arcadedb/database/async/DatabaseAsyncExecutorImpl.java

@@ -39,10 +39,18 @@
 import com.arcadedb.schema.EdgeType;
 import com.conversantmedia.util.concurrent.PushPullBlockingQueue;
 
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.logging.*;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
 
 public class DatabaseAsyncExecutorImpl implements DatabaseAsyncExecutor {
   private final DatabaseInternal     database;
@@ -52,9 +60,9 @@ public class DatabaseAsyncExecutorImpl implements DatabaseAsyncExecutor {
   private       int                  parallelLevel                 = 1;
   private       int                  commitEvery;
   private       int                  backPressurePercentage        = 0;
-  private boolean           transactionUseWAL             = true;
-  private WALFile.FlushType transactionSync               = WALFile.FlushType.NO;
-  private long              checkForStalledQueuesMaxDelay = 5_000;
+  private       boolean              transactionUseWAL             = true;
+  private       WALFile.FlushType    transactionSync               = WALFile.FlushType.NO;
+  private       long                 checkForStalledQueuesMaxDelay = 5_000;
   private final AtomicLong           transactionCounter            = new AtomicLong();
   private final AtomicLong           commandRoundRobinIndex        = new AtomicLong();
 

engine/src/main/java/com/arcadedb/utility/FileUtils.java

@@ -181,17 +181,6 @@ public static void deleteRecursively(final File rootFile) {
         break;
 
       } catch (final IOException e) {
-//        if (System.getProperty("os.name").toLowerCase().contains("win")) {
-//          // AVOID LOCKING UNDER WINDOWS
-//          try {
-//            LogManager.instance()
-//                .log(rootFile, Level.WARNING, "Cannot delete directory '%s'. Forcing GC cleanup and try again (attempt=%d)", e, rootFile, attempt);
-//            System.gc();
-//            Thread.sleep(1000);
-//          } catch (Exception ex) {
-//            // IGNORE IT
-//          }
-//        } else
         LogManager.instance().log(rootFile, Level.WARNING, "Cannot delete directory '%s'", e, rootFile);
       }
     }

network/src/main/java/com/arcadedb/network/HostUtil.java

@@ -18,12 +18,20 @@
  */
 
 /**
- * @author Luca Garulli ([email protected])
+ * Utility class for parsing host addresses.
  */
 public class HostUtil {
   public static final String CLIENT_DEFAULT_PORT = "2480";
   public static final String HA_DEFAULT_PORT     = "2424";
 
+  /**
+   * Parses the host address and returns the host and port. If the port is not specified, it returns the default port.
+   *
+   * @param host        The host address to parse.
+   * @param defaultPort The default port to use if no port is specified in the host address.
+   *
+   * @return An array containing the host and port.
+   */
   public static String[] parseHostAddress(String host, final String defaultPort) {
     if (host == null)
       throw new IllegalArgumentException("Host null");
@@ -33,14 +41,25 @@ public static String[] parseHostAddress(String host, final String defaultPort) {
     if (host.isEmpty())
       throw new IllegalArgumentException("Host is empty");
 
+    String alias = "";
+    if (host.startsWith("{")) {
+      alias = host.substring(host.indexOf("{") + 1, host.indexOf("}"));
+      // REMOVE ALIAS
+      host = host.substring(host.indexOf("}") + 1);
+    }
+
     final String[] parts = host.split(":");
-    if (parts.length == 1 || parts.length == 8)
+    if (parts.length == 1 || parts.length == 8) {
       // ( IPV4 OR IPV6 ) NO PORT
-      return new String[] { host, defaultPort };
-    else if (parts.length == 2 || parts.length == 9) {
+      if (alias.isEmpty())
+        alias = host;
+      return new String[] { host, defaultPort, alias };
+    } else if (parts.length == 2 || parts.length == 9) {
       // ( IPV4 OR IPV6 ) + PORT
       final int pos = host.lastIndexOf(":");
-      return new String[] { host.substring(0, pos), host.substring(pos + 1) };
+      if (alias.isEmpty())
+        alias = host.substring(0, pos);
+      return new String[] { host.substring(0, pos), host.substring(pos + 1), alias };
     }
 
     throw new IllegalArgumentException("Invalid host " + host);

network/src/main/java/com/arcadedb/remote/RemoteDatabase.java

@@ -436,7 +436,7 @@ public ResultSet command(final String language, final String command, final Cont
     checkDatabaseIsOpen();
     stats.commands.incrementAndGet();
 
-    return (ResultSet) databaseCommand("command", language, command, params, true,
+    return (ResultSet) databaseCommand("command", language, command, params, false,
         (connection, response) -> createResultSet(response));
   }
 
@@ -446,7 +446,7 @@ public ResultSet command(final String language, final String command, final Obje
     stats.commands.incrementAndGet();
 
     final Map<String, Object> params = mapArgs(args);
-    return (ResultSet) databaseCommand("command", language, command, params, true,
+    return (ResultSet) databaseCommand("command", language, command, params, false,
         (connection, response) -> createResultSet(response));
   }
 

network/src/main/java/com/arcadedb/remote/RemoteHttpComponent.java

@@ -196,11 +196,9 @@ Object httpCommand(final String method,
     Pair<String, Integer> connectToServer =
         leaderIsPreferable && leaderServer != null ? leaderServer : new Pair<>(currentServer, currentPort);
 
-    String server = null;
-
+    String server = connectToServer.getFirst() + ":" + connectToServer.getSecond();
+    String url = protocol + "://" + server + "/api/v" + apiVersion + "/" + operation;
     for (int retry = 0; retry < maxRetry && connectToServer != null; ++retry) {
-      server = connectToServer.getFirst() + ":" + connectToServer.getSecond();
-      String url = protocol + "://" + server + "/api/v" + apiVersion + "/" + operation;
 
       if (extendedURL != null)
         url += "/" + extendedURL;
@@ -385,9 +383,9 @@ void requestClusterConfiguration() {
             final String sHost = serverParts[0];
             final int sPort = Integer.parseInt(serverParts[1]);
 
-            replicaServerList.add(new Pair(sHost, sPort));
+            replicaServerList.add(new Pair<>(sHost, sPort));
           } catch (Exception e) {
-            LogManager.instance().log(this, Level.SEVERE, "Invalid replica server address '%s'", null, serverEntry);
+            LogManager.instance().log(this, Level.SEVERE, "Invalid replica server address '%s'", e, serverEntry);
           }
         }
       }

network/src/main/java/com/arcadedb/remote/RemoteServer.java

@@ -44,7 +44,7 @@ public RemoteServer(final String server, final int port, final String userName,
   }
 
   public void create(final String databaseName) {
-    serverCommand("POST", "create database " + databaseName, true, true, null);
+    serverCommand("POST", "create database " + databaseName, false, true, null);
   }
 
   public List<String> databases() {

network/src/test/java/com/arcadedb/HostUtilTest.java

@@ -30,32 +30,45 @@ public class HostUtilTest {
   @Test
   public void testIPv4() {
     final String[] parts = HostUtil.parseHostAddress("10.33.5.22", HostUtil.CLIENT_DEFAULT_PORT);
-    assertThat(parts.length).isEqualTo(2);
+    assertThat(parts.length).isEqualTo(3);
     assertThat(parts[0]).isEqualTo("10.33.5.22");
     assertThat(parts[1]).isEqualTo(HostUtil.CLIENT_DEFAULT_PORT);
+    assertThat(parts[2]).isEqualTo("10.33.5.22");
+  }
+
+  @Test
+  public void testIPv4WithAliasAndPort() {
+    final String[] parts = HostUtil.parseHostAddress("{alias}10.33.5.22:1234", HostUtil.CLIENT_DEFAULT_PORT);
+    assertThat(parts.length).isEqualTo(3);
+    assertThat(parts[0]).isEqualTo("10.33.5.22");
+    assertThat(parts[1]).isEqualTo("1234");
+    assertThat(parts[2]).isEqualTo("alias");
   }
 
   @Test
   public void testIPv4WithPort() {
     final String[] parts = HostUtil.parseHostAddress("10.33.5.22:33", HostUtil.CLIENT_DEFAULT_PORT);
-    assertThat(parts.length).isEqualTo(2);
+    assertThat(parts.length).isEqualTo(3);
     assertThat(parts[0]).isEqualTo("10.33.5.22");
     assertThat(parts[1]).isEqualTo("33");
+    assertThat(parts[2]).isEqualTo("10.33.5.22");
   }
 
   @Test
   public void testIPv6() {
     final String[] parts = HostUtil.parseHostAddress("fe80:0:0:0:250:56ff:fe9a:6990", HostUtil.CLIENT_DEFAULT_PORT);
-    assertThat(parts.length).isEqualTo(2);
+    assertThat(parts.length).isEqualTo(3);
     assertThat(parts[0]).isEqualTo("fe80:0:0:0:250:56ff:fe9a:6990");
     assertThat(parts[1]).isEqualTo(HostUtil.CLIENT_DEFAULT_PORT);
+    assertThat(parts[2]).isEqualTo("fe80:0:0:0:250:56ff:fe9a:6990");
   }
 
   @Test
   public void testIPv6WithPort() {
     final String[] parts = HostUtil.parseHostAddress("fe80:0:0:0:250:56ff:fe9a:6990:22", HostUtil.CLIENT_DEFAULT_PORT);
-    assertThat(parts.length).isEqualTo(2);
+    assertThat(parts.length).isEqualTo(3);
     assertThat(parts[0]).isEqualTo("fe80:0:0:0:250:56ff:fe9a:6990");
     assertThat(parts[1]).isEqualTo("22");
+    assertThat(parts[2]).isEqualTo("fe80:0:0:0:250:56ff:fe9a:6990");
   }
 }

pom.xml

@@ -140,6 +140,7 @@
         <module>package</module>
         <module>e2e</module>
         <module>e2e-perf</module>
+        <module>resilience</module>
     </modules>
 
     <build>
@@ -292,7 +293,7 @@
                     <publishingServerId>central</publishingServerId>
                     <autoPublish>true</autoPublish>
                     <excludeArtifacts>
-                        arcadedb-coverage,arcadedb-e2e,arcadedb-e2e-perf
+                        arcadedb-coverage,arcadedb-e2e,arcadedb-e2e-perf,arcadedb-resilience-tests
                     </excludeArtifacts>
                 </configuration>
             </plugin>