From 6c78963dea8ed6977681e99a9f7c7b2f63b29410 Mon Sep 17 00:00:00 2001 From: ibessonov Date: Fri, 4 Dec 2020 15:27:14 +0300 Subject: [PATCH] IGNITE-13808 Failure handling disabled for index validation. - Fixes #8535. Signed-off-by: Sergey Chugunov --- .../GridCommandHandlerIndexingClusterByClassTest.java | 7 +++++++ .../processors/cache/persistence/tree/BPlusTree.java | 5 ++++- .../internal/visor/verify/ValidateIndexesClosure.java | 10 +++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingClusterByClassTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingClusterByClassTest.java index 7d889c7f3d109..fc5a4656c263f 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingClusterByClassTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingClusterByClassTest.java @@ -17,6 +17,8 @@ package org.apache.ignite.util; +import org.apache.ignite.failure.FailureHandler; +import org.apache.ignite.failure.StopNodeFailureHandler; import org.junit.Test; import static org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_OK; @@ -42,6 +44,11 @@ public class GridCommandHandlerIndexingClusterByClassTest extends GridCommandHan createAndFillCache(client, CACHE_NAME, GROUP_NAME); } + /** {@inheritDoc} */ + @Override protected FailureHandler getFailureHandler(String igniteInstanceName) { + return new StopNodeFailureHandler(); + } + /** * Tests --cache check_index_inline_sizes works in case of all indexes have the same inline size. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java index ca92a71c0800b..c50e75dadf142 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java @@ -105,6 +105,9 @@ public abstract class BPlusTree extends DataStructure implements /** Wrapper for tree pages operations. Noop by default. Override for test purposes. */ public static PageHandlerWrapper testHndWrapper = null; + /** */ + public static final ThreadLocal suspendFailureDiagnostic = ThreadLocal.withInitial(() -> false); + /** Destroy msg. */ public static final String CONC_DESTROY_MSG = "Tree is being concurrently destroyed: "; @@ -6130,7 +6133,7 @@ protected CorruptedTreeException corruptedTreeException(String msg, Throwable ca * @param e Exception. */ protected void processFailure(FailureType failureType, Throwable e) { - if (failureProcessor != null) + if (failureProcessor != null && !suspendFailureDiagnostic.get()) failureProcessor.process(new FailureContext(failureType, e)); } diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java index d0107027f729f..c83d62cff8c64 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java @@ -54,6 +54,7 @@ import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow; import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager; +import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree; import org.apache.ignite.internal.processors.cache.persistence.tree.CorruptedTreeException; import org.apache.ignite.internal.processors.cache.verify.GridNotIdleException; import org.apache.ignite.internal.processors.cache.verify.IdleVerifyUtility; @@ -771,7 +772,14 @@ private Future> processIndexAsync( return calcExecutor.submit(new Callable>() { /** {@inheritDoc} */ @Override public Map call() { - return processIndex(cacheCtxWithIdx, idleChecker); + BPlusTree.suspendFailureDiagnostic.set(true); + + try { + return processIndex(cacheCtxWithIdx, idleChecker); + } + finally { + BPlusTree.suspendFailureDiagnostic.set(false); + } } }); }