Author: eevans
Date: Thu Jul 9 17:38:36 2009
New Revision: 792614
URL: http://svn.apache.org/viewvc?rev=792614&view=rev
Log:
move ports used in system tests; shorten timeout
Patch by Michael Greene; reviewed by eevans for CASSANDRA-282
Modified:
incubator/cassandra/trunk/test/cassandra.in.sh
incubator/cassandra/trunk/test/conf/storage-conf.xml
incubator/cassandra/trunk/test/system/__init__.py
Modified: incubator/cassandra/trunk/test/cassandra.in.sh
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/cassandra.in.sh?rev=792614&r1=792613&r2=792614&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/cassandra.in.sh (original)
+++ incubator/cassandra/trunk/test/cassandra.in.sh Thu Jul 9 17:38:36 2009
@@ -35,7 +35,7 @@
JVM_OPTS=" \
-ea \
-Xdebug \
- -Xrunjdwp:transport=dt_socket,server=y,address=8888,suspend=n \
+ -Xrunjdwp:transport=dt_socket,server=y,address=8898,suspend=n \
-Xms128M \
-Xmx1G \
-XX:SurvivorRatio=8 \
@@ -46,6 +46,6 @@
-XX:CMSInitiatingOccupancyFraction=1 \
-XX:+CMSParallelRemarkEnabled \
-XX:+HeapDumpOnOutOfMemoryError \
- -Dcom.sun.management.jmxremote.port=8080 \
+ -Dcom.sun.management.jmxremote.port=8090 \
-Dcom.sun.management.jmxremote.ssl=false \
-Dcom.sun.management.jmxremote.authenticate=false"
Modified: incubator/cassandra/trunk/test/conf/storage-conf.xml
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/conf/storage-conf.xml?rev=792614&r1=792613&r2=792614&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/test/conf/storage-conf.xml Thu Jul 9 17:38:36
2009
@@ -24,9 +24,9 @@
<ZookeeperAddress>127.0.0.1</ZookeeperAddress>
<RpcTimeoutInMillis>5000</RpcTimeoutInMillis>
<ListenAddress>127.0.0.1</ListenAddress>
- <StoragePort>7000</StoragePort>
- <ControlPort>7001</ControlPort>
- <ThriftPort>9160</ThriftPort>
+ <StoragePort>7010</StoragePort>
+ <ControlPort>7011</ControlPort>
+ <ThriftPort>9170</ThriftPort>
<ColumnIndexSizeInKB>4</ColumnIndexSizeInKB>
<CommitLogDirectory>build/test/cassandra/commitlog</CommitLogDirectory>
<CommitLogRotationThresholdInMB>128</CommitLogRotationThresholdInMB>
Modified: incubator/cassandra/trunk/test/system/__init__.py
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/system/__init__.py?rev=792614&r1=792613&r2=792614&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/system/__init__.py (original)
+++ incubator/cassandra/trunk/test/system/__init__.py Thu Jul 9 17:38:36 2009
@@ -30,7 +30,7 @@
sys.path.append(os.path.join(_ipath, 'cassandra'))
import Cassandra
-host, port = '127.0.0.1', 9160
+host, port = '127.0.0.1', 9170
def get_client():
socket = TSocket.TSocket(host, port)
transport = TTransport.TBufferedTransport(socket)
@@ -73,7 +73,7 @@
# connect to it, with a timeout in case something went wrong
start = time.time()
- while time.time() < start + 20:
+ while time.time() < start + 10:
try:
client.transport.open()
except:
