Repository: ignite Updated Branches: refs/heads/master 2aa8ace39 -> 29588c515
IGNITE-10465 Wait for local join before start TTL cleanup worker - Fixes #5705. Signed-off-by: Pavel Kovalenko <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/29588c51 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/29588c51 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/29588c51 Branch: refs/heads/master Commit: 29588c51556724940d92d6b077420f8f89baf34e Parents: 2aa8ace Author: Pavel Kovalenko <[email protected]> Authored: Thu Dec 20 12:00:38 2018 +0300 Committer: Pavel Kovalenko <[email protected]> Committed: Thu Dec 20 12:00:38 2018 +0300 ---------------------------------------------------------------------- .../cache/GridCacheSharedTtlCleanupManager.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/29588c51/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java index ad2342b..3934ad9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java @@ -130,20 +130,21 @@ public class GridCacheSharedTtlCleanupManager extends GridCacheSharedManagerAdap Throwable err = null; try { + cctx.discovery().localJoin(); + + assert !cctx.kernalContext().recoveryMode(); + while (!isCancelled()) { boolean expiredRemains = false; - // TTL cleanup is allowed only when node joined to topology. - if (!cctx.kernalContext().recoveryMode()) { - for (GridCacheTtlManager mgr : mgrs) { - updateHeartbeat(); + for (GridCacheTtlManager mgr : mgrs) { + updateHeartbeat(); - if (mgr.expire(CLEANUP_WORKER_ENTRIES_PROCESS_LIMIT)) - expiredRemains = true; + if (mgr.expire(CLEANUP_WORKER_ENTRIES_PROCESS_LIMIT)) + expiredRemains = true; - if (isCancelled()) - return; - } + if (isCancelled()) + return; } updateHeartbeat();
