You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/01/06 16:31:23 UTC
[1/6] cassandra git commit: Improve FD logging when the arrival time
is ignored.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 a22308294 -> eb9c5bbcf
refs/heads/cassandra-2.1 e83304ddf -> 136042ec3
refs/heads/trunk 0f024a619 -> ffb7f6491
Improve FD logging when the arrival time is ignored.
Patch by Brandon Williams for CASSANDRA-8245
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb9c5bbc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb9c5bbc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb9c5bbc
Branch: refs/heads/cassandra-2.0
Commit: eb9c5bbcfdaf498967052e02af65fa9f8167887d
Parents: a223082
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 09:30:07 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 09:30:07 2015 -0600
----------------------------------------------------------------------
.../apache/cassandra/gms/FailureDetector.java | 8 +++----
.../apache/cassandra/gms/ArrivalWindowTest.java | 24 +++++++++++++++-----
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb9c5bbc/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index 60729d3..e247e48 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -211,12 +211,12 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
{
// avoid adding an empty ArrivalWindow to the Map
heartbeatWindow = new ArrivalWindow(SAMPLE_SIZE);
- heartbeatWindow.add(now);
+ heartbeatWindow.add(now, ep);
arrivalSamples.put(ep, heartbeatWindow);
}
else
{
- heartbeatWindow.add(now);
+ heartbeatWindow.add(now, ep);
}
}
@@ -326,7 +326,7 @@ class ArrivalWindow
}
}
- synchronized void add(long value)
+ synchronized void add(long value, InetAddress ep)
{
assert tLast >= 0;
if (tLast > 0L)
@@ -335,7 +335,7 @@ class ArrivalWindow
if (interArrivalTime <= MAX_INTERVAL_IN_NANO)
arrivalIntervals.add(interArrivalTime);
else
- logger.debug("Ignoring interval time of {}", interArrivalTime);
+ logger.debug("Ignoring interval time of {} for {}", interArrivalTime, ep);
}
else
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb9c5bbc/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java b/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
index e678d86..511511b 100644
--- a/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
+++ b/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
@@ -25,6 +25,10 @@ import static org.junit.Assert.*;
import org.junit.Test;
+import java.lang.RuntimeException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
public class ArrivalWindowTest
{
@Test
@@ -32,12 +36,20 @@ public class ArrivalWindowTest
{
final ArrivalWindow windowWithNano = new ArrivalWindow(4);
final long toNano = 1000000L;
-
- windowWithNano.add(111 * toNano);
- windowWithNano.add(222 * toNano);
- windowWithNano.add(333 * toNano);
- windowWithNano.add(444 * toNano);
- windowWithNano.add(555 * toNano);
+ InetAddress ep;
+ try
+ {
+ ep = InetAddress.getLocalHost();
+ }
+ catch (UnknownHostException e)
+ {
+ throw new RuntimeException(e);
+ }
+ windowWithNano.add(111 * toNano, ep);
+ windowWithNano.add(222 * toNano, ep);
+ windowWithNano.add(333 * toNano, ep);
+ windowWithNano.add(444 * toNano, ep);
+ windowWithNano.add(555 * toNano, ep);
//all good
assertEquals(1.0, windowWithNano.phi(666 * toNano), 0.01);
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/136042ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/136042ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/136042ec
Branch: refs/heads/cassandra-2.1
Commit: 136042ec3985bbacfcf55333ef5668779d2744fe
Parents: e83304d eb9c5bb
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 09:31:05 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 09:31:05 2015 -0600
----------------------------------------------------------------------
.../apache/cassandra/gms/FailureDetector.java | 8 +++----
.../apache/cassandra/gms/ArrivalWindowTest.java | 24 +++++++++++++++-----
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/136042ec/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffb7f649
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffb7f649
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffb7f649
Branch: refs/heads/trunk
Commit: ffb7f6491d905cd2edaba3a710a1c0bb1f1bf797
Parents: 0f024a6 136042e
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 09:31:16 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 09:31:16 2015 -0600
----------------------------------------------------------------------
.../apache/cassandra/gms/FailureDetector.java | 8 +++----
.../apache/cassandra/gms/ArrivalWindowTest.java | 24 +++++++++++++++-----
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffb7f649/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[3/6] cassandra git commit: Improve FD logging when the arrival time
is ignored.
Posted by br...@apache.org.
Improve FD logging when the arrival time is ignored.
Patch by Brandon Williams for CASSANDRA-8245
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb9c5bbc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb9c5bbc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb9c5bbc
Branch: refs/heads/trunk
Commit: eb9c5bbcfdaf498967052e02af65fa9f8167887d
Parents: a223082
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 09:30:07 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 09:30:07 2015 -0600
----------------------------------------------------------------------
.../apache/cassandra/gms/FailureDetector.java | 8 +++----
.../apache/cassandra/gms/ArrivalWindowTest.java | 24 +++++++++++++++-----
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb9c5bbc/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index 60729d3..e247e48 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -211,12 +211,12 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
{
// avoid adding an empty ArrivalWindow to the Map
heartbeatWindow = new ArrivalWindow(SAMPLE_SIZE);
- heartbeatWindow.add(now);
+ heartbeatWindow.add(now, ep);
arrivalSamples.put(ep, heartbeatWindow);
}
else
{
- heartbeatWindow.add(now);
+ heartbeatWindow.add(now, ep);
}
}
@@ -326,7 +326,7 @@ class ArrivalWindow
}
}
- synchronized void add(long value)
+ synchronized void add(long value, InetAddress ep)
{
assert tLast >= 0;
if (tLast > 0L)
@@ -335,7 +335,7 @@ class ArrivalWindow
if (interArrivalTime <= MAX_INTERVAL_IN_NANO)
arrivalIntervals.add(interArrivalTime);
else
- logger.debug("Ignoring interval time of {}", interArrivalTime);
+ logger.debug("Ignoring interval time of {} for {}", interArrivalTime, ep);
}
else
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb9c5bbc/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java b/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
index e678d86..511511b 100644
--- a/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
+++ b/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
@@ -25,6 +25,10 @@ import static org.junit.Assert.*;
import org.junit.Test;
+import java.lang.RuntimeException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
public class ArrivalWindowTest
{
@Test
@@ -32,12 +36,20 @@ public class ArrivalWindowTest
{
final ArrivalWindow windowWithNano = new ArrivalWindow(4);
final long toNano = 1000000L;
-
- windowWithNano.add(111 * toNano);
- windowWithNano.add(222 * toNano);
- windowWithNano.add(333 * toNano);
- windowWithNano.add(444 * toNano);
- windowWithNano.add(555 * toNano);
+ InetAddress ep;
+ try
+ {
+ ep = InetAddress.getLocalHost();
+ }
+ catch (UnknownHostException e)
+ {
+ throw new RuntimeException(e);
+ }
+ windowWithNano.add(111 * toNano, ep);
+ windowWithNano.add(222 * toNano, ep);
+ windowWithNano.add(333 * toNano, ep);
+ windowWithNano.add(444 * toNano, ep);
+ windowWithNano.add(555 * toNano, ep);
//all good
assertEquals(1.0, windowWithNano.phi(666 * toNano), 0.01);
[2/6] cassandra git commit: Improve FD logging when the arrival time
is ignored.
Posted by br...@apache.org.
Improve FD logging when the arrival time is ignored.
Patch by Brandon Williams for CASSANDRA-8245
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb9c5bbc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb9c5bbc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb9c5bbc
Branch: refs/heads/cassandra-2.1
Commit: eb9c5bbcfdaf498967052e02af65fa9f8167887d
Parents: a223082
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 09:30:07 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 09:30:07 2015 -0600
----------------------------------------------------------------------
.../apache/cassandra/gms/FailureDetector.java | 8 +++----
.../apache/cassandra/gms/ArrivalWindowTest.java | 24 +++++++++++++++-----
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb9c5bbc/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index 60729d3..e247e48 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -211,12 +211,12 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
{
// avoid adding an empty ArrivalWindow to the Map
heartbeatWindow = new ArrivalWindow(SAMPLE_SIZE);
- heartbeatWindow.add(now);
+ heartbeatWindow.add(now, ep);
arrivalSamples.put(ep, heartbeatWindow);
}
else
{
- heartbeatWindow.add(now);
+ heartbeatWindow.add(now, ep);
}
}
@@ -326,7 +326,7 @@ class ArrivalWindow
}
}
- synchronized void add(long value)
+ synchronized void add(long value, InetAddress ep)
{
assert tLast >= 0;
if (tLast > 0L)
@@ -335,7 +335,7 @@ class ArrivalWindow
if (interArrivalTime <= MAX_INTERVAL_IN_NANO)
arrivalIntervals.add(interArrivalTime);
else
- logger.debug("Ignoring interval time of {}", interArrivalTime);
+ logger.debug("Ignoring interval time of {} for {}", interArrivalTime, ep);
}
else
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb9c5bbc/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java b/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
index e678d86..511511b 100644
--- a/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
+++ b/test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java
@@ -25,6 +25,10 @@ import static org.junit.Assert.*;
import org.junit.Test;
+import java.lang.RuntimeException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
public class ArrivalWindowTest
{
@Test
@@ -32,12 +36,20 @@ public class ArrivalWindowTest
{
final ArrivalWindow windowWithNano = new ArrivalWindow(4);
final long toNano = 1000000L;
-
- windowWithNano.add(111 * toNano);
- windowWithNano.add(222 * toNano);
- windowWithNano.add(333 * toNano);
- windowWithNano.add(444 * toNano);
- windowWithNano.add(555 * toNano);
+ InetAddress ep;
+ try
+ {
+ ep = InetAddress.getLocalHost();
+ }
+ catch (UnknownHostException e)
+ {
+ throw new RuntimeException(e);
+ }
+ windowWithNano.add(111 * toNano, ep);
+ windowWithNano.add(222 * toNano, ep);
+ windowWithNano.add(333 * toNano, ep);
+ windowWithNano.add(444 * toNano, ep);
+ windowWithNano.add(555 * toNano, ep);
//all good
assertEquals(1.0, windowWithNano.phi(666 * toNano), 0.01);
[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/136042ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/136042ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/136042ec
Branch: refs/heads/trunk
Commit: 136042ec3985bbacfcf55333ef5668779d2744fe
Parents: e83304d eb9c5bb
Author: Brandon Williams <br...@apache.org>
Authored: Tue Jan 6 09:31:05 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Jan 6 09:31:05 2015 -0600
----------------------------------------------------------------------
.../apache/cassandra/gms/FailureDetector.java | 8 +++----
.../apache/cassandra/gms/ArrivalWindowTest.java | 24 +++++++++++++++-----
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/136042ec/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------