IGNITE-24267 Heap lock manager behave incorrectly in case of overflow (#5096)

Author: vldpyatkov

modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/AbstractMultiNodeBenchmark.java

@@ -209,7 +209,7 @@ private void startCluster() throws Exception {
                 + "  rest.port: {},\n"
                 + "  raft.fsync = " + fsync() + ",\n"
                 + "  system.partitionsLogPath = \"" + logPath() + "\",\n"
-                + "  failureHandler.handler: {\n" 
+                + "  failureHandler.handler: {\n"
                 + "      type: \"" + StopNodeOrHaltFailureHandlerConfigurationSchema.TYPE + "\",\n"
                 + "      tryStop: true,\n"
                 + "      timeoutMillis: 60000,\n" // 1 minute for graceful shutdown

modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/LockManagerBenchmark.java

@@ -62,7 +62,7 @@ public class LockManagerBenchmark {
      */
     @Setup
     public void setUp() {
-        lockManager = new HeapLockManager(DEFAULT_SLOTS, DEFAULT_SLOTS);
+        lockManager = new HeapLockManager(DEFAULT_SLOTS);
         lockManager.start(new WaitDieDeadlockPreventionPolicy());
         generator = new TransactionIdGenerator(0);
         clock = new TestHybridClock(() -> 0L);

modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItLockTableTest.java

@@ -102,7 +102,7 @@ public class ItLockTableTest extends IgniteAbstractTest {
     @InjectConfiguration
     protected static StorageUpdateConfiguration storageUpdateConfiguration;
 
-    @InjectConfiguration("mock.properties: { lockMapSize: \"" + CACHE_SIZE + "\", rawSlotsMaxSize: \"131072\" }")
+    @InjectConfiguration("mock.properties: { lockMapSize: \"" + CACHE_SIZE + "\" }")
     private static SystemLocalConfiguration systemLocalConfiguration;
 
     @InjectExecutorService
@@ -180,11 +180,11 @@ public void after() throws Exception {
      * Test that a lock table behaves correctly in case of lock cache overflow.
      */
     @Test
-    public void testCollision() {
+    public void testTakeMoreLocksThanAfford() {
         RecordView<Tuple> view = testTable.recordView();
 
         int i = 0;
-        final int count = 1000;
+        final int count = 100;
         List<Transaction> txns = new ArrayList<>();
         while (i++ < count) {
             Transaction tx = txTestCluster.igniteTransactions().begin();
@@ -200,7 +200,7 @@ public void testCollision() {
                 total += slot.waitersCount();
             }
 
-            return total == count && lockManager.available() == 0;
+            return total == CACHE_SIZE && lockManager.available() == 0;
         }, 10_000), "Some lockers are missing");
 
         int empty = 0;
@@ -212,8 +212,7 @@ public void testCollision() {
             int cnt = slot.waitersCount();
             if (cnt == 0) {
                 empty++;
-            }
-            if (cnt > 1) {
+            } else {
                 coll += cnt;
             }
         }
@@ -224,7 +223,7 @@ public void testCollision() {
 
         List<CompletableFuture<?>> finishFuts = new ArrayList<>();
         for (Transaction txn : txns) {
-            finishFuts.add(txn.commitAsync());
+            finishFuts.add(txn.rollbackAsync());
         }
 
         for (CompletableFuture<?> finishFut : finishFuts) {