diff --git a/src/org/apache/cassandra/db/DBManager.java b/src/org/apache/cassandra/db/DBManager.java index 310e8e043b..fa7849b609 100644 --- a/src/org/apache/cassandra/db/DBManager.java +++ b/src/org/apache/cassandra/db/DBManager.java @@ -23,11 +23,9 @@ import java.math.BigInteger; import java.util.Map; import java.util.Random; import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.BasicUtilities; @@ -115,7 +113,7 @@ public class DBManager StorageMetadata storageMetadata = null; /* Read the system table to retrieve the storage ID and the generation */ SystemTable sysTable = SystemTable.openSystemTable(SystemTable.name_); - Row row = sysTable.get(FBUtilities.getHostName()); + Row row = sysTable.get(FBUtilities.getHostAddress()); Random random = new Random(); if ( row == null ) @@ -128,7 +126,7 @@ public class DBManager int generation = 1; - String key = FBUtilities.getHostName(); + String key = FBUtilities.getHostAddress(); row = new Row(key); ColumnFamily cf = new ColumnFamily(SystemTable.cfName_, "Standard"); cf.addColumn(new Column(SystemTable.token_, token.toByteArray())); diff --git a/src/org/apache/cassandra/db/RowMutation.java b/src/org/apache/cassandra/db/RowMutation.java index 51cad8bd4c..7ce34c16ea 100644 --- a/src/org/apache/cassandra/db/RowMutation.java +++ b/src/org/apache/cassandra/db/RowMutation.java @@ -275,7 +275,7 @@ public class RowMutation implements Serializable DataOutputStream dos = new DataOutputStream(bos); serializer().serialize(this, dos); EndPoint local = StorageService.getLocalStorageEndPoint(); - EndPoint from = (local != null) ? local : new EndPoint(FBUtilities.getHostName(), 7000); + EndPoint from = (local != null) ? local : new EndPoint(FBUtilities.getHostAddress(), 7000); return new Message(from, StorageService.mutationStage_, verbHandlerName, bos.toByteArray()); } diff --git a/src/org/apache/cassandra/db/RowMutationMessage.java b/src/org/apache/cassandra/db/RowMutationMessage.java index c55a242d40..7582be1c74 100644 --- a/src/org/apache/cassandra/db/RowMutationMessage.java +++ b/src/org/apache/cassandra/db/RowMutationMessage.java @@ -23,14 +23,12 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.io.Serializable; -import java.util.*; import javax.xml.bind.annotation.XmlElement; import org.apache.cassandra.io.ICompactSerializer; import org.apache.cassandra.net.EndPoint; import org.apache.cassandra.net.Message; -import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; @@ -66,7 +64,7 @@ public class RowMutationMessage implements Serializable DataOutputStream dos = new DataOutputStream( bos ); RowMutationMessage.serializer().serialize(rowMutationMessage, dos); EndPoint local = StorageService.getLocalStorageEndPoint(); - EndPoint from = ( local != null ) ? local : new EndPoint(FBUtilities.getHostName(), 7000); + EndPoint from = ( local != null ) ? local : new EndPoint(FBUtilities.getHostAddress(), 7000); Message message = new Message(from, StorageService.mutationStage_, verbHandlerName, new Object[]{bos.toByteArray()}); return message; } diff --git a/src/org/apache/cassandra/gms/FailureDetector.java b/src/org/apache/cassandra/gms/FailureDetector.java index 9361bc0ca6..4449a27c59 100644 --- a/src/org/apache/cassandra/gms/FailureDetector.java +++ b/src/org/apache/cassandra/gms/FailureDetector.java @@ -141,7 +141,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean try { /* If the endpoint in question is the local endpoint return true. */ - String localHost = FBUtilities.getHostName(); + String localHost = FBUtilities.getHostAddress(); if ( localHost.equals( ep.getHost() ) ) return true; } diff --git a/src/org/apache/cassandra/net/EndPoint.java b/src/org/apache/cassandra/net/EndPoint.java index 1b78ee2963..621a7f45df 100644 --- a/src/org/apache/cassandra/net/EndPoint.java +++ b/src/org/apache/cassandra/net/EndPoint.java @@ -30,7 +30,6 @@ import java.util.Map; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.LogUtil; import org.apache.log4j.Logger; -import org.apache.cassandra.config.DatabaseDescriptor; /** * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com ) @@ -49,7 +48,7 @@ public class EndPoint implements Serializable, Comparable { try { - randomLocalEndPoint_ = new EndPoint(FBUtilities.getHostName(), EndPoint.randomPort_); + randomLocalEndPoint_ = new EndPoint(FBUtilities.getHostAddress(), EndPoint.randomPort_); } catch ( IOException ex ) { @@ -74,7 +73,7 @@ public class EndPoint implements Serializable, Comparable { try { - host_ = FBUtilities.getHostName(); + host_ = FBUtilities.getHostAddress(); } catch (UnknownHostException e) { diff --git a/src/org/apache/cassandra/service/CassandraDaemon.java b/src/org/apache/cassandra/service/CassandraDaemon.java index 13dce88b64..9bd59d2b03 100644 --- a/src/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/org/apache/cassandra/service/CassandraDaemon.java @@ -20,9 +20,7 @@ package org.apache.cassandra.service; import java.io.File; import java.io.IOException; -import java.net.ServerSocket; import java.net.InetSocketAddress; -import java.net.InetAddress; import org.apache.log4j.Logger; import org.apache.thrift.protocol.TBinaryProtocol; @@ -69,7 +67,7 @@ public class CassandraDaemon Cassandra.Processor processor = new Cassandra.Processor(peerStorageServer); // Transport - TServerSocket tServerSocket = new TServerSocket(new InetSocketAddress(FBUtilities.getHostName(), listenPort)); + TServerSocket tServerSocket = new TServerSocket(new InetSocketAddress(FBUtilities.getHostAddress(), listenPort)); // Protocol factory TProtocolFactory tProtocolFactory = new TBinaryProtocol.Factory(); diff --git a/src/org/apache/cassandra/test/StressTest.java b/src/org/apache/cassandra/test/StressTest.java index d6c88a76b8..c5f9a01bd0 100644 --- a/src/org/apache/cassandra/test/StressTest.java +++ b/src/org/apache/cassandra/test/StressTest.java @@ -739,7 +739,7 @@ public class StressTest System.err.println("**********Errors*************"); } if ( jsap.messagePrinted() ) return null; - String hostName = FBUtilities.getHostName(); + String hostName = FBUtilities.getHostAddress(); from_ = new EndPoint(hostName,10001); MessagingService.getMessagingInstance().listen(from_, false); } diff --git a/src/org/apache/cassandra/tools/KeyChecker.java b/src/org/apache/cassandra/tools/KeyChecker.java index 2c484d3b47..07243befbf 100644 --- a/src/org/apache/cassandra/tools/KeyChecker.java +++ b/src/org/apache/cassandra/tools/KeyChecker.java @@ -65,7 +65,7 @@ public class KeyChecker /* Sleep for proper discovery */ Thread.sleep(240000); /* Create the file for the missing keys */ - RandomAccessFile raf = new RandomAccessFile( "Missing-" + FBUtilities.getHostName() + ".dat", "rw"); + RandomAccessFile raf = new RandomAccessFile( "Missing-" + FBUtilities.getHostAddress() + ".dat", "rw"); /* Start reading the file that contains the keys */ BufferedReader bufReader = new BufferedReader( new InputStreamReader( new FileInputStream(args[0]) ), KeyChecker.bufSize_ ); diff --git a/src/org/apache/cassandra/tools/MembershipCleaner.java b/src/org/apache/cassandra/tools/MembershipCleaner.java index 4d5548dd02..e2814ab478 100644 --- a/src/org/apache/cassandra/tools/MembershipCleaner.java +++ b/src/org/apache/cassandra/tools/MembershipCleaner.java @@ -63,7 +63,7 @@ public class MembershipCleaner DataOutputStream dos = new DataOutputStream(bos); MembershipCleanerMessage.serializer().serialize(mcMessage, dos); /* Construct the token update message to be sent */ - Message mbrshipCleanerMessage = new Message( new EndPoint(FBUtilities.getHostName(), port_), "", StorageService.mbrshipCleanerVerbHandler_, new Object[]{bos.toByteArray()} ); + Message mbrshipCleanerMessage = new Message( new EndPoint(FBUtilities.getHostAddress(), port_), "", StorageService.mbrshipCleanerVerbHandler_, new Object[]{bos.toByteArray()} ); BufferedReader bufReader = new BufferedReader( new InputStreamReader( new FileInputStream(file) ) ); String line = null; diff --git a/src/org/apache/cassandra/tools/TokenUpdater.java b/src/org/apache/cassandra/tools/TokenUpdater.java index 28d5f915c1..391df99a04 100644 --- a/src/org/apache/cassandra/tools/TokenUpdater.java +++ b/src/org/apache/cassandra/tools/TokenUpdater.java @@ -61,7 +61,7 @@ public class TokenUpdater DataOutputStream dos = new DataOutputStream(bos); TokenInfoMessage.serializer().serialize(tiMessage, dos); /* Construct the token update message to be sent */ - Message tokenUpdateMessage = new Message( new EndPoint(FBUtilities.getHostName(), port_), "", StorageService.tokenVerbHandler_, new Object[]{bos.toByteArray()} ); + Message tokenUpdateMessage = new Message( new EndPoint(FBUtilities.getHostAddress(), port_), "", StorageService.tokenVerbHandler_, new Object[]{bos.toByteArray()} ); BufferedReader bufReader = new BufferedReader( new InputStreamReader( new FileInputStream(file) ) ); String line = null; diff --git a/src/org/apache/cassandra/utils/FBUtilities.java b/src/org/apache/cassandra/utils/FBUtilities.java index 3cf30da77f..3f14c06337 100644 --- a/src/org/apache/cassandra/utils/FBUtilities.java +++ b/src/org/apache/cassandra/utils/FBUtilities.java @@ -148,7 +148,7 @@ public class FBUtilities return localInetAddress_; } - public static String getHostName() throws UnknownHostException + public static String getHostAddress() throws UnknownHostException { InetAddress inetAddr = getLocalAddress(); if (DatabaseDescriptor.getListenAddress() != null)