You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2013/06/20 21:22:21 UTC
[1/3] git commit: changes.txt
Updated Branches:
refs/heads/trunk 56a47b394 -> 7bb6f012b
changes.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4dca443
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4dca443
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4dca443
Branch: refs/heads/trunk
Commit: b4dca44375b023ad12ac812572c96bf75b7935db
Parents: 72b1a1b
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Jun 20 12:15:00 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Jun 20 12:15:26 2013 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4dca443/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bd52eab..6d9c910 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -30,6 +30,8 @@
* Update CREATE CUSTOM INDEX syntax (CASSANDRA-5639)
* Fix PermissionDetails.equals() method (CASSANDRA-5655)
* Never allow partition key ranges in CQL3 without token() (CASSANDRA-5666)
+ * Gossiper incorrectly drops AppState for an upgrading node (CASSANDRA-5660)
+ * Connection thrashing during multi-region ec2 during upgrade, due to messaging version (CASSANDRA-5669)
Merged from 1.1:
* Remove buggy thrift max message length option (CASSANDRA-5529)
* Fix NPE in Pig's widerow mode (CASSANDRA-5488)
[2/3] git commit: ITC.close() resets peer msg version,
causes connection thrashing in ec2 during upgrade. Second pass,
where we have Ec2MRS check that the perr node is on the same
MS.current_version before closing connection on publicIP and reconnecting
Posted by ja...@apache.org.
ITC.close() resets peer msg version, causes connection thrashing in ec2 during upgrade.
Second pass, where we have Ec2MRS check that the perr node is on the same MS.current_version before
closing connection on publicIP and reconnecting on privateIP
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72b1a1b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72b1a1b4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72b1a1b4
Branch: refs/heads/trunk
Commit: 72b1a1b4989212267dba9a8d389af21d24423533
Parents: 8d17ccb
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Jun 20 11:19:44 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Jun 20 12:15:26 2013 -0700
----------------------------------------------------------------------
.../cassandra/locator/Ec2MultiRegionSnitch.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72b1a1b4/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java b/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
index e29637f..12ebfbb 100644
--- a/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
+++ b/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
@@ -97,17 +97,19 @@ public class Ec2MultiRegionSnitch extends Ec2Snitch implements IEndpointStateCha
private void reConnect(InetAddress endpoint, VersionedValue versionedValue)
{
- if (!getDatacenter(endpoint).equals(getDatacenter(public_ip)))
- return; // do nothing return back...
-
- try
- {
- InetAddress remoteIP = InetAddress.getByName(versionedValue.value);
- MessagingService.instance().getConnectionPool(endpoint).reset(remoteIP);
- logger.debug(String.format("Intiated reconnect to an Internal IP %s for the %s", remoteIP, endpoint));
- } catch (UnknownHostException e)
+ if (getDatacenter(endpoint).equals(getDatacenter(public_ip))
+ && MessagingService.instance().getVersion(endpoint) == MessagingService.current_version)
{
- logger.error("Error in getting the IP address resolved: ", e);
+ try
+ {
+ InetAddress remoteIP = InetAddress.getByName(versionedValue.value);
+ MessagingService.instance().getConnectionPool(endpoint).reset(remoteIP);
+ logger.debug(String.format("Intiated reconnect to an Internal IP %s for the %s", remoteIP, endpoint));
+ }
+ catch (UnknownHostException e)
+ {
+ logger.error("Error in getting the IP address resolved: ", e);
+ }
}
}
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bb6f012
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bb6f012
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bb6f012
Branch: refs/heads/trunk
Commit: 7bb6f012b48fa6c38f78467306893aa52dfd9b4a
Parents: 56a47b3 b4dca44
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Jun 20 12:21:40 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Jun 20 12:21:40 2013 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/locator/Ec2MultiRegionSnitch.java | 22 +++++++++++---------
2 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bb6f012/CHANGES.txt
----------------------------------------------------------------------