You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/05 22:39:15 UTC
[4/5] git commit: Revert "fix broadcastAddress and
Ec2MultiRegionSnitch.reconnect patch by Vijay;
reviewed by Brandon Williams for CASSANDRA-3835"
Revert "fix broadcastAddress and Ec2MultiRegionSnitch.reconnect patch by Vijay; reviewed by Brandon Williams for CASSANDRA-3835"
This reverts commit b4eae7cd44c73d64af3f0f38149c1065aceb38ee.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/defe66a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/defe66a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/defe66a1
Branch: refs/heads/cassandra-1.1
Commit: defe66a16a53b29bfaa2193a87f7c7e165938fa9
Parents: b4eae7c
Author: Vijay Parthasarathy <vi...@gmail.com>
Authored: Wed Feb 1 20:49:42 2012 -0800
Committer: Vijay Parthasarathy <vi...@gmail.com>
Committed: Wed Feb 1 20:49:42 2012 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/cli/CliClient.java | 10 +++++++++-
src/java/org/apache/cassandra/db/SystemTable.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
.../cassandra/net/OutboundTcpConnection.java | 5 -----
.../cassandra/net/OutboundTcpConnectionPool.java | 6 ++----
.../apache/cassandra/service/MigrationManager.java | 2 +-
6 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/defe66a1/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index 6b1e637..61cc53e 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -1155,7 +1155,15 @@ public class CliClient
{
SimpleSnitch snitch = new SimpleSnitch();
Map<String, String> options = new HashMap<String, String>();
- options.put(snitch.getDatacenter(FBUtilities.getBroadcastAddress()), "1");
+
+ try
+ {
+ options.put(snitch.getDatacenter(InetAddress.getLocalHost()), "1");
+ }
+ catch (UnknownHostException e)
+ {
+ throw new RuntimeException(e);
+ }
ksDef.setStrategy_options(options);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/defe66a1/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java
index 7e13fc4..c831382 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -138,7 +138,7 @@ public class SystemTable
*/
public static synchronized void updateToken(InetAddress ep, Token token)
{
- if (ep == FBUtilities.getBroadcastAddress())
+ if (ep == FBUtilities.getLocalAddress())
{
removeToken(token);
return;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/defe66a1/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 96576fb..d1a5b8d 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -1095,7 +1095,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
*/
public void addSavedEndpoint(InetAddress ep)
{
- if (ep == FBUtilities.getBroadcastAddress())
+ if (ep == FBUtilities.getLocalAddress())
{
logger.debug("Attempt to add self as saved endpoint");
return;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/defe66a1/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index a597aab..17c2097 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -78,11 +78,6 @@ public class OutboundTcpConnection extends Thread
enqueue(CLOSE_SENTINEL, null);
}
- void softCloseSocket()
- {
- enqueue(CLOSE_SENTINEL, null);
- }
-
public void run()
{
while (true)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/defe66a1/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
index a75dafe..c7acd9e 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
@@ -68,8 +68,7 @@ public class OutboundTcpConnectionPool
public void reset(InetAddress remoteEP)
{
resetedEndpoint = remoteEP;
- for (OutboundTcpConnection con : new OutboundTcpConnection[] { cmdCon, ackCon })
- con.softCloseSocket();
+ reset();
}
public Socket newSocket() throws IOException
@@ -79,8 +78,7 @@ public class OutboundTcpConnectionPool
{
return SSLFactory.getSocket(DatabaseDescriptor.getEncryptionOptions(), endPoint(), DatabaseDescriptor.getSSLStoragePort(), FBUtilities.getLocalAddress(), 0);
}
- else
- {
+ else {
return new Socket(endPoint(), DatabaseDescriptor.getStoragePort(), FBUtilities.getLocalAddress(), 0);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/defe66a1/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java
index cf0cbcd..4f6a5a7 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -54,7 +54,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber
// avoids re-pushing migrations that we're waiting on target to apply already
private static Map<InetAddress,UUID> lastPushed = new MapMaker().expiration(1, TimeUnit.MINUTES).makeMap();
- private static volatile UUID highestKnown;
+ private static UUID highestKnown;
public void onJoin(InetAddress endpoint, EndpointState epState) {
VersionedValue value = epState.getApplicationState(ApplicationState.SCHEMA);