You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2017/08/31 13:50:10 UTC
[01/15] cassandra git commit: Fix hanging HintedHandOffTest on MacOS
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 0ffce2e93 -> 5469f2120
refs/heads/cassandra-2.2 f210b1776 -> 4d90573c5
refs/heads/cassandra-3.0 5e7f60f6b -> f791c2690
refs/heads/cassandra-3.11 425880ffb -> cd3aca036
refs/heads/trunk 335d8371a -> 8ed41fbc5
Fix hanging HintedHandOffTest on MacOS
InetAddress.getLocalHost() hangs the test on MacOS; replaced it with
InetAddress.getByName() - the test passes now, which saves us about 4
minutes of runtime on MacOS.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5469f212
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5469f212
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5469f212
Branch: refs/heads/cassandra-2.1
Commit: 5469f2120423504374900eada2f7b0bcae603c47
Parents: 0ffce2e
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:41:03 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:41:03 2017 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5469f212/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index ad1e6cf..a2b0ae1 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -85,7 +85,7 @@ public class HintedHandOffTest extends SchemaLoader
public void testHintsMetrics() throws Exception
{
for (int i = 0; i < 99; i++)
- HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+ HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
HintedHandOffManager.instance.metrics.log();
UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[05/15] cassandra git commit: Fix hanging HintedHandOffTest on MacOS
Posted by al...@apache.org.
Fix hanging HintedHandOffTest on MacOS
InetAddress.getLocalHost() hangs the test on MacOS; replaced it with
InetAddress.getByName() - the test passes now, which saves us about 4
minutes of runtime on MacOS.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5469f212
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5469f212
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5469f212
Branch: refs/heads/cassandra-3.11
Commit: 5469f2120423504374900eada2f7b0bcae603c47
Parents: 0ffce2e
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:41:03 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:41:03 2017 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5469f212/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index ad1e6cf..a2b0ae1 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -85,7 +85,7 @@ public class HintedHandOffTest extends SchemaLoader
public void testHintsMetrics() throws Exception
{
for (int i = 0; i < 99; i++)
- HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+ HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
HintedHandOffManager.instance.metrics.log();
UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d90573c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d90573c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d90573c
Branch: refs/heads/cassandra-3.11
Commit: 4d90573c55f08f2a8d72c9ae358618258c4e8b31
Parents: f210b17 5469f21
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:45:49 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:45:49 2017 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d90573c/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index 6bb6be2,a2b0ae1..3d6e5cf
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -99,10 -85,10 +99,10 @@@ public class HintedHandOffTes
public void testHintsMetrics() throws Exception
{
for (int i = 0; i < 99; i++)
- HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+ HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
HintedHandOffManager.instance.metrics.log();
- UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
+ UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS);
Map<UUID, Integer> returned = rows.one().getMap("hints_dropped", UUIDType.instance, Int32Type.instance);
assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[03/15] cassandra git commit: Fix hanging HintedHandOffTest on MacOS
Posted by al...@apache.org.
Fix hanging HintedHandOffTest on MacOS
InetAddress.getLocalHost() hangs the test on MacOS; replaced it with
InetAddress.getByName() - the test passes now, which saves us about 4
minutes of runtime on MacOS.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5469f212
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5469f212
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5469f212
Branch: refs/heads/trunk
Commit: 5469f2120423504374900eada2f7b0bcae603c47
Parents: 0ffce2e
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:41:03 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:41:03 2017 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5469f212/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index ad1e6cf..a2b0ae1 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -85,7 +85,7 @@ public class HintedHandOffTest extends SchemaLoader
public void testHintsMetrics() throws Exception
{
for (int i = 0; i < 99; i++)
- HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+ HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
HintedHandOffManager.instance.metrics.log();
UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd3aca03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd3aca03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd3aca03
Branch: refs/heads/trunk
Commit: cd3aca03686ee73ff683e9b42fd34c672232b5ee
Parents: 425880f f791c26
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:49:00 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:49:00 2017 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/metrics/HintedHandOffMetricsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd3aca03/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d90573c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d90573c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d90573c
Branch: refs/heads/cassandra-2.2
Commit: 4d90573c55f08f2a8d72c9ae358618258c4e8b31
Parents: f210b17 5469f21
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:45:49 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:45:49 2017 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d90573c/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index 6bb6be2,a2b0ae1..3d6e5cf
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -99,10 -85,10 +99,10 @@@ public class HintedHandOffTes
public void testHintsMetrics() throws Exception
{
for (int i = 0; i < 99; i++)
- HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+ HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
HintedHandOffManager.instance.metrics.log();
- UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
+ UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS);
Map<UUID, Integer> returned = rows.one().getMap("hints_dropped", UUIDType.instance, Int32Type.instance);
assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd3aca03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd3aca03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd3aca03
Branch: refs/heads/cassandra-3.11
Commit: cd3aca03686ee73ff683e9b42fd34c672232b5ee
Parents: 425880f f791c26
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:49:00 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:49:00 2017 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/metrics/HintedHandOffMetricsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd3aca03/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d90573c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d90573c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d90573c
Branch: refs/heads/cassandra-3.0
Commit: 4d90573c55f08f2a8d72c9ae358618258c4e8b31
Parents: f210b17 5469f21
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:45:49 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:45:49 2017 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d90573c/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index 6bb6be2,a2b0ae1..3d6e5cf
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -99,10 -85,10 +99,10 @@@ public class HintedHandOffTes
public void testHintsMetrics() throws Exception
{
for (int i = 0; i < 99; i++)
- HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+ HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
HintedHandOffManager.instance.metrics.log();
- UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
+ UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS);
Map<UUID, Integer> returned = rows.one().getMap("hints_dropped", UUIDType.instance, Int32Type.instance);
assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d90573c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d90573c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d90573c
Branch: refs/heads/trunk
Commit: 4d90573c55f08f2a8d72c9ae358618258c4e8b31
Parents: f210b17 5469f21
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:45:49 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:45:49 2017 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d90573c/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index 6bb6be2,a2b0ae1..3d6e5cf
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -99,10 -85,10 +99,10 @@@ public class HintedHandOffTes
public void testHintsMetrics() throws Exception
{
for (int i = 0; i < 99; i++)
- HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+ HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
HintedHandOffManager.instance.metrics.log();
- UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
+ UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS);
Map<UUID, Integer> returned = rows.one().getMap("hints_dropped", UUIDType.instance, Int32Type.instance);
assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[04/15] cassandra git commit: Fix hanging HintedHandOffTest on MacOS
Posted by al...@apache.org.
Fix hanging HintedHandOffTest on MacOS
InetAddress.getLocalHost() hangs the test on MacOS; replaced it with
InetAddress.getByName() - the test passes now, which saves us about 4
minutes of runtime on MacOS.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5469f212
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5469f212
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5469f212
Branch: refs/heads/cassandra-3.0
Commit: 5469f2120423504374900eada2f7b0bcae603c47
Parents: 0ffce2e
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:41:03 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:41:03 2017 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5469f212/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index ad1e6cf..a2b0ae1 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -85,7 +85,7 @@ public class HintedHandOffTest extends SchemaLoader
public void testHintsMetrics() throws Exception
{
for (int i = 0; i < 99; i++)
- HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+ HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
HintedHandOffManager.instance.metrics.log();
UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[10/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f791c269
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f791c269
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f791c269
Branch: refs/heads/trunk
Commit: f791c2690df0cee4f6308872917f6f5f572a3b1e
Parents: 5e7f60f 4d90573
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:46:30 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:46:30 2017 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/metrics/HintedHandOffMetricsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f791c269/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
index a2c9cf9,0000000..1d3863a
mode 100644,000000..100644
--- a/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
+++ b/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
@@@ -1,63 -1,0 +1,63 @@@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.cassandra.metrics;
+
+import java.net.InetAddress;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.google.common.collect.Iterators;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.cql3.UntypedResultSet;
+import org.apache.cassandra.db.SystemKeyspace;
+import org.apache.cassandra.db.marshal.Int32Type;
+import org.apache.cassandra.db.marshal.UUIDType;
+import org.apache.cassandra.hints.HintsService;
+
+import static org.junit.Assert.assertEquals;
+import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
+
+public class HintedHandOffMetricsTest
+{
+ @BeforeClass
+ public static void initDD()
+ {
+ DatabaseDescriptor.setDaemonInitialized();
+ }
+
+ @Test
+ public void testHintsMetrics() throws Exception
+ {
+ DatabaseDescriptor.getHintsDirectory().mkdirs();
+
+ for (int i = 0; i < 99; i++)
- HintsService.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
++ HintsService.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
+ HintsService.instance.metrics.log();
+
+ UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS);
+ Map<UUID, Integer> returned = rows.one().getMap("hints_dropped", UUIDType.instance, Int32Type.instance);
+ assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[02/15] cassandra git commit: Fix hanging HintedHandOffTest on MacOS
Posted by al...@apache.org.
Fix hanging HintedHandOffTest on MacOS
InetAddress.getLocalHost() hangs the test on MacOS; replaced it with
InetAddress.getByName() - the test passes now, which saves us about 4
minutes of runtime on MacOS.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5469f212
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5469f212
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5469f212
Branch: refs/heads/cassandra-2.2
Commit: 5469f2120423504374900eada2f7b0bcae603c47
Parents: 0ffce2e
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:41:03 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:41:03 2017 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/HintedHandOffTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5469f212/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index ad1e6cf..a2b0ae1 100644
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@ -85,7 +85,7 @@ public class HintedHandOffTest extends SchemaLoader
public void testHintsMetrics() throws Exception
{
for (int i = 0; i < 99; i++)
- HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
+ HintedHandOffManager.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
HintedHandOffManager.instance.metrics.log();
UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS_CF);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[15/15] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ed41fbc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ed41fbc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ed41fbc
Branch: refs/heads/trunk
Commit: 8ed41fbc5081f949e17b4ae98bf1f5d4676f043b
Parents: 335d837 cd3aca0
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:49:09 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:49:09 2017 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/metrics/HintedHandOffMetricsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f791c269
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f791c269
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f791c269
Branch: refs/heads/cassandra-3.0
Commit: f791c2690df0cee4f6308872917f6f5f572a3b1e
Parents: 5e7f60f 4d90573
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:46:30 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:46:30 2017 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/metrics/HintedHandOffMetricsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f791c269/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
index a2c9cf9,0000000..1d3863a
mode 100644,000000..100644
--- a/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
+++ b/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
@@@ -1,63 -1,0 +1,63 @@@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.cassandra.metrics;
+
+import java.net.InetAddress;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.google.common.collect.Iterators;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.cql3.UntypedResultSet;
+import org.apache.cassandra.db.SystemKeyspace;
+import org.apache.cassandra.db.marshal.Int32Type;
+import org.apache.cassandra.db.marshal.UUIDType;
+import org.apache.cassandra.hints.HintsService;
+
+import static org.junit.Assert.assertEquals;
+import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
+
+public class HintedHandOffMetricsTest
+{
+ @BeforeClass
+ public static void initDD()
+ {
+ DatabaseDescriptor.setDaemonInitialized();
+ }
+
+ @Test
+ public void testHintsMetrics() throws Exception
+ {
+ DatabaseDescriptor.getHintsDirectory().mkdirs();
+
+ for (int i = 0; i < 99; i++)
- HintsService.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
++ HintsService.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
+ HintsService.instance.metrics.log();
+
+ UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS);
+ Map<UUID, Integer> returned = rows.one().getMap("hints_dropped", UUIDType.instance, Int32Type.instance);
+ assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f791c269
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f791c269
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f791c269
Branch: refs/heads/cassandra-3.11
Commit: f791c2690df0cee4f6308872917f6f5f572a3b1e
Parents: 5e7f60f 4d90573
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Thu Aug 31 14:46:30 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Thu Aug 31 14:46:30 2017 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/metrics/HintedHandOffMetricsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f791c269/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
index a2c9cf9,0000000..1d3863a
mode 100644,000000..100644
--- a/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
+++ b/test/unit/org/apache/cassandra/metrics/HintedHandOffMetricsTest.java
@@@ -1,63 -1,0 +1,63 @@@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.cassandra.metrics;
+
+import java.net.InetAddress;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.google.common.collect.Iterators;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.cql3.UntypedResultSet;
+import org.apache.cassandra.db.SystemKeyspace;
+import org.apache.cassandra.db.marshal.Int32Type;
+import org.apache.cassandra.db.marshal.UUIDType;
+import org.apache.cassandra.hints.HintsService;
+
+import static org.junit.Assert.assertEquals;
+import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
+
+public class HintedHandOffMetricsTest
+{
+ @BeforeClass
+ public static void initDD()
+ {
+ DatabaseDescriptor.setDaemonInitialized();
+ }
+
+ @Test
+ public void testHintsMetrics() throws Exception
+ {
+ DatabaseDescriptor.getHintsDirectory().mkdirs();
+
+ for (int i = 0; i < 99; i++)
- HintsService.instance.metrics.incrPastWindow(InetAddress.getLocalHost());
++ HintsService.instance.metrics.incrPastWindow(InetAddress.getByName("127.0.0.1"));
+ HintsService.instance.metrics.log();
+
+ UntypedResultSet rows = executeInternal("SELECT hints_dropped FROM system." + SystemKeyspace.PEER_EVENTS);
+ Map<UUID, Integer> returned = rows.one().getMap("hints_dropped", UUIDType.instance, Int32Type.instance);
+ assertEquals(Iterators.getLast(returned.values().iterator()).intValue(), 99);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org