You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/08/22 18:10:02 UTC
ignite git commit: IGNITE-9296 Stop walSyncer thread before walWriter
thread in order to avoid hang up
Repository: ignite
Updated Branches:
refs/heads/master aa112a325 -> d91c6aa58
IGNITE-9296 Stop walSyncer thread before walWriter thread in order to avoid hang up
Signed-off-by: Andrey Gura <ag...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d91c6aa5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d91c6aa5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d91c6aa5
Branch: refs/heads/master
Commit: d91c6aa58a471451fa2de2557b377ebf674cefab
Parents: aa112a3
Author: Sergey Kosarev <sk...@gridgain.com>
Authored: Wed Aug 22 21:06:14 2018 +0300
Committer: Andrey Gura <ag...@apache.org>
Committed: Wed Aug 22 21:06:14 2018 +0300
----------------------------------------------------------------------
.../cache/persistence/wal/FileWriteAheadLogManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d91c6aa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
index 0525384..3fa499b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
@@ -563,6 +563,9 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
if (currHnd != null)
currHnd.close(false);
+ if (walSegmentSyncWorker != null)
+ walSegmentSyncWorker.shutdown();
+
if (walWriter != null)
walWriter.shutdown();
@@ -574,9 +577,6 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
if (decompressor != null)
decompressor.shutdown();
-
- if (walSegmentSyncWorker != null)
- walSegmentSyncWorker.shutdown();
}
catch (Exception e) {
U.error(log, "Failed to gracefully close WAL segment: " + this.currHnd.fileIO, e);