This is an automated email from the ASF dual-hosted git repository. sergeychugunov 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 6c78963 IGNITE-13808 Failure handling disabled for index validation. - Fixes #8535. 6c78963 is described below commit 6c78963dea8ed6977681e99a9f7c7b2f63b29410 Author: ibessonov <bessonov...@gmail.com> AuthorDate: Fri Dec 4 15:27:14 2020 +0300 IGNITE-13808 Failure handling disabled for index validation. - Fixes #8535. Signed-off-by: Sergey Chugunov <sergey.chugu...@gmail.com> --- .../util/GridCommandHandlerIndexingClusterByClassTest.java | 7 +++++++ .../internal/processors/cache/persistence/tree/BPlusTree.java | 5 ++++- .../ignite/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 7d889c7..fc5a465 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 ca92a71..c50e75d 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<L, T extends L> extends DataStructure implements /** Wrapper for tree pages operations. Noop by default. Override for test purposes. */ public static PageHandlerWrapper<Result> testHndWrapper = null; + /** */ + public static final ThreadLocal<Boolean> suspendFailureDiagnostic = ThreadLocal.withInitial(() -> false); + /** Destroy msg. */ public static final String CONC_DESTROY_MSG = "Tree is being concurrently destroyed: "; @@ -6130,7 +6133,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements * @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 d010702..c83d62c 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.mvcc.MvccUtils; 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 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex return calcExecutor.submit(new Callable<Map<String, ValidateIndexesPartitionResult>>() { /** {@inheritDoc} */ @Override public Map<String, ValidateIndexesPartitionResult> call() { - return processIndex(cacheCtxWithIdx, idleChecker); + BPlusTree.suspendFailureDiagnostic.set(true); + + try { + return processIndex(cacheCtxWithIdx, idleChecker); + } + finally { + BPlusTree.suspendFailureDiagnostic.set(false); + } } }); }