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/07/13 22:05:04 UTC
svn commit: r793691 - in /incubator/cassandra/trunk: conf/ lib/
lib/licenses/ src/java/org/apache/cassandra/config/
src/java/org/apache/cassandra/service/ test/conf/
Author: jbellis
Date: Mon Jul 13 20:05:04 2009
New Revision: 793691
URL: http://svn.apache.org/viewvc?rev=793691&view=rev
Log:
r/m ZooKeeper vestiges. patch by Michael Greene; reviewed by jbellis for CASSANDRA-291
Removed:
incubator/cassandra/trunk/lib/licenses/zookeeper-3.0.0.jar.LICENSE
incubator/cassandra/trunk/lib/zookeeper-3.0.0.jar
Modified:
incubator/cassandra/trunk/conf/storage-conf.xml
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.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=793691&r1=793690&r2=793691&view=diff
==============================================================================
--- incubator/cassandra/trunk/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/conf/storage-conf.xml Mon Jul 13 20:05:04 2009
@@ -172,14 +172,4 @@
face of hardware failures. The default value is ten days.
-->
<GCGraceSeconds>864000</GCGraceSeconds>
-
-
- <!--======================================================================-->
- <!-- OPTIONAL -->
- <!--======================================================================-->
- <!-- This final section contains configuration information for optional
- and experimental features in Cassandra that are not yet fully functional.
- Basic features in Cassandra should work fine without configuring this section.
- -->
- <ZookeeperAddress>127.0.0.1</ZookeeperAddress>
</Storage>
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=793691&r1=793690&r2=793691&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Mon Jul 13 20:05:04 2009
@@ -95,16 +95,12 @@
* high throughput on reads but at the cost of consistency.
*/
private static boolean doConsistencyCheck_ = true;
- /* Address of ZooKeeper cell */
- private static String zkAddress_;
/* Callout directories */
private static String calloutLocation_;
/* Job Jar Location */
private static String jobJarFileLocation_;
/* Address where to run the job tracker */
private static String jobTrackerHost_;
- /* Zookeeper session timeout. */
- private static int zkSessionTimeout_ = 30000;
/* time to wait before garbage collecting tombstones (deletion markers) */
private static int gcGraceInSeconds_ = 10 * 24 * 3600; // 10 days
@@ -128,9 +124,6 @@
/* Ganglia servers contact list */
gangliaServers_ = xmlUtils.getNodeValues("/Storage/GangliaServers/GangliaServer");
- /* ZooKeeper's address */
- zkAddress_ = xmlUtils.getNodeValue("/Storage/ZookeeperAddress");
-
/* Hashing strategy */
partitionerClass_ = xmlUtils.getNodeValue("/Storage/Partitioner");
try
@@ -161,11 +154,6 @@
initialToken_ = xmlUtils.getNodeValue("/Storage/InitialToken");
- /* Zookeeper's session timeout */
- String zkSessionTimeout = xmlUtils.getNodeValue("/Storage/ZookeeperSessionTimeout");
- if ( zkSessionTimeout != null )
- zkSessionTimeout_ = Integer.parseInt(zkSessionTimeout);
-
/* Data replication factor */
String replicationFactor = xmlUtils.getNodeValue("/Storage/ReplicationFactor");
if ( replicationFactor != null )
@@ -480,11 +468,6 @@
return partitionerClass_;
}
- public static String getZkAddress()
- {
- return zkAddress_;
- }
-
public static String getCalloutLocation()
{
return calloutLocation_;
@@ -495,11 +478,6 @@
return jobTrackerHost_;
}
- public static int getZkSessionTimeout()
- {
- return zkSessionTimeout_;
- }
-
public static int getColumnIndexSize()
{
return columnIndexSizeInKB_ * 1024;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=793691&r1=793690&r2=793691&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Mon Jul 13 20:05:04 2009
@@ -43,7 +43,6 @@
import org.apache.cassandra.utils.FileUtils;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
-import org.apache.zookeeper.ZooKeeper;
/*
* This abstraction contains the token/identifier of this node
@@ -184,8 +183,6 @@
private StorageLoadBalancer storageLoadBalancer_;
/* We use this interface to determine where replicas need to be placed */
private IReplicaPlacementStrategy nodePicker_;
- /* Handle to a ZooKeeper instance */
- private ZooKeeper zk_;
/*
* Registers with Management Server
@@ -244,11 +241,6 @@
nodePicker_ = new RackUnawareStrategy(tokenMetadata_, partitioner_, DatabaseDescriptor.getReplicationFactor(), DatabaseDescriptor.getStoragePort());
}
- protected ZooKeeper getZooKeeperHandle()
- {
- return zk_;
- }
-
static
{
try
Modified: incubator/cassandra/trunk/test/conf/storage-conf.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/conf/storage-conf.xml?rev=793691&r1=793690&r2=793691&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/test/conf/storage-conf.xml Mon Jul 13 20:05:04 2009
@@ -21,7 +21,6 @@
<Partitioner>org.apache.cassandra.dht.OrderPreservingPartitioner</Partitioner>
<RackAware>false</RackAware>
<ReplicationFactor>1</ReplicationFactor>
- <ZookeeperAddress>127.0.0.1</ZookeeperAddress>
<RpcTimeoutInMillis>5000</RpcTimeoutInMillis>
<ListenAddress>127.0.0.1</ListenAddress>
<StoragePort>7010</StoragePort>