You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2024/09/13 18:52:41 UTC
(cassandra) 03/03: SQUASH – provide nospam log messages that are intuitively samples
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch mck/13704/4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ec2560593ec73bdff06a43da824b285ca314b245
Author: mck <mc...@apache.org>
AuthorDate: Fri Sep 13 20:51:53 2024 +0200
SQUASH – provide nospam log messages that are intuitively samples
---
src/java/org/apache/cassandra/db/AbstractMutationVerbHandler.java | 5 ++---
src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java | 4 ++--
.../org/apache/cassandra/db/streaming/CassandraStreamReader.java | 2 +-
src/java/org/apache/cassandra/hints/HintVerbHandler.java | 6 ++++--
.../apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java | 4 ++--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/java/org/apache/cassandra/db/AbstractMutationVerbHandler.java b/src/java/org/apache/cassandra/db/AbstractMutationVerbHandler.java
index 463686ede2..d959d04fb6 100644
--- a/src/java/org/apache/cassandra/db/AbstractMutationVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/AbstractMutationVerbHandler.java
@@ -36,8 +36,7 @@ import org.apache.cassandra.utils.NoSpamLogger;
public abstract class AbstractMutationVerbHandler<T extends IMutation> implements IVerbHandler<T>
{
private static final Logger logger = LoggerFactory.getLogger(AbstractMutationVerbHandler.class);
- private static final String logMessageTemplate = "Received mutation from {} for token {} outside valid range for keyspace {}";
-
+ private static final String logMessageTemplate = "Receiving mutation(s) not owned or pending, example: from {} for token {} in {}.{}";
public void doVerb(Message<T> message) throws IOException
{
processMessage(message, message.from());
@@ -57,7 +56,7 @@ public abstract class AbstractMutationVerbHandler<T extends IMutation> implement
// Log at most 1 message per second
if (outOfRangeTokenLogging)
- NoSpamLogger.log(logger, NoSpamLogger.Level.WARN, 1, TimeUnit.SECONDS, logMessageTemplate, respondTo, key.getToken(), message.payload.getKeyspaceName());
+ NoSpamLogger.log(logger, NoSpamLogger.Level.WARN, 1, TimeUnit.SECONDS, logMessageTemplate, respondTo, key.getToken(), message.payload.getKeyspaceName(), message.payload.getPartitionUpdates().iterator().next().metadata().name);
if (outOfRangeTokenRejection)
sendFailureResponse(message, respondTo);
diff --git a/src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java b/src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java
index a358ffa288..1ca21526c3 100644
--- a/src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java
@@ -43,7 +43,7 @@ public class ReadCommandVerbHandler implements IVerbHandler<ReadCommand>
public static final ReadCommandVerbHandler instance = new ReadCommandVerbHandler();
private static final Logger logger = LoggerFactory.getLogger(ReadCommandVerbHandler.class);
- private static final String logMessageTemplate = "Received read request from {} for token {} outside valid range for keyspace {}";
+ private static final String logMessageTemplate = "Receiving read(s) not owned or pending, example: from {} for token {} in {}.{}";
private static final String exceptionMessageTemplate = "Exception thrown checking if token {} outside valid range for keyspace {} - permitting";
public void doVerb(Message<ReadCommand> message)
@@ -69,7 +69,7 @@ public class ReadCommandVerbHandler implements IVerbHandler<ReadCommand>
// Log at most 1 message per second
if (outOfRangeTokenLogging)
- NoSpamLogger.log(logger, NoSpamLogger.Level.WARN, 1, TimeUnit.SECONDS, logMessageTemplate, message.from(), key.getToken(), command.metadata().keyspace);
+ NoSpamLogger.log(logger, NoSpamLogger.Level.WARN, 1, TimeUnit.SECONDS, logMessageTemplate, message.from(), key.getToken(), command.metadata().keyspace, command.metadata().name);
if (outOfRangeTokenRejection)
// no need to respond, just drop the request
diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java
index 1a990f56fd..ac030768e8 100644
--- a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java
+++ b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java
@@ -69,7 +69,7 @@ import static org.apache.cassandra.net.MessagingService.current_version;
public class CassandraStreamReader implements IStreamReader
{
private static final Logger logger = LoggerFactory.getLogger(CassandraStreamReader.class);
- private static final String logMessageTemplate = "[Stream #{}] Received streamed SSTable {} from {} containing key outside valid ranges {}";
+ private static final String logMessageTemplate = "[Stream #{}] Received streamed SSTable {} from {} containing key(s) outside valid ranges, example {}";
protected final TableId tableId;
protected final long estimatedKeys;
protected final Collection<SSTableReader.PartitionPositionBounds> sections;
diff --git a/src/java/org/apache/cassandra/hints/HintVerbHandler.java b/src/java/org/apache/cassandra/hints/HintVerbHandler.java
index a9ffa89a6a..2aa7ca7623 100644
--- a/src/java/org/apache/cassandra/hints/HintVerbHandler.java
+++ b/src/java/org/apache/cassandra/hints/HintVerbHandler.java
@@ -101,9 +101,11 @@ public final class HintVerbHandler implements IVerbHandler<HintMessage>
NoSpamLogger.Level.WARN,
1,
TimeUnit.SECONDS,
- "Received hint containing mutation from {} for token {} outside valid range",
+ "Receiving hint(s) not owned or pending, example: from {} for token {} in {}.{}",
message.from(),
- hint.mutation.key().getToken());
+ hint.mutation.key().getToken(),
+ hint.mutation.getKeyspaceName(),
+ hint.mutation.getPartitionUpdates().iterator().next().metadata().name);
}
respond(message);
diff --git a/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java
index fff59e532e..c503ddb280 100644
--- a/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java
+++ b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java
@@ -36,7 +36,7 @@ import org.apache.cassandra.utils.NoSpamLogger;
public abstract class AbstractPaxosVerbHandler implements IVerbHandler<Commit>
{
private static final Logger logger = LoggerFactory.getLogger(AbstractPaxosVerbHandler.class);
- private static final String logMessageTemplate = "Received paxos request from {} for token {} outside valid range for keyspace {}";
+ private static final String logMessageTemplate = "Receiving paxos not owned or pending, example: from {} for token {} in {}.{}";
public void doVerb(Message<Commit> message)
{
@@ -52,7 +52,7 @@ public abstract class AbstractPaxosVerbHandler implements IVerbHandler<Commit>
// Log at most 1 message per second
if (outOfRangeTokenLogging)
- NoSpamLogger.log(logger, NoSpamLogger.Level.WARN, 1, TimeUnit.SECONDS, logMessageTemplate, message.from(), key.getToken(), commit.update.metadata().keyspace);
+ NoSpamLogger.log(logger, NoSpamLogger.Level.WARN, 1, TimeUnit.SECONDS, logMessageTemplate, message.from(), key.getToken(), commit.update.metadata().keyspace, commit.update.metadata().name);
if (outOfRangeTokenRejection)
sendFailureResponse(message);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org