You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by tk...@apache.org on 2025/10/14 07:33:02 UTC
(ignite-3) 01/01: IGNITE-26695 wip
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch ignite-26695
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 98834d90acb12277d8d740f0789c13bd9eacfbea
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Tue Oct 14 10:32:43 2025 +0300
IGNITE-26695 wip
---
.../metastorage/impl/MetaStorageCompactionTrigger.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageCompactionTrigger.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageCompactionTrigger.java
index f2fac54a972..222a1deb0c8 100644
--- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageCompactionTrigger.java
+++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageCompactionTrigger.java
@@ -22,13 +22,13 @@ import static java.util.concurrent.CompletableFuture.supplyAsync;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
import static org.apache.ignite.internal.util.ExceptionUtils.hasCause;
-import static org.apache.ignite.internal.util.ExceptionUtils.unwrapCause;
import static org.apache.ignite.internal.util.IgniteUtils.inBusyLock;
import static org.apache.ignite.internal.util.IgniteUtils.inBusyLockAsync;
import static org.apache.ignite.internal.util.IgniteUtils.inBusyLockSafe;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -306,9 +306,7 @@ public class MetaStorageCompactionTrigger implements IgniteComponent {
.thenRunAsync(() -> storage.compact(compactionRevision), compactionExecutor)
.whenComplete((unused, throwable) -> {
if (throwable != null) {
- Throwable cause = unwrapCause(throwable);
-
- if (!(cause instanceof NodeStoppingException)) {
+ if (!hasCause(throwable, NodeStoppingException.class, RejectedExecutionException.class)) {
String errorMessage = String.format(
"Unknown error on new metastorage compaction revision: %s",
compactionRevision
@@ -371,9 +369,7 @@ public class MetaStorageCompactionTrigger implements IgniteComponent {
runAsync(() -> inBusyLockSafe(busyLock, () -> storage.compact(recoveredCompactionRevision)), compactionExecutor)
.whenComplete((unused, throwable) -> {
if (throwable != null) {
- Throwable cause = unwrapCause(throwable);
-
- if (!(cause instanceof NodeStoppingException)) {
+ if (!hasCause(throwable, NodeStoppingException.class, RejectedExecutionException.class)) {
String errorMessage = String.format(
"Unknown error during metastore compaction launched on node recovery: [compactionRevision=%s]",
recoveredCompactionRevision