[ignite] branch master updated: IGNITE-14624 Fixed an issue that caused AssertionError when a cluster was activated immediately after deactivation. Fixes #9080

[sk...@apache.org]

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

sk0x50 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new c0868ce  IGNITE-14624 Fixed an issue that caused AssertionError when a cluster was activated immediately after deactivation. Fixes #9080
c0868ce is described below

commit c0868ce3a727bc9e6d7ed5d710aace62ed39741e
Author: Slava Koptilin <sl...@gmail.com>
AuthorDate: Thu May 6 21:50:47 2021 +0300

    IGNITE-14624 Fixed an issue that caused AssertionError when a cluster was activated immediately after deactivation. Fixes #9080
---
 .../persistence/wal/filehandle/FileHandleManagerImpl.java      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileHandleManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileHandleManagerImpl.java
index 472d1ba..278ae63 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileHandleManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileHandleManagerImpl.java
@@ -630,13 +630,17 @@ public class FileHandleManagerImpl implements FileHandleManager {
             }
         }
 
-        /** Shutted down the worker. */
-        private void shutdown() {
+        /**
+         * Shutted down the worker.
+         *
+         * @throws IgniteInterruptedCheckedException If the worker was interrupted while waiting for shutting down.
+         */
+        private void shutdown() throws IgniteInterruptedCheckedException {
             synchronized (this) {
                 U.cancel(this);
             }
 
-            U.join(this, log);
+            U.join(runner());
         }
 
         /**