Author: jbellis
Date: Tue Apr 21 16:21:15 2009
New Revision: 767205
URL: http://svn.apache.org/viewvc?rev=767205&view=rev
Log:
Revert "configurable ListenAddress setting" since it prevents server from
starting.
This reverts commit 1304a9d9e1f9f85b991d99a1ca96e02505eb430f.
Modified:
incubator/cassandra/trunk/conf/storage-conf.xml
incubator/cassandra/trunk/src/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/org/apache/cassandra/net/EndPoint.java
incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraDaemon.java
incubator/cassandra/trunk/test/conf/storage-conf.xml
Modified: incubator/cassandra/trunk/conf/storage-conf.xml
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/conf/storage-conf.xml?rev=767205&r1=767204&r2=767205&view=diff
==============================================================================
--- incubator/cassandra/trunk/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/conf/storage-conf.xml Tue Apr 21 16:21:15 2009
@@ -14,7 +14,6 @@
<RpcTimeoutInMillis>5000</RpcTimeoutInMillis>
<JobTrackerHost>tdsearch001.sf2p.facebook.com</JobTrackerHost>
<JobJarFileLocation>C:\Engagements\Cassandra-Nexus</JobJarFileLocation>
- <ListenAddress>127.0.0.1</ListenAddress>
<StoragePort>7000</StoragePort>
<ControlPort>7001</ControlPort>
<ThriftPort>9160</ThriftPort>
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/config/DatabaseDescriptor.java?rev=767205&r1=767204&r2=767205&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
incubator/cassandra/trunk/src/org/apache/cassandra/config/DatabaseDescriptor.java
Tue Apr 21 16:21:15 2009
@@ -48,7 +48,6 @@
private static int controlPort_ = 7001;
private static int httpPort_ = 7002;
private static int thriftPort_ = 9160;
- private static String listenAddress_ = "localhost";
private static String clusterName_ = "Test";
private static int replicationFactor_ = 3;
private static long rpcTimeoutInMillis_ = 2000;
@@ -177,11 +176,6 @@
if ( port != null )
storagePort_ = Integer.parseInt(port);
- /* Local IP or hostname to bind services to */
- String listenAddress =
xmlUtils.getNodeValue("/Storage/ListenAddress");
- if ( listenAddress != null)
- listenAddress_ = listenAddress;
-
/* UDP port for control messages */
port = xmlUtils.getNodeValue("/Storage/ControlPort");
if ( port != null )
@@ -806,9 +800,4 @@
super(message);
}
}
-
- public static String getListenAddress()
- {
- return listenAddress_;
- }
}
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=767205&r1=767204&r2=767205&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/net/EndPoint.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/net/EndPoint.java Tue
Apr 21 16:21:15 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 ( [email protected]) & Prashant Malik (
[email protected] )
@@ -81,14 +80,7 @@
{
try
{
- if(DatabaseDescriptor.getListenAddress() != null)
- {
- host_ = DatabaseDescriptor.getListenAddress();
- }
- else
- {
- host_ = FBUtilities.getHostName();
- }
+ host_ = FBUtilities.getHostName();
port_ = port;
}
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=767205&r1=767204&r2=767205&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraDaemon.java
(original)
+++
incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraDaemon.java
Tue Apr 21 16:21:15 2009
@@ -20,9 +20,6 @@
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;
@@ -68,22 +65,7 @@
Cassandra.Processor processor = new
Cassandra.Processor(peerStorageServer);
// Transport
- TServerSocket tServerSocket = null;
- try
- {
- // Make server socket
- ServerSocket serverSocket = new ServerSocket();
- // Prevent 2MSL delay problem on server restarts
- serverSocket.setReuseAddress(true);
- // Bind to listening port
- serverSocket.bind(new
InetSocketAddress(DatabaseDescriptor.getListenAddress(), listenPort));
- tServerSocket = new TServerSocket(serverSocket);
- }
- catch (IOException ioe)
- {
- throw new TTransportException("Could not create ServerSocket on
address "
- + DatabaseDescriptor.getListenAddress() + ".");
- }
+ TServerSocket tServerSocket = new TServerSocket(listenPort);
// Protocol factory
TProtocolFactory tProtocolFactory = new TBinaryProtocol.Factory();
Modified: incubator/cassandra/trunk/test/conf/storage-conf.xml
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/conf/storage-conf.xml?rev=767205&r1=767204&r2=767205&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/test/conf/storage-conf.xml Tue Apr 21 16:21:15
2009
@@ -14,7 +14,6 @@
<RpcTimeoutInMillis>5000</RpcTimeoutInMillis>
<JobTrackerHost>tdsearch001.sf2p.facebook.com</JobTrackerHost>
<JobJarFileLocation>C:\Engagements\Cassandra-Nexus</JobJarFileLocation>
- <ListenAddress>127.0.0.1</ListenAddress>
<StoragePort>7000</StoragePort>
<ControlPort>7001</ControlPort>
<ThriftPort>7001</ThriftPort>
