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 fd6bd423ded4c7c5cde99f77b82bfbdcdc2983d0 Author: mck <[email protected]> AuthorDate: Fri Sep 13 17:57:06 2024 +0200 SQUASH – use DatabaseDescriptor directly where possible --- .../org/apache/cassandra/db/AbstractMutationVerbHandler.java | 5 +++-- src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java | 4 ++-- .../org/apache/cassandra/db/streaming/CassandraStreamReader.java | 5 +++-- src/java/org/apache/cassandra/dht/OwnedRanges.java | 7 +++---- .../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 9 +++------ .../apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java | 5 +++-- src/java/org/apache/cassandra/streaming/StreamSession.java | 4 ++-- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/java/org/apache/cassandra/db/AbstractMutationVerbHandler.java b/src/java/org/apache/cassandra/db/AbstractMutationVerbHandler.java index 504e768d39..463686ede2 100644 --- a/src/java/org/apache/cassandra/db/AbstractMutationVerbHandler.java +++ b/src/java/org/apache/cassandra/db/AbstractMutationVerbHandler.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.IVerbHandler; @@ -44,8 +45,8 @@ public abstract class AbstractMutationVerbHandler<T extends IMutation> implement public void processMessage(Message<T> message, InetAddressAndPort respondTo) { - boolean outOfRangeTokenLogging = StorageService.instance.isOutOfTokenRangeRequestLoggingEnabled(); - boolean outOfRangeTokenRejection = StorageService.instance.isOutOfTokenRangeRequestRejectionEnabled(); + boolean outOfRangeTokenLogging = DatabaseDescriptor.getLogOutOfTokenRangeRequests(); + boolean outOfRangeTokenRejection = DatabaseDescriptor.getRejectOutOfTokenRangeRequests(); DecoratedKey key = message.payload.key(); if ((outOfRangeTokenLogging || outOfRangeTokenRejection) diff --git a/src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java b/src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java index 430f34c85a..a358ffa288 100644 --- a/src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java +++ b/src/java/org/apache/cassandra/db/ReadCommandVerbHandler.java @@ -58,8 +58,8 @@ public class ReadCommandVerbHandler implements IVerbHandler<ReadCommand> // no out of token range checking for partition range reads yet if (command.isSinglePartitionRead()) { - boolean outOfRangeTokenLogging = StorageService.instance.isOutOfTokenRangeRequestLoggingEnabled(); - boolean outOfRangeTokenRejection = StorageService.instance.isOutOfTokenRangeRequestRejectionEnabled(); + boolean outOfRangeTokenLogging = DatabaseDescriptor.getLogOutOfTokenRangeRequests(); + boolean outOfRangeTokenRejection = DatabaseDescriptor.getRejectOutOfTokenRangeRequests(); DecoratedKey key = ((SinglePartitionReadCommand)command).partitionKey(); if ((outOfRangeTokenLogging || outOfRangeTokenRejection) && !command.metadata().isVirtual() && isOutOfRangeRead(command.metadata().keyspace, key)) diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java index 0b411f5e47..1a990f56fd 100644 --- a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java +++ b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java @@ -31,6 +31,7 @@ import com.google.common.collect.UnmodifiableIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Range; import org.apache.cassandra.exceptions.UnknownColumnException; import org.apache.cassandra.io.sstable.format.SSTableReader; @@ -227,8 +228,8 @@ public class CassandraStreamReader implements IStreamReader ownedRanges = Range.normalize(StorageService.instance.getLocalAndPendingRanges(metadata.keyspace)); lastCheckedRangeIndex = 0; - outOfRangeTokenLogging = StorageService.instance.isOutOfTokenRangeRequestLoggingEnabled(); - outOfRangeTokenRejection = StorageService.instance.isOutOfTokenRangeRequestRejectionEnabled(); + outOfRangeTokenLogging = DatabaseDescriptor.getLogOutOfTokenRangeRequests(); + outOfRangeTokenRejection = DatabaseDescriptor.getRejectOutOfTokenRangeRequests(); } public UnfilteredRowIterator newPartition() throws IOException diff --git a/src/java/org/apache/cassandra/dht/OwnedRanges.java b/src/java/org/apache/cassandra/dht/OwnedRanges.java index 4bd9fed223..f666bf0b11 100644 --- a/src/java/org/apache/cassandra/dht/OwnedRanges.java +++ b/src/java/org/apache/cassandra/dht/OwnedRanges.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.dht; -import java.net.InetAddress; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -28,9 +27,9 @@ import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.metrics.StorageMetrics; -import org.apache.cassandra.service.StorageService; public final class OwnedRanges { @@ -71,8 +70,8 @@ public final class OwnedRanges */ public boolean validateRangeRequest(Collection<Range<Token>> requestedRanges, String requestId, String requestType, InetAddressAndPort from) { - boolean outOfRangeTokenLogging = StorageService.instance.isOutOfTokenRangeRequestLoggingEnabled(); - boolean outOfRangeTokenRejection = StorageService.instance.isOutOfTokenRangeRequestRejectionEnabled(); + boolean outOfRangeTokenLogging = DatabaseDescriptor.getLogOutOfTokenRangeRequests(); + boolean outOfRangeTokenRejection = DatabaseDescriptor.getRejectOutOfTokenRangeRequests(); Collection<Range<Token>> unownedRanges = testRanges(requestedRanges); diff --git a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java index 1d5f1a4d9d..46377b0111 100644 --- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java +++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java @@ -18,21 +18,18 @@ package org.apache.cassandra.repair; import java.util.*; -import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.repair.messages.*; -import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.streaming.PreviewKind; @@ -244,8 +241,8 @@ public class RepairMessageVerbHandler implements IVerbHandler<RepairMessage> private static boolean acceptMessage(final ValidationRequest validationRequest, final InetAddressAndPort from) { - boolean outOfRangeTokenLogging = StorageService.instance.isOutOfTokenRangeRequestLoggingEnabled(); - boolean outOfRangeTokenRejection = StorageService.instance.isOutOfTokenRangeRequestRejectionEnabled(); + boolean outOfRangeTokenLogging = DatabaseDescriptor.getLogOutOfTokenRangeRequests(); + boolean outOfRangeTokenRejection = DatabaseDescriptor.getRejectOutOfTokenRangeRequests(); if (!outOfRangeTokenLogging && !outOfRangeTokenRejection) return true; diff --git a/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java index 7f668f6459..fff59e532e 100644 --- a/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java +++ b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosVerbHandler.java @@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.db.Keyspace; @@ -39,8 +40,8 @@ public abstract class AbstractPaxosVerbHandler implements IVerbHandler<Commit> public void doVerb(Message<Commit> message) { - boolean outOfRangeTokenLogging = StorageService.instance.isOutOfTokenRangeRequestLoggingEnabled(); - boolean outOfRangeTokenRejection = StorageService.instance.isOutOfTokenRangeRequestRejectionEnabled(); + boolean outOfRangeTokenLogging = DatabaseDescriptor.getLogOutOfTokenRangeRequests(); + boolean outOfRangeTokenRejection = DatabaseDescriptor.getRejectOutOfTokenRangeRequests(); Commit commit = message.payload; DecoratedKey key = commit.update.partitionKey(); diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java index 32c1fb1492..a5b1adc382 100644 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@ -806,8 +806,8 @@ public class StreamSession implements IEndpointStateChangeSubscriber private void processStreamRequests(Collection<StreamRequest> requests) { - boolean outOfRangeTokenLogging = StorageService.instance.isOutOfTokenRangeRequestLoggingEnabled(); - boolean outOfRangeTokenRejection = StorageService.instance.isOutOfTokenRangeRequestRejectionEnabled(); + boolean outOfRangeTokenLogging = DatabaseDescriptor.getLogOutOfTokenRangeRequests(); + boolean outOfRangeTokenRejection = DatabaseDescriptor.getRejectOutOfTokenRangeRequests(); if (!outOfRangeTokenLogging && !outOfRangeTokenRejection) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
