From 7974a7eb139fea3e75d3bd77137b20b87a3786b0 Mon Sep 17 00:00:00 2001 From: Jason Brown Date: Fri, 16 Feb 2018 06:39:05 -0800 Subject: [PATCH] fixed verb name to PING when sending PingMessage (facepalm); fixed logging message when SCCC complete; fixed misspelled word conmpess in OMC --- .../net/StartupClusterConnectivityChecker.java | 18 +++++++++--------- .../net/async/OutboundMessagingConnection.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/java/org/apache/cassandra/net/StartupClusterConnectivityChecker.java b/src/java/org/apache/cassandra/net/StartupClusterConnectivityChecker.java index eab1434318a4..3de294269799 100644 --- a/src/java/org/apache/cassandra/net/StartupClusterConnectivityChecker.java +++ b/src/java/org/apache/cassandra/net/StartupClusterConnectivityChecker.java @@ -32,6 +32,8 @@ import org.apache.cassandra.net.async.OutboundConnectionIdentifier; import org.apache.cassandra.utils.FBUtilities; +import static org.apache.cassandra.net.MessagingService.Verb.PING; + public class StartupClusterConnectivityChecker { private static final Logger logger = LoggerFactory.getLogger(StartupClusterConnectivityChecker.class); @@ -113,7 +115,7 @@ State checkStatus(Set peers, AtomicInteger connectedCount, f "and {}% ({} / {}) of peers as connected, " + "both of which are above the desired threshold of {}%", TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos), - currentAlivePercent, currentAlive, totalConnectionsSize, + currentAlivePercent, currentAlive, peers.size(), currentConnectedPercent, connectionsCount, totalConnectionsSize, targetPercent); return State.FINISH_SUCCESS; @@ -126,7 +128,7 @@ State checkStatus(Set peers, AtomicInteger connectedCount, f "and {}% ({} / {}) of peers as connected, " + "one or both of which is below the desired threshold of {}%", TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos), - currentAlivePercent, currentAlive, totalConnectionsSize, + currentAlivePercent, currentAlive, peers.size(), currentConnectedPercent, connectionsCount, totalConnectionsSize, targetPercent); return State.FINISH_TIMEOUT; @@ -140,7 +142,7 @@ State checkStatus(Set peers, AtomicInteger connectedCount, f */ private AtomicInteger sendPingMessages(Set peers) { - AtomicInteger receivedCount = new AtomicInteger(0); + AtomicInteger connectedCount = new AtomicInteger(0); IAsyncCallback responseHandler = new IAsyncCallback() { @Override @@ -152,20 +154,18 @@ public boolean isLatencyForSnitch() @Override public void response(MessageIn msg) { - receivedCount.incrementAndGet(); + connectedCount.incrementAndGet(); } }; - MessageOut smallChannelMessageOut = new MessageOut<>(MessagingService.Verb.REQUEST_RESPONSE, - PingMessage.smallChannelMessage, PingMessage.serializer); - MessageOut largeChannelMessageOut = new MessageOut<>(MessagingService.Verb.REQUEST_RESPONSE, - PingMessage.largeChannelMessage, PingMessage.serializer); + MessageOut smallChannelMessageOut = new MessageOut<>(PING, PingMessage.smallChannelMessage, PingMessage.serializer); + MessageOut largeChannelMessageOut = new MessageOut<>(PING, PingMessage.largeChannelMessage, PingMessage.serializer); for (InetAddressAndPort peer : peers) { MessagingService.instance().sendRR(smallChannelMessageOut, peer, responseHandler); MessagingService.instance().sendRR(largeChannelMessageOut, peer, responseHandler); } - return receivedCount; + return connectedCount; } } diff --git a/src/java/org/apache/cassandra/net/async/OutboundMessagingConnection.java b/src/java/org/apache/cassandra/net/async/OutboundMessagingConnection.java index 28775ef87cfe..064131be82c0 100644 --- a/src/java/org/apache/cassandra/net/async/OutboundMessagingConnection.java +++ b/src/java/org/apache/cassandra/net/async/OutboundMessagingConnection.java @@ -479,7 +479,7 @@ void finishHandshake(HandshakeResult result) { case SUCCESS: assert result.channelWriter != null; - logger.debug("successfully connected to {}, conmpress = {}, coalescing = {}", connectionId, + logger.debug("successfully connected to {}, compress = {}, coalescing = {}", connectionId, shouldCompressConnection(connectionId.local(), connectionId.remote()), coalescingStrategy.isPresent() ? coalescingStrategy.get() : CoalescingStrategies.Strategy.DISABLED); if (state.get() == State.CLOSED)