You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/04/25 01:28:25 UTC
svn commit: r768442 - in
/incubator/cassandra/trunk/src/org/apache/cassandra: db/ gms/ net/ service/
test/ tools/ utils/
Author: jbellis
Date: Fri Apr 24 23:28:24 2009
New Revision: 768442
URL: http://svn.apache.org/viewvc?rev=768442&view=rev
Log:
rename getHostName -> getHostAddress since it should always be an IP now.
patch by jbellis; reviewed by Eric Evans for #94
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java
incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutationMessage.java
incubator/cassandra/trunk/src/org/apache/cassandra/gms/FailureDetector.java
incubator/cassandra/trunk/src/org/apache/cassandra/net/EndPoint.java
incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraDaemon.java
incubator/cassandra/trunk/src/org/apache/cassandra/test/StressTest.java
incubator/cassandra/trunk/src/org/apache/cassandra/tools/KeyChecker.java
incubator/cassandra/trunk/src/org/apache/cassandra/tools/MembershipCleaner.java
incubator/cassandra/trunk/src/org/apache/cassandra/tools/TokenUpdater.java
incubator/cassandra/trunk/src/org/apache/cassandra/utils/FBUtilities.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java?rev=768442&r1=768441&r2=768442&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/DBManager.java Fri Apr 24 23:28:24 2009
@@ -23,11 +23,9 @@
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 @@
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 @@
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()));
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java?rev=768442&r1=768441&r2=768442&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java Fri Apr 24 23:28:24 2009
@@ -275,7 +275,7 @@
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());
}
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutationMessage.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutationMessage.java?rev=768442&r1=768441&r2=768442&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutationMessage.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutationMessage.java Fri Apr 24 23:28:24 2009
@@ -23,14 +23,12 @@
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 @@
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;
}
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/gms/FailureDetector.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/gms/FailureDetector.java?rev=768442&r1=768441&r2=768442&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/gms/FailureDetector.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/gms/FailureDetector.java Fri Apr 24 23:28:24 2009
@@ -141,7 +141,7 @@
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;
}
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=768442&r1=768441&r2=768442&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:24 2009
@@ -30,7 +30,6 @@
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 @@
{
try
{
- randomLocalEndPoint_ = new EndPoint(FBUtilities.getHostName(), EndPoint.randomPort_);
+ randomLocalEndPoint_ = new EndPoint(FBUtilities.getHostAddress(), EndPoint.randomPort_);
}
catch ( IOException ex )
{
@@ -74,7 +73,7 @@
{
try
{
- host_ = FBUtilities.getHostName();
+ host_ = FBUtilities.getHostAddress();
}
catch (UnknownHostException e)
{
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraDaemon.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraDaemon.java?rev=768442&r1=768441&r2=768442&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraDaemon.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraDaemon.java Fri Apr 24 23:28:24 2009
@@ -20,9 +20,7 @@
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 @@
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();
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/test/StressTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/test/StressTest.java?rev=768442&r1=768441&r2=768442&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/test/StressTest.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/test/StressTest.java Fri Apr 24 23:28:24 2009
@@ -739,7 +739,7 @@
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);
}
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/tools/KeyChecker.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/tools/KeyChecker.java?rev=768442&r1=768441&r2=768442&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/tools/KeyChecker.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/tools/KeyChecker.java Fri Apr 24 23:28:24 2009
@@ -65,7 +65,7 @@
/* 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_ );
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/tools/MembershipCleaner.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/tools/MembershipCleaner.java?rev=768442&r1=768441&r2=768442&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/tools/MembershipCleaner.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/tools/MembershipCleaner.java Fri Apr 24 23:28:24 2009
@@ -63,7 +63,7 @@
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;
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/tools/TokenUpdater.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/tools/TokenUpdater.java?rev=768442&r1=768441&r2=768442&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/tools/TokenUpdater.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/tools/TokenUpdater.java Fri Apr 24 23:28:24 2009
@@ -61,7 +61,7 @@
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;
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=768442&r1=768441&r2=768442&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:24 2009
@@ -148,7 +148,7 @@
return localInetAddress_;
}
- public static String getHostName() throws UnknownHostException
+ public static String getHostAddress() throws UnknownHostException
{
InetAddress inetAddr = getLocalAddress();
if (DatabaseDescriptor.getListenAddress() != null)