[ignite-3] branch main updated: IGNITE-17676 Fixed race in AwaitTasksCompletionExecutor that causes tests to be flaky (#1077)

[ibessonov]

This is an automated email from the ASF dual-hosted git repository.

ibessonov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 076ce8bff9 IGNITE-17676 Fixed race in AwaitTasksCompletionExecutor 
that causes tests to be flaky (#1077)
076ce8bff9 is described below

commit 076ce8bff9afd2bc27bf324fd5730b9af365a27b
Author: ibessonov <bessonov...@gmail.com>
AuthorDate: Wed Sep 14 13:05:55 2022 +0300

    IGNITE-17676 Fixed race in AwaitTasksCompletionExecutor that causes tests 
to be flaky (#1077)
---
 .../internal/pagememory/tree/AbstractBplusTreePageMemoryTest.java     | 2 ++
 .../persistence/checkpoint/AwaitTasksCompletionExecutor.java          | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreePageMemoryTest.java
 
b/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreePageMemoryTest.java
index fed4ddd7fa..2d180f555b 100644
--- 
a/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreePageMemoryTest.java
+++ 
b/modules/page-memory/src/integrationTest/java/org/apache/ignite/internal/pagememory/tree/AbstractBplusTreePageMemoryTest.java
@@ -97,6 +97,7 @@ import org.apache.ignite.lang.IgniteStringBuilder;
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
@@ -1529,6 +1530,7 @@ public abstract class AbstractBplusTreePageMemoryTest 
extends BaseIgniteAbstract
      * @throws Exception if test failed
      */
     @Test
+    @Disabled("https://issues.apache.org/jira/browse/IGNITE-17235";)
     public void testPutSizeLivelock() throws Exception {
         MAX_PER_PAGE = 5;
         CNT = 800;
diff --git 
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/AwaitTasksCompletionExecutor.java
 
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/AwaitTasksCompletionExecutor.java
index b7de589108..4f568d2317 100644
--- 
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/AwaitTasksCompletionExecutor.java
+++ 
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/checkpoint/AwaitTasksCompletionExecutor.java
@@ -50,9 +50,9 @@ class AwaitTasksCompletionExecutor implements Executor {
     public void execute(Runnable command) {
         CompletableFuture<?> future = new CompletableFuture<>();
 
-        future.whenComplete((o, throwable) -> updateHeartbeat.run());
+        CompletableFuture<?> heartbeatFuture = future.whenComplete((o, 
throwable) -> updateHeartbeat.run());
 
-        pendingTaskFutures.add(future);
+        pendingTaskFutures.add(heartbeatFuture);
 
         executor.execute(() -> {
             try {