This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8502da494cd94882915d6666a4bd003833411d7f
Merge: e120088d44 a2fbb17867
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Thu Mar 14 10:25:23 2024 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
.../cassandra/repair/consistent/LocalSessions.java | 36 +++++++++++-----------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --cc CHANGES.txt
index fdb19e0cf0,69f8be60a5..a091edb379
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
-4.0.13
+4.1.5
+Merged from 4.0:
+ * Push LocalSessions info logs to debug (CASSANDRA-18335)
* Filter remote DC replicas out when constructing the initial replica plan
for the local read repair (CASSANDRA-19120)
* Remove redundant code in StorageProxy#sendToHintedReplicas
(CASSANDRA-19412)
* Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416)
diff --cc src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
index ed2bf0bc0b,e61ad47003..5fcfe986c5
--- a/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
+++ b/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
@@@ -322,9 -320,9 +322,9 @@@ public class LocalSession
* hook for operators to cancel sessions, cancelling from a
non-coordinator is an error, unless
* force is set to true. Messages are sent out to other participants, but
we don't wait for a response
*/
- public void cancelSession(UUID sessionID, boolean force)
+ public void cancelSession(TimeUUID sessionID, boolean force)
{
- logger.info("Cancelling local repair session {}", sessionID);
+ logger.debug("Cancelling local repair session {}", sessionID);
LocalSession session = getSession(sessionID);
Preconditions.checkArgument(session != null, "Session {} does not
exist", sessionID);
Preconditions.checkArgument(force ||
session.coordinator.equals(getBroadcastAddressAndPort()),
@@@ -747,9 -745,9 +747,9 @@@
}
}
- public synchronized void deleteSession(UUID sessionID)
+ public synchronized void deleteSession(TimeUUID sessionID)
{
- logger.info("Deleting local repair session {}", sessionID);
+ logger.debug("Deleting local repair session {}", sessionID);
LocalSession session = getSession(sessionID);
Preconditions.checkArgument(session.isCompleted(), "Cannot delete
incomplete sessions");
@@@ -819,9 -817,9 +819,9 @@@
LocalSession session = createSessionUnsafe(sessionID, parentSession,
peers);
putSessionUnsafe(session);
- logger.info("Beginning local incremental repair session {}", session);
+ logger.debug("Beginning local incremental repair session {}",
session);
- ExecutorService executor =
Executors.newFixedThreadPool(parentSession.getColumnFamilyStores().size());
+ ExecutorService executor = executorFactory().pooled("Repair-" +
sessionID, parentSession.getColumnFamilyStores().size());
KeyspaceRepairManager repairManager =
parentSession.getKeyspace().getRepairManager();
RangesAtEndpoint tokenRanges =
filterLocalRanges(parentSession.getKeyspace().getName(),
parentSession.getRanges());
@@@ -834,9 -832,10 +834,9 @@@
{
try
{
- logger.info("Prepare phase for incremental repair session
{} completed", sessionID);
+ logger.debug("Prepare phase for incremental repair
session {} completed", sessionID);
if (!prepareSessionExceptFailed(session))
- logger.info("Session {} failed before anticompaction
completed", sessionID);
+ logger.debug("Session {} failed before anticompaction
completed", sessionID);
-
Message<PrepareConsistentResponse> message =
Message.out(PREPARE_CONSISTENT_RSP,
new PrepareConsistentResponse(sessionID,
getBroadcastAddressAndPort(), session.getState() != FAILED));
@@@ -852,12 -851,7 +852,12 @@@
{
try
{
- logger.error("Prepare phase for incremental repair
session {} failed", sessionID, t);
+ if (Throwables.anyCauseMatches(t, (throwable) ->
throwable instanceof CompactionInterruptedException))
- logger.info("Anticompaction interrupted for session
{}: {}", sessionID, t.getMessage());
++ logger.debug("Anticompaction interrupted for session
{}: {}", sessionID, t.getMessage());
+ else if (Throwables.anyCauseMatches(t, (throwable) ->
throwable instanceof NoSuchRepairSessionException))
+ logger.warn("No such repair session: {}", sessionID);
+ else
+ logger.error("Prepare phase for incremental repair
session {} failed", sessionID, t);
sendMessage(coordinator,
Message.out(PREPARE_CONSISTENT_RSP,
new
PrepareConsistentResponse(sessionID, getBroadcastAddressAndPort(), false)));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
