Author: jbellis
Date: Fri Apr 24 23:28:09 2009
New Revision: 768441
URL: http://svn.apache.org/viewvc?rev=768441&view=rev
Log:
switch to IP everywhere. patch by jbellis; reviewed by Eric Evans for #94
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/gms/Gossiper.java
incubator/cassandra/trunk/src/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
incubator/cassandra/trunk/src/org/apache/cassandra/net/EndPoint.java
incubator/cassandra/trunk/src/org/apache/cassandra/net/TcpConnection.java
incubator/cassandra/trunk/src/org/apache/cassandra/utils/FBUtilities.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/gms/Gossiper.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/gms/Gossiper.java?rev=768441&r1=768440&r2=768441&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/gms/Gossiper.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/gms/Gossiper.java Fri
Apr 24 23:28:09 2009
@@ -20,6 +20,7 @@
import java.io.*;
import java.util.*;
+import java.net.InetAddress;
import org.apache.cassandra.concurrent.SingleThreadedStage;
import org.apache.cassandra.concurrent.StageManager;
@@ -895,7 +896,8 @@
Set<String> seedHosts = DatabaseDescriptor.getSeeds();
for( String seedHost : seedHosts )
{
- EndPoint seed = new EndPoint(seedHost,
DatabaseDescriptor.getControlPort());
+ EndPoint seed = new
EndPoint(InetAddress.getByName(seedHost).getHostAddress(),
+ DatabaseDescriptor.getControlPort());
if ( seed.equals(localEndPoint) )
continue;
seeds_.add(seed);
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/net/CompactEndPointSerializationHelper.java?rev=768441&r1=768440&r2=768441&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
(original)
+++
incubator/cassandra/trunk/src/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
Fri Apr 24 23:28:09 2009
@@ -39,18 +39,6 @@
return EndPoint.fromBytes(bytes);
}
- private static byte[] getIPAddress(String host) throws UnknownHostException
- {
- InetAddress ia = InetAddress.getByName(host);
- return ia.getAddress();
- }
-
- private static String getHostName(byte[] ipAddr) throws
UnknownHostException
- {
- InetAddress ia = InetAddress.getByAddress(ipAddr);
- return ia.getCanonicalHostName();
- }
-
public static void main(String[] args) throws Throwable
{
EndPoint ep = new EndPoint(7000);
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/net/EndPoint.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/net/EndPoint.java?rev=768441&r1=768440&r2=768441&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/net/EndPoint.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/net/EndPoint.java Fri
Apr 24 23:28:09 2009
@@ -62,16 +62,9 @@
private transient InetSocketAddress ia_;
- /* Ctor for JAXB. DO NOT DELETE */
- private EndPoint()
- {
- }
-
public EndPoint(String host, int port)
{
- /*
- * Attempts to resolve the host, but does not fail if it cannot.
- */
+ assert host.matches("\\d+\\.\\d+\\.\\d+\\.\\d+") : host;
host_ = host;
port_ = port;
}
@@ -166,7 +159,7 @@
String host = hostNames_.get(charBuffer);
if (host == null)
{
- host = InetAddress.getByAddress(buffer.array()).getHostName();
+ host =
InetAddress.getByAddress(buffer.array()).getHostAddress();
hostNames_.put(charBuffer, host);
}
int port = (int) MessagingService.byteArrayToShort(portBytes);
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/net/TcpConnection.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/net/TcpConnection.java?rev=768441&r1=768440&r2=768441&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/net/TcpConnection.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/net/TcpConnection.java
Fri Apr 24 23:28:09 2009
@@ -512,7 +512,7 @@
if (remoteEp_ == null)
{
int port = ( pH.isListening_ ) ?
DatabaseDescriptor.getStoragePort() : EndPoint.randomPort_;
- remoteEp_ = new EndPoint(
socketChannel_.socket().getInetAddress().getHostName(), port );
+ remoteEp_ = new EndPoint(
socketChannel_.socket().getInetAddress().getHostAddress(), port );
// put connection into pool if possible
pool_ =
MessagingService.getConnectionPool(localEp_, remoteEp_);
pool_.addToPool(TcpConnection.this);
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/utils/FBUtilities.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/utils/FBUtilities.java?rev=768441&r1=768440&r2=768441&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/utils/FBUtilities.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/utils/FBUtilities.java
Fri Apr 24 23:28:09 2009
@@ -150,11 +150,12 @@
public static String getHostName() throws UnknownHostException
{
+ InetAddress inetAddr = getLocalAddress();
if (DatabaseDescriptor.getListenAddress() != null)
{
- return DatabaseDescriptor.getListenAddress();
+ inetAddr =
InetAddress.getByName(DatabaseDescriptor.getListenAddress());
}
- return getLocalAddress().getCanonicalHostName();
+ return inetAddr.getHostAddress();
}
public static boolean isHostLocalHost(InetAddress host)
