(ignite-3) branch main updated: IGNITE-23095 Fix crashes in SystemDisasterRecoveryManagerImplTest (#4301)

[rpuch]

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

rpuch 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 0b993adcd4 IGNITE-23095 Fix crashes in 
SystemDisasterRecoveryManagerImplTest (#4301)
0b993adcd4 is described below

commit 0b993adcd40c8315218f8a5b9c13c004a011df84
Author: Roman Puchkovskiy <roman.puchkovs...@gmail.com>
AuthorDate: Wed Aug 28 21:51:05 2024 +0400

    IGNITE-23095 Fix crashes in SystemDisasterRecoveryManagerImplTest (#4301)
---
 .../system/SystemDisasterRecoveryManagerImplTest.java    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/modules/system-disaster-recovery/src/test/java/org/apache/ignite/internal/disaster/system/SystemDisasterRecoveryManagerImplTest.java
 
b/modules/system-disaster-recovery/src/test/java/org/apache/ignite/internal/disaster/system/SystemDisasterRecoveryManagerImplTest.java
index 27c5813fc8..013ec2b1cc 100644
--- 
a/modules/system-disaster-recovery/src/test/java/org/apache/ignite/internal/disaster/system/SystemDisasterRecoveryManagerImplTest.java
+++ 
b/modules/system-disaster-recovery/src/test/java/org/apache/ignite/internal/disaster/system/SystemDisasterRecoveryManagerImplTest.java
@@ -363,7 +363,7 @@ class SystemDisasterRecoveryManagerImplTest extends 
BaseIgniteAbstractTest {
         ClusterNode conductor = fromSelf ? thisNode : node2;
         handler.onReceived(resetClusterMessageOn2Nodes(conductor.name()), 
conductor, 0L);
 
-        assertTrue(waitForCondition(() -> vaultManager.get(new 
ByteArray(RESET_CLUSTER_MESSAGE_VAULT_KEY)) != null, 10_000));
+        waitTillResetClusterMessageGetsSavedToVault();
         VaultEntry entry = vaultManager.get(new 
ByteArray(RESET_CLUSTER_MESSAGE_VAULT_KEY));
         assertThat(entry, is(notNullValue()));
 
@@ -372,6 +372,10 @@ class SystemDisasterRecoveryManagerImplTest extends 
BaseIgniteAbstractTest {
         assertThatResetClusterMessageContentIsAsExpected(savedMessage, 
conductor.name());
     }
 
+    private void waitTillResetClusterMessageGetsSavedToVault() throws 
InterruptedException {
+        assertTrue(waitForCondition(() -> vaultManager.get(new 
ByteArray(RESET_CLUSTER_MESSAGE_VAULT_KEY)) != null, 10_000));
+    }
+
     private NetworkMessageHandler extractMessageHandler() {
         assertThat(manager.stopAsync(), willCompleteSuccessfully());
 
@@ -437,20 +441,26 @@ class SystemDisasterRecoveryManagerImplTest extends 
BaseIgniteAbstractTest {
     }
 
     @Test
-    void initiatesRestartWhenGetsMessageFromOtherNode() {
+    void initiatesRestartWhenGetsMessageFromOtherNode() throws Exception {
         NetworkMessageHandler handler = extractMessageHandler();
 
         handler.onReceived(resetClusterMessageOn2Nodes(node2.name()), node2, 
0L);
 
         verify(restarter, timeout(SECONDS.toMillis(10))).initiateRestart();
+
+        // Wait till it gets saved to Vault to avoid an attempt to write to it 
after the after-each method stops the Vault.
+        waitTillResetClusterMessageGetsSavedToVault();
     }
 
     @Test
-    void doesNotInitiateRestartWhenGetsMessageFromSelf() {
+    void doesNotInitiateRestartWhenGetsMessageFromSelf() throws Exception {
         NetworkMessageHandler handler = extractMessageHandler();
 
         handler.onReceived(resetClusterMessageOn2Nodes(thisNodeName), 
thisNode, 0L);
 
         verify(restarter, never()).initiateRestart();
+
+        // Wait till it gets saved to Vault to avoid an attempt to write to it 
after the after-each method stops the Vault.
+        waitTillResetClusterMessageGetsSavedToVault();
     }
 }