Repository: cassandra Updated Branches: refs/heads/trunk 4ef0bf886 -> d4933a019
Fix WriteResponseHandlerTest being sensitive to test execution order. Patch by Ariel Weisberg; Reviewed by Jeff Jirsa for CASSANDRA-13421 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4933a01 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4933a01 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4933a01 Branch: refs/heads/trunk Commit: d4933a019d8a717029444887f5f8a72d61cedd95 Parents: 4ef0bf8 Author: Ariel Weisberg <aweisb...@apple.com> Authored: Thu Apr 6 17:09:37 2017 -0400 Committer: Ariel Weisberg <aweisb...@apple.com> Committed: Tue May 2 17:24:59 2017 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../service/WriteResponseHandlerTest.java | 46 ++++++++++---------- 2 files changed, 24 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4933a01/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 161eba8..79ecb99 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Fix WriteResponseHandlerTest is sensitive to test execution order (CASSANDRA-13421) * Improve incremental repair logging (CASSANDRA-13468) * Start compaction when incremental repair finishes (CASSANDRA-13454) * Add repair streaming preview (CASSANDRA-13257) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4933a01/test/unit/org/apache/cassandra/service/WriteResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/WriteResponseHandlerTest.java b/test/unit/org/apache/cassandra/service/WriteResponseHandlerTest.java index 815dbf6..8172463 100644 --- a/test/unit/org/apache/cassandra/service/WriteResponseHandlerTest.java +++ b/test/unit/org/apache/cassandra/service/WriteResponseHandlerTest.java @@ -109,7 +109,6 @@ public class WriteResponseHandlerTest InetAddress.getByName("127.2.0.255"), InetAddress.getByName("127.2.0.254"), InetAddress.getByName("127.2.0.253")); } - @Before public void resetCounters() { @@ -117,28 +116,6 @@ public class WriteResponseHandlerTest } /** - * Validate that failing to achieve ideal CL increments the failure counter - * @throws Throwable - */ - @Test - public void failedIdealCLIncrementsStat() throws Throwable - { - AbstractWriteResponseHandler awr = createWriteResponseHandler(ConsistencyLevel.LOCAL_QUORUM, ConsistencyLevel.EACH_QUORUM); - - //Succeed in local DC - awr.response(createDummyMessage(0)); - awr.response(createDummyMessage(1)); - awr.response(createDummyMessage(2)); - - //Fail in remote DC - awr.expired(); - awr.expired(); - awr.expired(); - assertEquals(1, ks.metric.writeFailedIdealCL.getCount()); - assertEquals(0, ks.metric.idealCLWriteLatency.totalLatency.getCount()); - } - - /** * Validate that a successful write at ideal CL logs latency information. Also validates * DatacenterSyncWriteResponseHandler * @throws Throwable @@ -212,6 +189,29 @@ public class WriteResponseHandlerTest assertEquals(startingCount + 1, ks.metric.idealCLWriteLatency.latency.getCount()); } + /** + * Validate that failing to achieve ideal CL increments the failure counter + * @throws Throwable + */ + @Test + public void failedIdealCLIncrementsStat() throws Throwable + { + + AbstractWriteResponseHandler awr = createWriteResponseHandler(ConsistencyLevel.LOCAL_QUORUM, ConsistencyLevel.EACH_QUORUM); + + //Succeed in local DC + awr.response(createDummyMessage(0)); + awr.response(createDummyMessage(1)); + awr.response(createDummyMessage(2)); + + //Fail in remote DC + awr.expired(); + awr.expired(); + awr.expired(); + assertEquals(1, ks.metric.writeFailedIdealCL.getCount()); + assertEquals(0, ks.metric.idealCLWriteLatency.totalLatency.getCount()); + } + private static AbstractWriteResponseHandler createWriteResponseHandler(ConsistencyLevel cl, ConsistencyLevel ideal) { return createWriteResponseHandler(cl, ideal, System.nanoTime()); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
