Repository: cassandra Updated Branches: refs/heads/trunk c4263d26b -> 9abeff38c
Improve logging in MessageInHandler's constructor patch by jasobrown; reviewed by Dinesh Joshi for CASSANDRA-14576 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9abeff38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9abeff38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9abeff38 Branch: refs/heads/trunk Commit: 9abeff38c4bdcd6e640642c38b5f253f0955e6b0 Parents: c4263d2 Author: Jason Brown <jasedbr...@gmail.com> Authored: Fri Jul 20 04:50:43 2018 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Fri Jul 20 16:08:53 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/net/async/MessageInHandler.java | 5 ++--- .../cassandra/net/async/MessageInHandlerPre40.java | 5 ++--- .../cassandra/net/async/MessageInHandlerTest.java | 14 +++++++++++--- 4 files changed, 16 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9abeff38/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4b53c03..faf37ea 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Improve logging in MessageInHandler's constructor (CASSANDRA-14576) * Set broadcast address in internode messaging handshake (CASSANDRA-14579) * Wait for schema agreement prior to building MVs (CASSANDRA-14571) * Make all DDL statements idempotent and not dependent on global state (CASSANDRA-13426) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9abeff38/src/java/org/apache/cassandra/net/async/MessageInHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/async/MessageInHandler.java b/src/java/org/apache/cassandra/net/async/MessageInHandler.java index c85d860..eb22e91 100644 --- a/src/java/org/apache/cassandra/net/async/MessageInHandler.java +++ b/src/java/org/apache/cassandra/net/async/MessageInHandler.java @@ -65,9 +65,8 @@ public class MessageInHandler extends BaseMessageInHandler { super(peer, messagingVersion, messageConsumer); - if (messagingVersion < MessagingService.VERSION_40) - throw new IllegalArgumentException(String.format("wrong messaging version for this handler", messagingVersion)); - + assert messagingVersion >= MessagingService.VERSION_40 : String.format("wrong messaging version for this handler: got %d, but expect %d or higher", + messagingVersion, MessagingService.VERSION_40); state = State.READ_FIRST_CHUNK; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9abeff38/src/java/org/apache/cassandra/net/async/MessageInHandlerPre40.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/async/MessageInHandlerPre40.java b/src/java/org/apache/cassandra/net/async/MessageInHandlerPre40.java index 132ec11..fb19b43 100644 --- a/src/java/org/apache/cassandra/net/async/MessageInHandlerPre40.java +++ b/src/java/org/apache/cassandra/net/async/MessageInHandlerPre40.java @@ -59,9 +59,8 @@ public class MessageInHandlerPre40 extends BaseMessageInHandler { super(peer, messagingVersion, messageConsumer); - if (messagingVersion >= MessagingService.VERSION_40) - throw new IllegalArgumentException(String.format("wrong messaging version for this handler", messagingVersion)); - + assert messagingVersion < MessagingService.VERSION_40 : String.format("wrong messaging version for this handler: got %d, but expect lower than %d", + messagingVersion, MessagingService.VERSION_40); state = State.READ_FIRST_CHUNK; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/9abeff38/test/unit/org/apache/cassandra/net/async/MessageInHandlerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/net/async/MessageInHandlerTest.java b/test/unit/org/apache/cassandra/net/async/MessageInHandlerTest.java index 16f4faf..8deb6dc 100644 --- a/test/unit/org/apache/cassandra/net/async/MessageInHandlerTest.java +++ b/test/unit/org/apache/cassandra/net/async/MessageInHandlerTest.java @@ -92,11 +92,19 @@ public class MessageInHandlerTest private BaseMessageInHandler getHandler(InetAddressAndPort addr, int messagingVersion, BiConsumer<MessageIn, Integer> messageConsumer) { - if (messagingVersion >= MessagingService.VERSION_40) - return new MessageInHandler(addr, messagingVersion, messageConsumer); - return new MessageInHandlerPre40(addr, messagingVersion, messageConsumer); + return messagingVersion >= MessagingService.VERSION_40 ? + new MessageInHandler(addr, messagingVersion, messageConsumer) : + new MessageInHandlerPre40(addr, messagingVersion, messageConsumer); } + @Test(expected = AssertionError.class) + public void testBadVersionForHandler() + { + if (messagingVersion < MessagingService.VERSION_40) + new MessageInHandler(addr, messagingVersion, null); + else + new MessageInHandlerPre40(addr, messagingVersion, null); + } @Test public void decode_BadMagic() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
