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 2014/12/01 17:37:13 UTC
[1/6] cassandra git commit: Increase quarantine on replacement
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 7a14a77f2 -> d8642ae39
refs/heads/cassandra-2.1 6853d5c9d -> 9a4712e4d
refs/heads/trunk 6348957d1 -> 94ba744b3
Increase quarantine on replacement
Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-8260
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8642ae3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8642ae3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8642ae3
Branch: refs/heads/cassandra-2.0
Commit: d8642ae396033c059cb75b3c35a2ece067c17035
Parents: 7a14a77
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 10:34:26 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 10:34:26 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 25 +++++++++++++++++++-
.../cassandra/service/StorageService.java | 4 ++++
3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8642ae3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8f4add9..57c0a26 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Increase quarantine delay on replacement (CASSANDRA-8260)
* Expose off-heap memory usage stats (CASSANDRA-7897)
* Ignore Paxos commits for truncated tables (CASSANDRA-7538)
* Validate size of indexed column values (CASSANDRA-8280)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8642ae3/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index eb0cf39..a478405 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -380,7 +380,29 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
*/
private void quarantineEndpoint(InetAddress endpoint)
{
- justRemovedEndpoints.put(endpoint, System.currentTimeMillis());
+ quarantineEndpoint(endpoint, System.currentTimeMillis());
+ }
+
+ /**
+ * Quarantines the endpoint until quarantineExpiration + QUARANTINE_DELAY
+ *
+ * @param endpoint
+ * @param quarantineExpiration
+ */
+ private void quarantineEndpoint(InetAddress endpoint, long quarantineExpiration)
+ {
+ justRemovedEndpoints.put(endpoint, quarantineExpiration);
+ }
+
+ /**
+ * Quarantine endpoint specifically for replacement purposes.
+ * @param endpoint
+ */
+ public void replacementQuarantine(InetAddress endpoint)
+ {
+ // remember, quarantineEndpoint will effectively already add QUARANTINE_DELAY, so this is 2x
+ logger.debug("");
+ quarantineEndpoint(endpoint, System.currentTimeMillis() + QUARANTINE_DELAY);
}
/**
@@ -393,6 +415,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
removeEndpoint(endpoint);
evictFromMembership(endpoint);
+ replacementQuarantine(endpoint);
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8642ae3/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 14b397a..601e036 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1607,7 +1607,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
tokenMetadata.updateNormalTokens(tokensToUpdateInMetadata, endpoint);
for (InetAddress ep : endpointsToRemove)
+ {
removeEndpoint(ep);
+ if (DatabaseDescriptor.isReplacing() && DatabaseDescriptor.getReplaceAddress().equals(ep))
+ Gossiper.instance.replacementQuarantine(ep); // quarantine locally longer than normally; see CASSANDRA-8260
+ }
if (!tokensToUpdateInSystemKeyspace.isEmpty())
SystemKeyspace.updateTokens(endpoint, tokensToUpdateInSystemKeyspace);
if (!localTokensToRemove.isEmpty())
[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
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a4712e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a4712e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a4712e4
Branch: refs/heads/trunk
Commit: 9a4712e4dc191d8182389fd4da0f18d46c91fdc7
Parents: 6853d5c d8642ae
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 10:36:33 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 10:36:33 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 25 +++++++++++++++++++-
.../cassandra/service/StorageService.java | 4 ++++
3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4712e4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2f11996,57c0a26..d454ba2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
-2.0.12:
+2.1.3
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * Increase quarantine delay on replacement (CASSANDRA-8260)
* Expose off-heap memory usage stats (CASSANDRA-7897)
* Ignore Paxos commits for truncated tables (CASSANDRA-7538)
* Validate size of indexed column values (CASSANDRA-8280)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4712e4/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4712e4/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[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
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a4712e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a4712e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a4712e4
Branch: refs/heads/cassandra-2.1
Commit: 9a4712e4dc191d8182389fd4da0f18d46c91fdc7
Parents: 6853d5c d8642ae
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 10:36:33 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 10:36:33 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 25 +++++++++++++++++++-
.../cassandra/service/StorageService.java | 4 ++++
3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4712e4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2f11996,57c0a26..d454ba2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
-2.0.12:
+2.1.3
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * Increase quarantine delay on replacement (CASSANDRA-8260)
* Expose off-heap memory usage stats (CASSANDRA-7897)
* Ignore Paxos commits for truncated tables (CASSANDRA-7538)
* Validate size of indexed column values (CASSANDRA-8280)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4712e4/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4712e4/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Increase quarantine on replacement
Posted by br...@apache.org.
Increase quarantine on replacement
Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-8260
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8642ae3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8642ae3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8642ae3
Branch: refs/heads/cassandra-2.1
Commit: d8642ae396033c059cb75b3c35a2ece067c17035
Parents: 7a14a77
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 10:34:26 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 10:34:26 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 25 +++++++++++++++++++-
.../cassandra/service/StorageService.java | 4 ++++
3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8642ae3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8f4add9..57c0a26 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Increase quarantine delay on replacement (CASSANDRA-8260)
* Expose off-heap memory usage stats (CASSANDRA-7897)
* Ignore Paxos commits for truncated tables (CASSANDRA-7538)
* Validate size of indexed column values (CASSANDRA-8280)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8642ae3/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index eb0cf39..a478405 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -380,7 +380,29 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
*/
private void quarantineEndpoint(InetAddress endpoint)
{
- justRemovedEndpoints.put(endpoint, System.currentTimeMillis());
+ quarantineEndpoint(endpoint, System.currentTimeMillis());
+ }
+
+ /**
+ * Quarantines the endpoint until quarantineExpiration + QUARANTINE_DELAY
+ *
+ * @param endpoint
+ * @param quarantineExpiration
+ */
+ private void quarantineEndpoint(InetAddress endpoint, long quarantineExpiration)
+ {
+ justRemovedEndpoints.put(endpoint, quarantineExpiration);
+ }
+
+ /**
+ * Quarantine endpoint specifically for replacement purposes.
+ * @param endpoint
+ */
+ public void replacementQuarantine(InetAddress endpoint)
+ {
+ // remember, quarantineEndpoint will effectively already add QUARANTINE_DELAY, so this is 2x
+ logger.debug("");
+ quarantineEndpoint(endpoint, System.currentTimeMillis() + QUARANTINE_DELAY);
}
/**
@@ -393,6 +415,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
removeEndpoint(endpoint);
evictFromMembership(endpoint);
+ replacementQuarantine(endpoint);
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8642ae3/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 14b397a..601e036 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1607,7 +1607,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
tokenMetadata.updateNormalTokens(tokensToUpdateInMetadata, endpoint);
for (InetAddress ep : endpointsToRemove)
+ {
removeEndpoint(ep);
+ if (DatabaseDescriptor.isReplacing() && DatabaseDescriptor.getReplaceAddress().equals(ep))
+ Gossiper.instance.replacementQuarantine(ep); // quarantine locally longer than normally; see CASSANDRA-8260
+ }
if (!tokensToUpdateInSystemKeyspace.isEmpty())
SystemKeyspace.updateTokens(endpoint, tokensToUpdateInSystemKeyspace);
if (!localTokensToRemove.isEmpty())
[3/6] cassandra git commit: Increase quarantine on replacement
Posted by br...@apache.org.
Increase quarantine on replacement
Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-8260
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8642ae3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8642ae3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8642ae3
Branch: refs/heads/trunk
Commit: d8642ae396033c059cb75b3c35a2ece067c17035
Parents: 7a14a77
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 10:34:26 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 10:34:26 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 25 +++++++++++++++++++-
.../cassandra/service/StorageService.java | 4 ++++
3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8642ae3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8f4add9..57c0a26 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Increase quarantine delay on replacement (CASSANDRA-8260)
* Expose off-heap memory usage stats (CASSANDRA-7897)
* Ignore Paxos commits for truncated tables (CASSANDRA-7538)
* Validate size of indexed column values (CASSANDRA-8280)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8642ae3/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index eb0cf39..a478405 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -380,7 +380,29 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
*/
private void quarantineEndpoint(InetAddress endpoint)
{
- justRemovedEndpoints.put(endpoint, System.currentTimeMillis());
+ quarantineEndpoint(endpoint, System.currentTimeMillis());
+ }
+
+ /**
+ * Quarantines the endpoint until quarantineExpiration + QUARANTINE_DELAY
+ *
+ * @param endpoint
+ * @param quarantineExpiration
+ */
+ private void quarantineEndpoint(InetAddress endpoint, long quarantineExpiration)
+ {
+ justRemovedEndpoints.put(endpoint, quarantineExpiration);
+ }
+
+ /**
+ * Quarantine endpoint specifically for replacement purposes.
+ * @param endpoint
+ */
+ public void replacementQuarantine(InetAddress endpoint)
+ {
+ // remember, quarantineEndpoint will effectively already add QUARANTINE_DELAY, so this is 2x
+ logger.debug("");
+ quarantineEndpoint(endpoint, System.currentTimeMillis() + QUARANTINE_DELAY);
}
/**
@@ -393,6 +415,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
removeEndpoint(endpoint);
evictFromMembership(endpoint);
+ replacementQuarantine(endpoint);
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8642ae3/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 14b397a..601e036 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1607,7 +1607,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
tokenMetadata.updateNormalTokens(tokensToUpdateInMetadata, endpoint);
for (InetAddress ep : endpointsToRemove)
+ {
removeEndpoint(ep);
+ if (DatabaseDescriptor.isReplacing() && DatabaseDescriptor.getReplaceAddress().equals(ep))
+ Gossiper.instance.replacementQuarantine(ep); // quarantine locally longer than normally; see CASSANDRA-8260
+ }
if (!tokensToUpdateInSystemKeyspace.isEmpty())
SystemKeyspace.updateTokens(endpoint, tokensToUpdateInSystemKeyspace);
if (!localTokensToRemove.isEmpty())
[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/94ba744b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94ba744b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94ba744b
Branch: refs/heads/trunk
Commit: 94ba744b373a741c2a42786249f54b73bda02e11
Parents: 6348957 9a4712e
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 1 10:37:04 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 1 10:37:04 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 25 +++++++++++++++++++-
.../cassandra/service/StorageService.java | 4 ++++
3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94ba744b/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94ba744b/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94ba744b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------