test: update tt3 version

Author: Alex-pvl

.github/workflows/tests.yml

@@ -68,7 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tarantool-version: [ "2.11.8-ubuntu20.04", "3.0.1-old" ]
+        tarantool-version: [ "2.11.8-ubuntu20.04", "3.5.0" ]
     timeout-minutes: 40
     steps:
       - uses: actions/checkout@v6
@@ -127,7 +127,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tarantool-version: [ "2.11.8-ubuntu20.04", "3.0.1-old" ]
+        tarantool-version: [ "2.11.8-ubuntu20.04", "3.5.0" ]
     timeout-minutes: 40
     steps:
       - uses: actions/checkout@v6

tarantool-balancer/src/test/java/io/tarantool/balancer/integration/BaseTest.java

@@ -17,16 +17,13 @@
 import io.netty.util.Timer;
 import org.msgpack.value.ArrayValue;
 import org.msgpack.value.ValueFactory;
-import org.testcontainers.containers.tarantool.TarantoolContainer;
 
 import io.tarantool.core.ManagedResource;
 import io.tarantool.core.connection.ConnectionFactory;
 import io.tarantool.pool.HeartbeatOpts;
 
 public abstract class BaseTest {
 
-  protected static TarantoolContainer<?> container;
-
   protected static final Bootstrap bootstrap =
       new Bootstrap()
           .group(new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory()))
@@ -69,6 +66,10 @@ public abstract class BaseTest {
   protected static final int INVALID_PINGS = 2;
   protected static final long INVALIDATION_TIMEOUT =
       ((long) (INVALID_PINGS + 1) * (PING_INTERVAL + TIMER_ERROR_MS));
+
+  /** Longer wait for invalidation (e.g. Tarantool 3 with more connections). */
+  protected static final long EXTENDED_INVALIDATION_TIMEOUT = INVALIDATION_TIMEOUT * 3;
+
   protected static final long RESTORE_TIMEOUT =
       (WINDOW_SIZE + 1) * (PING_INTERVAL + TIMER_ERROR_MS);
   protected static final ArrayValue emptyArgs = ValueFactory.emptyArray();

tarantool-balancer/src/test/java/io/tarantool/balancer/integration/DistributingRoundRobinBalancerTest.java

@@ -16,6 +16,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
+import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommandDecoded;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.netty.util.HashedWheelTimer;
@@ -40,7 +41,7 @@
 import io.tarantool.pool.IProtoClientPoolImpl;
 import io.tarantool.pool.InstanceConnectionGroup;
 
-@Timeout(value = 15)
+@Timeout(value = 25)
 public class DistributingRoundRobinBalancerTest extends BaseTest {
 
   private static final Logger log =
@@ -51,11 +52,14 @@ public class DistributingRoundRobinBalancerTest extends BaseTest {
 
   @BeforeEach
   public void setUp() {
-    tt1 = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3301, 3305);
-    tt2 = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3301, 3305);
+    tt1 = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3305);
+    tt2 = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3305);
 
     tt1.start();
     tt2.start();
+
+    execInitScript(tt1);
+    execInitScript(tt2);
     do {
       count1 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
       count2 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
@@ -178,8 +182,10 @@ public void testDistributingRoundRobinWithUnavailableNodeA() throws Exception {
     execLua(tt2, "reset_call_counter()");
 
     log.info("waiting for invalidation");
-    Thread.sleep(INVALIDATION_TIMEOUT);
+    Thread.sleep(EXTENDED_INVALIDATION_TIMEOUT);
 
+    execLua(tt1, "reset_call_counter()");
+    execLua(tt2, "reset_call_counter()");
     log.info("walk on node B only");
     walkAndJoin(rrBalancer, nodeVisits * 2);
     assertEquals(0, getCallCounter(tt1));
@@ -235,8 +241,10 @@ public void testDistributingRoundRobinWithUnavailableNodeANoUnlock() throws Exce
     execLua(tt2, "reset_call_counter()");
 
     log.info("waiting for invalidation");
-    Thread.sleep(INVALIDATION_TIMEOUT);
+    Thread.sleep(EXTENDED_INVALIDATION_TIMEOUT);
 
+    execLua(tt1, "reset_call_counter()");
+    execLua(tt2, "reset_call_counter()");
     log.info("walk on node B only");
     walkAndJoin(rrBalancer, nodeVisits * 2);
     assertEquals(0, getCallCounter(tt1));
@@ -290,7 +298,7 @@ public void testDistributingRoundRobinNoAvailableClients() throws Exception {
     execLua(tt2, "lock_pipe(true); reset_call_counter()");
 
     log.info("waiting for invalidation");
-    Thread.sleep(INVALIDATION_TIMEOUT);
+    Thread.sleep(EXTENDED_INVALIDATION_TIMEOUT);
 
     Throwable exc = assertThrows(ExecutionException.class, () -> rrBalancer.getNext().get());
     assertEquals(NoAvailableClientsException.class, exc.getCause().getClass());

tarantool-balancer/src/test/java/io/tarantool/balancer/integration/RoundRobinBalancerTest.java

@@ -11,6 +11,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
+import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommandDecoded;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -40,6 +41,9 @@ public static void setUp() {
     tt1.start();
     tt2.start();
 
+    execInitScript(tt1);
+    execInitScript(tt2);
+
     count1 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
     count2 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
   }

tarantool-client/src/main/java/io/tarantool/client/crud/TarantoolCrudClient.java

@@ -18,10 +18,10 @@
 public interface TarantoolCrudClient extends TarantoolClient {
 
   /** Default username for CRUD clients. */
-  String DEFAULT_CRUD_USERNAME = "admin";
+  String DEFAULT_CRUD_USERNAME = "api_user";
 
   /** Default password for CRUD admin username. */
-  String DEFAULT_CRUD_PASSWORD = "secret-cluster-cookie";
+  String DEFAULT_CRUD_PASSWORD = "secret";
 
   /**
    * Function returns {@link TarantoolCrudSpace space} with the name specified as the input

tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolBoxClientTest.java

@@ -33,6 +33,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
+import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommand;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommandDecoded;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -98,6 +99,7 @@ public void truncateSpaces() throws Exception {
   public static void setUp() throws Exception {
     tt = createTarantoolContainer().withEnv(ENV_MAP);
     tt.start();
+    execInitScript(tt);
 
     client =
         TarantoolFactory.box()
@@ -1352,26 +1354,14 @@ void testClientType() {
     assertEquals(ClientType.BOX, client.getType());
   }
 
-  @Test
-  void testUserWithNullPassword() throws Exception {
-    TarantoolBoxClient serviceClient =
-        TarantoolFactory.box()
-            .withHost(tt.getHost())
-            .withPort(tt.getFirstMappedPort())
-            .withUser("service_user")
-            .withPassword("")
-            .build();
-    assertEquals(Collections.singletonList(123), serviceClient.eval("return 123").join().get());
-  }
-
   @Test
   void testGetServerVersion() throws Exception {
     TarantoolBoxClient client =
         TarantoolFactory.box()
             .withHost(tt.getHost())
             .withPort(tt.getFirstMappedPort())
-            .withUser("service_user")
-            .withPassword("")
+            .withUser("api_user")
+            .withPassword("secret")
             .build();
 
     TarantoolVersion version = client.getServerVersion().join();

tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolClientTest.java

@@ -25,6 +25,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
+import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommand;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.AfterAll;
@@ -60,6 +61,7 @@ public class TarantoolClientTest extends BaseTest {
   public static void setUp() throws Exception {
     tt = createTarantoolContainer().withEnv(ENV_MAP);
     tt.start();
+    execInitScript(tt);
 
     client = getClientAndConnect();
     client.getPool().forEach(c -> c.authorize(API_USER, CREDS.get(API_USER)).join());
@@ -353,7 +355,7 @@ public void testServerInformation() {
     int serverFeatureAmount = 4;
 
     if (tarantoolVersion == '3') {
-      serverFeatureAmount = 7;
+      serverFeatureAmount = 10;
     }
     IProtoClient iprotoClient = client.getPool().get("default", 0).join();
     if (tarantoolVersion != '3') {

tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java

@@ -89,8 +89,8 @@
 @Testcontainers
 public class TarantoolCrudClientTest extends BaseTest {
 
-  public static final String SECRET_CLUSTER_COOKIE = "secret-cluster-cookie";
-  public static final String ADMIN = "admin";
+  public static final String SECRET_CLUSTER_COOKIE = "secret";
+  public static final String ADMIN = "api_user";
   public static final int PERSON_COUNT = 1000;
   public static final Map<String, Object> OPTIONS =
       new HashMap<String, Object>() {
@@ -138,7 +138,9 @@ public static void setUp() throws Exception {
               "tarantool/tarantool");
 
       if (!vshardClusterContainer.isRunning()) {
-        vshardClusterContainer.withPrivilegedMode(true);
+        vshardClusterContainer
+            .withCreateContainerCmdModifier(cmd -> cmd.withUser("root"))
+            .withPrivilegedMode(true);
         vshardClusterContainer.start();
       }
       clusterContainer = vshardClusterContainer;

tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java

@@ -102,13 +102,15 @@ private void execute() {
   @BeforeAll
   public static void setUp() throws Exception {
     if (isCartridgeAvailable()) {
-      tt.start();
+      if (!tt.isRunning()) {
+        tt.start();
+      }
       client =
           TarantoolFactory.crud()
               .withHost(tt.getHost())
               .withPort(tt.getPort())
-              .withUser("admin")
-              .withPassword("secret-cluster-cookie")
+              .withUser("api_user")
+              .withPassword("secret")
               .build();
     }
   }

tarantool-core/src/test/java/io/tarantool/core/integration/ConnectionCloseOnClientSideTest.java

@@ -12,6 +12,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
+import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -32,6 +33,7 @@ public class ConnectionCloseOnClientSideTest extends BaseTest {
   static void setUp() {
     tt = createTarantoolContainer().withEnv(ENV_MAP);
     tt.start();
+    execInitScript(tt);
   }
 
   @AfterAll