Author: ivol37 at gmail.com
Date: Tue Jan 18 09:52:06 2011
New Revision: 670
Log:
[AMDATU-272] Added more tooling
Modified:
trunk/amdatu-cassandra/cassandra-tools/pom.xml
trunk/amdatu-cassandra/cassandra-tools/src/main/assembly/assembly.xml
trunk/amdatu-cassandra/cassandra-tools/src/main/resources/nodetool
trunk/amdatu-cassandra/cassandra-tools/src/main/resources/nodetool.bat
trunk/amdatu-cassandra/cassandra-tools/src/main/resources/readme.txt
Modified: trunk/amdatu-cassandra/cassandra-tools/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-tools/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-tools/pom.xml Tue Jan 18 09:52:06 2011
@@ -14,7 +14,10 @@
<description>This bundle contains tools for managing Apache Cassandra nodes
in a cluster</description>
<properties>
-
<cassandra.lib.filename>cassandra-${cassandra.version}</cassandra.lib.filename>
+ <!-- Enter your own settings here for any other cassandra client you want
to generate cassandra client tools for -->
+
<cassandra.client.address>${cassandra.listen_address}</cassandra.client.address>
+ <cassandra.client.jmxport>${jmxremote.port}</cassandra.client.jmxport>
+
<cassandra.client.rpc_port>${cassandra.rpc_port}</cassandra.client.rpc_port>
</properties>
<dependencies>
@@ -68,9 +71,31 @@
<version>1.2</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.1.3</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
+ <finalName>cassandra-client-tools-${cassandra.version}</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>*.*</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Modified: trunk/amdatu-cassandra/cassandra-tools/src/main/assembly/assembly.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-tools/src/main/assembly/assembly.xml
(original)
+++ trunk/amdatu-cassandra/cassandra-tools/src/main/assembly/assembly.xml
Tue Jan 18 09:52:06 2011
@@ -5,7 +5,6 @@
<id>bin</id>
<formats>
<format>dir</format>
- <format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
Modified: trunk/amdatu-cassandra/cassandra-tools/src/main/resources/nodetool
==============================================================================
--- trunk/amdatu-cassandra/cassandra-tools/src/main/resources/nodetool
(original)
+++ trunk/amdatu-cassandra/cassandra-tools/src/main/resources/nodetool Tue Jan
18 09:52:06 2011
@@ -49,7 +49,7 @@
# Special-case path variables.
case "`uname`" in
- CYGWIN*)
+ CYGWIN*)
CLASSPATH=`cygpath -p -w "$CLASSPATH"`
CASSANDRA_CONF=`cygpath -p -w "$CASSANDRA_CONF"`
;;
@@ -57,6 +57,8 @@
$JAVA -cp $CLASSPATH -Dstorage-config=$CASSANDRA_CONF \
-Dlog4j.configuration=log4j-tools.properties \
+ -h ${cassandra.client.address} \
+ -p ${cassandra.client.jmxport} \
org.apache.cassandra.tools.NodeCmd $@
# vi:ai sw=4 ts=4 tw=0 et
Modified: trunk/amdatu-cassandra/cassandra-tools/src/main/resources/nodetool.bat
==============================================================================
--- trunk/amdatu-cassandra/cassandra-tools/src/main/resources/nodetool.bat
(original)
+++ trunk/amdatu-cassandra/cassandra-tools/src/main/resources/nodetool.bat
Tue Jan 18 09:52:06 2011
@@ -39,7 +39,7 @@
:runNodeTool
echo Starting NodeTool
-"%JAVA_HOME%\bin\java" -cp "%CASSANDRA_CLASSPATH%"
-Dlog4j.configuration=log4j-tools.properties org.apache.cassandra.tools.NodeCmd
%*
+"%JAVA_HOME%\bin\java" -cp "%CASSANDRA_CLASSPATH%"
-Dlog4j.configuration=log4j-tools.properties org.apache.cassandra.tools.NodeCmd
-h ${cassandra.client.address} -p ${cassandra.client.jmxport} %*
goto finally
:err
Modified: trunk/amdatu-cassandra/cassandra-tools/src/main/resources/readme.txt
==============================================================================
--- trunk/amdatu-cassandra/cassandra-tools/src/main/resources/readme.txt
(original)
+++ trunk/amdatu-cassandra/cassandra-tools/src/main/resources/readme.txt
Tue Jan 18 09:52:06 2011
@@ -1,4 +1,11 @@
-This zip provides the following Cassandra client utilities:
+This directory provides the Cassandra client utilities pre-configured to be
used for the
+specified Cassandra client in the pom.xml file of this project. To generate
Cassandra
+client tools for any cassandra client, edit the pom.xml and fill in these
properties:
+
+cassandra.client.address -> Listen address of the Cassandra node. Defaults to
localhost.
+cassandra.client.jmxport -> JMX communication port of the Cassandra node.
Defaults to undefined.
+cassandra.client.rpc_port -> RPC (Thrift) port of the Cassandra node. Defaults
to 9160.
+
notetool
--------
@@ -6,14 +13,22 @@
in a certain Cassandra cluster but also facilitates keyspace cleanup/compact
and
the possibility to make a backup of data stored by a certain node in the
cluster.
-Usage: nodetool -h HOSTNAME [-p JMX_PORT] COMMAND
-i.e. nodetool -h ${cassandra.listen_address} -p ${jmxremote.port}
+Usage: nodetool COMMAND
More information:
- http://www.datastax.com/docs/0.7/utilities/nodetool
- http://wiki.apache.org/cassandra/NodeProbe
+
cassandra-cli
-------------
+The cassandra client provides a basic command line API for CRUD operations on
keyspaces,
+Column Families and rows.
+
More information:
- - http://wiki.apache.org/cassandra/CassandraCli
\ No newline at end of file
+ - http://wiki.apache.org/cassandra/CassandraCli
+
+
+clustertool
+-----------
+Clustertool is the same as nodetool but intended for cluster-wide operations.
