You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by rp...@apache.org on 2024/12/20 16:40:50 UTC
(ignite-3) branch main updated: IGNITE-24058 Improve logging of NodeStoppedException (#4942)
This is an automated email from the ASF dual-hosted git repository.
rpuch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 443e5dcb72 IGNITE-24058 Improve logging of NodeStoppedException (#4942)
443e5dcb72 is described below
commit 443e5dcb726bdc06f9bb60245762441cee535132
Author: Roman Puchkovskiy <ro...@gmail.com>
AuthorDate: Fri Dec 20 20:40:45 2024 +0400
IGNITE-24058 Improve logging of NodeStoppedException (#4942)
---
.../org/apache/ignite/internal/placementdriver/LeaseUpdater.java | 6 +++++-
.../java/org/apache/ignite/internal/raft/RaftGroupServiceImpl.java | 4 ++--
.../java/org/apache/ignite/internal/replicator/ReplicaImpl.java | 6 +++++-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/LeaseUpdater.java b/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/LeaseUpdater.java
index 5fe5cc462e..ac2c92e9cb 100644
--- a/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/LeaseUpdater.java
+++ b/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/LeaseUpdater.java
@@ -50,6 +50,7 @@ import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.lang.ByteArray;
import org.apache.ignite.internal.lang.IgniteSystemProperties;
import org.apache.ignite.internal.lang.IgniteTuple3;
+import org.apache.ignite.internal.lang.NodeStoppingException;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
@@ -74,6 +75,7 @@ import org.apache.ignite.internal.replicator.configuration.ReplicationConfigurat
import org.apache.ignite.internal.thread.IgniteThread;
import org.apache.ignite.internal.tostring.IgniteToStringInclude;
import org.apache.ignite.internal.tostring.S;
+import org.apache.ignite.internal.util.ExceptionUtils;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
import org.apache.ignite.internal.util.Pair;
import org.apache.ignite.network.ClusterNode;
@@ -570,7 +572,9 @@ public class LeaseUpdater {
noop()
).whenComplete((success, e) -> {
if (e != null) {
- LOG.error("Lease update invocation failed", e);
+ if (!(ExceptionUtils.unwrapCause(e) instanceof NodeStoppingException)) {
+ LOG.error("Lease update invocation failed", e);
+ }
return;
}
diff --git a/modules/raft/src/main/java/org/apache/ignite/internal/raft/RaftGroupServiceImpl.java b/modules/raft/src/main/java/org/apache/ignite/internal/raft/RaftGroupServiceImpl.java
index 0da79b7aee..901f03baf7 100644
--- a/modules/raft/src/main/java/org/apache/ignite/internal/raft/RaftGroupServiceImpl.java
+++ b/modules/raft/src/main/java/org/apache/ignite/internal/raft/RaftGroupServiceImpl.java
@@ -828,8 +828,8 @@ public class RaftGroupServiceImpl implements RaftGroupService {
if (availablePeers.isEmpty()) {
LOG.warn(
- "All peers are unavailable, going to keep retrying until timeout [peers = {}, trace ID: {}].",
- localPeers, retryContext.errorTraceId()
+ "All peers are unavailable, going to keep retrying until timeout [peers = {}, group = {}, trace ID: {}].",
+ localPeers, groupId, retryContext.errorTraceId()
);
retryContext.resetUnavailablePeers();
diff --git a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/ReplicaImpl.java b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/ReplicaImpl.java
index 6e0c953b2b..132f91f625 100644
--- a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/ReplicaImpl.java
+++ b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/ReplicaImpl.java
@@ -40,6 +40,7 @@ import org.apache.ignite.internal.failure.FailureContext;
import org.apache.ignite.internal.failure.FailureManager;
import org.apache.ignite.internal.hlc.ClockService;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.lang.NodeStoppingException;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.network.NetworkMessage;
@@ -60,6 +61,7 @@ import org.apache.ignite.internal.replicator.message.PrimaryReplicaChangeCommand
import org.apache.ignite.internal.replicator.message.ReplicaMessagesFactory;
import org.apache.ignite.internal.replicator.message.ReplicaRequest;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
+import org.apache.ignite.internal.util.TrackerClosedException;
import org.apache.ignite.network.ClusterNode;
/**
@@ -207,7 +209,9 @@ public class ReplicaImpl implements Replica {
if (e != null) {
Throwable ex = unwrapCause(e);
- LOG.warn("Failed to process the lease granted message [msg={}].", ex, msg);
+ if (!(ex instanceof NodeStoppingException) && !(ex instanceof TrackerClosedException)) {
+ LOG.warn("Failed to process the lease granted message [msg={}].", ex, msg);
+ }
// Just restart the negotiation in case of exception.
return PLACEMENT_DRIVER_MESSAGES_FACTORY.leaseGrantedMessageResponse()