Repository: ignite Updated Branches: refs/heads/master 76297e2b2 -> b9100aa7c
IGNITE-8563 Fixed WAL file archiver does not propagate file archiving error to error handler Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b9100aa7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b9100aa7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b9100aa7 Branch: refs/heads/master Commit: b9100aa7c66fb09e873c14a7022ea7bebbf5c0c5 Parents: 76297e2 Author: Andrey Gura <[email protected]> Authored: Thu May 24 16:56:42 2018 +0300 Committer: Andrey Gura <[email protected]> Committed: Thu May 24 16:56:42 2018 +0300 ---------------------------------------------------------------------- .../wal/FileWriteAheadLogManager.java | 28 +++++++------------- .../wal/FsyncModeFileWriteAheadLogManager.java | 28 +++++++------------- 2 files changed, 20 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b9100aa7/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 ec9dae4..42ae846 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 @@ -1595,29 +1595,21 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl if (stopped) break; - try { - final SegmentArchiveResult res = archiveSegment(toArchive); + final SegmentArchiveResult res = archiveSegment(toArchive); - synchronized (this) { - while (locked.containsKey(toArchive) && !stopped) - wait(); + synchronized (this) { + while (locked.containsKey(toArchive) && !stopped) + wait(); - // Then increase counter to allow rollover on clean working file - changeLastArchivedIndexAndNotifyWaiters(toArchive); + // Then increase counter to allow rollover on clean working file + changeLastArchivedIndexAndNotifyWaiters(toArchive); - notifyAll(); - } - - if (evt.isRecordable(EventType.EVT_WAL_SEGMENT_ARCHIVED)) - evt.record(new WalSegmentArchivedEvent(cctx.discovery().localNode(), - res.getAbsIdx(), res.getDstArchiveFile())); + notifyAll(); } - catch (IgniteCheckedException e) { - synchronized (this) { - cleanErr = e; - notifyAll(); - } + if (evt.isRecordable(EventType.EVT_WAL_SEGMENT_ARCHIVED)) { + evt.record(new WalSegmentArchivedEvent(cctx.discovery().localNode(), + res.getAbsIdx(), res.getDstArchiveFile())); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/b9100aa7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java index 3e906d5..9636a72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java @@ -1440,29 +1440,21 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda if (stopped) break; - try { - final SegmentArchiveResult res = archiveSegment(toArchive); + final SegmentArchiveResult res = archiveSegment(toArchive); - synchronized (this) { - while (locked.containsKey(toArchive) && !stopped) - wait(); + synchronized (this) { + while (locked.containsKey(toArchive) && !stopped) + wait(); - // Then increase counter to allow rollover on clean working file - changeLastArchivedIndexAndWakeupCompressor(toArchive); + // Then increase counter to allow rollover on clean working file + changeLastArchivedIndexAndWakeupCompressor(toArchive); - notifyAll(); - } - - if (evt.isRecordable(EventType.EVT_WAL_SEGMENT_ARCHIVED)) - evt.record(new WalSegmentArchivedEvent(cctx.discovery().localNode(), - res.getAbsIdx(), res.getDstArchiveFile())); + notifyAll(); } - catch (IgniteCheckedException e) { - synchronized (this) { - cleanException = e; - notifyAll(); - } + if (evt.isRecordable(EventType.EVT_WAL_SEGMENT_ARCHIVED)) { + evt.record(new WalSegmentArchivedEvent(cctx.discovery().localNode(), + res.getAbsIdx(), res.getDstArchiveFile())); } } }
