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/11/03 18:00:54 UTC
[1/6] git commit: Improve client notification that nodes are ready
for requests
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 ef14f5165 -> 5548bf45e
refs/heads/cassandra-2.1 5160c916c -> 623aa6fe7
refs/heads/trunk 0f59629ce -> 632ebc5c5
Improve client notification that nodes are ready for requests
Patch by Brandon Williams, reviewed by thobbs for CASSANDRA-7510
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5548bf45
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5548bf45
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5548bf45
Branch: refs/heads/cassandra-2.0
Commit: 5548bf45e9b2cc61cbc131022b3df10924d88a95
Parents: ef14f51
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 10:59:07 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 10:59:07 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5548bf45/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4387d81..0ec3ff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Improve client notification that nodes are ready for requests (CASSANDRA-7510)
* Handle negative timestamp in writetime method (CASSANDRA-8139)
* Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
* Throw ConfigurationException when hsha is used with the default
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5548bf45/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 4973e40..1f831b9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1616,6 +1616,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
subscriber.onMove(endpoint);
}
}
+ else
+ {
+ if (!isClientMode)
+ {
+ for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
+ subscriber.onJoinCluster(endpoint);
+ }
+ }
PendingRangeCalculatorService.instance.update();
}
@@ -1982,11 +1990,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
subscriber.onUp(endpoint);
}
- else
- {
- for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
- subscriber.onJoinCluster(endpoint);
- }
}
public void onRemove(InetAddress endpoint)
[6/6] 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/632ebc5c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/632ebc5c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/632ebc5c
Branch: refs/heads/trunk
Commit: 632ebc5c57e10b1fcf8b4b1ab31368202e851c0c
Parents: 0f59629 623aa6f
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 11:00:06 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 11:00:44 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/632ebc5c/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/632ebc5c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index ea21f3d,84a6c14..1cbf2b7
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1610,9 -1659,21 +1610,14 @@@ public class StorageService extends Not
if (tokenMetadata.isMoving(endpoint)) // if endpoint was moving to a new token
{
tokenMetadata.removeFromMoving(endpoint);
-
- if (!isClientMode)
- {
- for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
- subscriber.onMove(endpoint);
- }
+ for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
+ subscriber.onMove(endpoint);
}
+ else
+ {
- if (!isClientMode)
- {
- for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
- subscriber.onJoinCluster(endpoint);
- }
++ for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
++ subscriber.onJoinCluster(endpoint);
+ }
PendingRangeCalculatorService.instance.update();
}
[4/6] 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/623aa6fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/623aa6fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/623aa6fe
Branch: refs/heads/trunk
Commit: 623aa6fe76af358391f9c7f185fb7f28376a6c7e
Parents: 5160c91 5548bf4
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 10:59:56 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 10:59:56 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/623aa6fe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 32083cc,0ec3ff1..b9b92fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.0.12:
+2.1.2
+ * Refactor how we track live size (CASSANDRA-7852)
+ * Make sure unfinished compaction files are removed (CASSANDRA-8124)
+ * Fix shutdown when run as Windows service (CASSANDRA-8136)
+ * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031)
+ * Fix race in RecoveryManagerTest (CASSANDRA-8176)
+ * Avoid IllegalArgumentException while sorting sstables in
+ IndexSummaryManager (CASSANDRA-8182)
+ * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579)
+ * Add 'die' policy for commit log and disk failure (CASSANDRA-7927)
+ * Fix installing as service on Windows (CASSANDRA-8115)
+ * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
+ * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
+Merged from 2.0:
+ * Improve client notification that nodes are ready for requests (CASSANDRA-7510)
* Handle negative timestamp in writetime method (CASSANDRA-8139)
* Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
* Throw ConfigurationException when hsha is used with the default
http://git-wip-us.apache.org/repos/asf/cassandra/blob/623aa6fe/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/6] git commit: Improve client notification that nodes are ready
for requests
Posted by br...@apache.org.
Improve client notification that nodes are ready for requests
Patch by Brandon Williams, reviewed by thobbs for CASSANDRA-7510
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5548bf45
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5548bf45
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5548bf45
Branch: refs/heads/cassandra-2.1
Commit: 5548bf45e9b2cc61cbc131022b3df10924d88a95
Parents: ef14f51
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 10:59:07 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 10:59:07 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5548bf45/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4387d81..0ec3ff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Improve client notification that nodes are ready for requests (CASSANDRA-7510)
* Handle negative timestamp in writetime method (CASSANDRA-8139)
* Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
* Throw ConfigurationException when hsha is used with the default
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5548bf45/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 4973e40..1f831b9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1616,6 +1616,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
subscriber.onMove(endpoint);
}
}
+ else
+ {
+ if (!isClientMode)
+ {
+ for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
+ subscriber.onJoinCluster(endpoint);
+ }
+ }
PendingRangeCalculatorService.instance.update();
}
@@ -1982,11 +1990,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
subscriber.onUp(endpoint);
}
- else
- {
- for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
- subscriber.onJoinCluster(endpoint);
- }
}
public void onRemove(InetAddress endpoint)
[5/6] 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/623aa6fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/623aa6fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/623aa6fe
Branch: refs/heads/cassandra-2.1
Commit: 623aa6fe76af358391f9c7f185fb7f28376a6c7e
Parents: 5160c91 5548bf4
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 10:59:56 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 10:59:56 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/623aa6fe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 32083cc,0ec3ff1..b9b92fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.0.12:
+2.1.2
+ * Refactor how we track live size (CASSANDRA-7852)
+ * Make sure unfinished compaction files are removed (CASSANDRA-8124)
+ * Fix shutdown when run as Windows service (CASSANDRA-8136)
+ * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031)
+ * Fix race in RecoveryManagerTest (CASSANDRA-8176)
+ * Avoid IllegalArgumentException while sorting sstables in
+ IndexSummaryManager (CASSANDRA-8182)
+ * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579)
+ * Add 'die' policy for commit log and disk failure (CASSANDRA-7927)
+ * Fix installing as service on Windows (CASSANDRA-8115)
+ * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
+ * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
+Merged from 2.0:
+ * Improve client notification that nodes are ready for requests (CASSANDRA-7510)
* Handle negative timestamp in writetime method (CASSANDRA-8139)
* Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
* Throw ConfigurationException when hsha is used with the default
http://git-wip-us.apache.org/repos/asf/cassandra/blob/623aa6fe/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[3/6] git commit: Improve client notification that nodes are ready
for requests
Posted by br...@apache.org.
Improve client notification that nodes are ready for requests
Patch by Brandon Williams, reviewed by thobbs for CASSANDRA-7510
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5548bf45
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5548bf45
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5548bf45
Branch: refs/heads/trunk
Commit: 5548bf45e9b2cc61cbc131022b3df10924d88a95
Parents: ef14f51
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 10:59:07 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 10:59:07 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5548bf45/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4387d81..0ec3ff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Improve client notification that nodes are ready for requests (CASSANDRA-7510)
* Handle negative timestamp in writetime method (CASSANDRA-8139)
* Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
* Throw ConfigurationException when hsha is used with the default
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5548bf45/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 4973e40..1f831b9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1616,6 +1616,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
subscriber.onMove(endpoint);
}
}
+ else
+ {
+ if (!isClientMode)
+ {
+ for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
+ subscriber.onJoinCluster(endpoint);
+ }
+ }
PendingRangeCalculatorService.instance.update();
}
@@ -1982,11 +1990,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
subscriber.onUp(endpoint);
}
- else
- {
- for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
- subscriber.onJoinCluster(endpoint);
- }
}
public void onRemove(InetAddress endpoint)