Author: jbellis
Date: Wed Apr 21 21:05:34 2010
New Revision: 936511
URL: http://svn.apache.org/viewvc?rev=936511&view=rev
Log:
add bin/config-convert for xml -> yaml migration. patch by Todd Blose;
reviewed by Stu Hood for CASSANDRA-1000
Added:
cassandra/trunk/bin/config-converter
cassandra/trunk/lib/licenses/snakeyaml-1.6.txt
cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java
cassandra/trunk/test/conf/cassandra.yaml
Removed:
cassandra/trunk/test/conf/cassandra.xml
Modified:
cassandra/trunk/NEWS.txt
Modified: cassandra/trunk/NEWS.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/NEWS.txt?rev=936511&r1=936510&r2=936511&view=diff
==============================================================================
--- cassandra/trunk/NEWS.txt (original)
+++ cassandra/trunk/NEWS.txt Wed Apr 21 21:05:34 2010
@@ -14,6 +14,10 @@ Configuraton
------------
- Configuration file renamed to cassandra.yaml and log4j.properties to
log4j-server.properties
+ - Added 'bin/config-converter' to convert existing storage-conf.xml or
+ cassandra.xml files to a cassandra.yaml file. When executed, it will
+ create a cassandra.yaml file in any directory containing a matching
+ xml file.
- The ThriftAddress and ThriftPort directives have been renamed to
RPCAddress and RPCPort respectively.
- The keyspaces defined in cassandra.yaml are ignored on startup as a
Added: cassandra/trunk/bin/config-converter
URL:
http://svn.apache.org/viewvc/cassandra/trunk/bin/config-converter?rev=936511&view=auto
==============================================================================
--- cassandra/trunk/bin/config-converter (added)
+++ cassandra/trunk/bin/config-converter Wed Apr 21 21:05:34 2010
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [ "x$CASSANDRA_INCLUDE" = "x" ]; then
+ for include in /usr/share/cassandra/cassandra.in.sh \
+ /usr/local/share/cassandra/cassandra.in.sh \
+ /opt/cassandra/cassandra.in.sh \
+ ~/.cassandra.in.sh \
+ `dirname $0`/cassandra.in.sh; do
+ if [ -r $include ]; then
+ . $include
+ break
+ fi
+ done
+elif [ -r $CASSANDRA_INCLUDE ]; then
+ . $CASSANDRA_INCLUDE
+fi
+
+# Use JAVA_HOME if set, otherwise look for java in PATH
+if [ -x $JAVA_HOME/bin/java ]; then
+ JAVA=$JAVA_HOME/bin/java
+else
+ JAVA=`which java`
+fi
+
+if [ -z $CLASSPATH ]; then
+ echo "You must set the CLASSPATH var" >&2
+ exit 1
+fi
+
+$JAVA -ea -cp $CLASSPATH \
+ -Dlog4j.configuration=log4j-tools.properties \
+ org.apache.cassandra.config.Converter "$@"
+
+# vi:ai sw=4 ts=4 tw=0 et
Added: cassandra/trunk/lib/licenses/snakeyaml-1.6.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/lib/licenses/snakeyaml-1.6.txt?rev=936511&view=auto
==============================================================================
--- cassandra/trunk/lib/licenses/snakeyaml-1.6.txt (added)
+++ cassandra/trunk/lib/licenses/snakeyaml-1.6.txt Wed Apr 21 21:05:34 2010
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java?rev=936511&view=auto
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java (added)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/Converter.java Wed Apr
21 21:05:34 2010
@@ -0,0 +1,344 @@
+package org.apache.cassandra.config;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
+
+import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.XMLUtils;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+import org.yaml.snakeyaml.Dumper;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.introspector.Property;
+import org.yaml.snakeyaml.nodes.NodeTuple;
+import org.yaml.snakeyaml.nodes.Tag;
+import org.yaml.snakeyaml.representer.Representer;
+
+public class Converter {
+
+ private static Config conf = new Config();
+ private final static String PREVIOUS_CONF_FILE = "cassandra.xml";
+
+ private static List<Keyspace> readTablesFromXml(XMLUtils xmlUtils) throws
ConfigurationException
+ {
+
+ List<Keyspace> keyspaces = new ArrayList<Keyspace>();
+ /* Read the table related stuff from config */
+ try
+ {
+ NodeList tablesxml =
xmlUtils.getRequestedNodeList("/Storage/Keyspaces/Keyspace");
+ int size = tablesxml.getLength();
+ for ( int i = 0; i < size; ++i )
+ {
+ String value = null;
+ Keyspace ks = new Keyspace();
+ Node table = tablesxml.item(i);
+ /* parsing out the table ksName */
+ ks.name = XMLUtils.getAttributeValue(table, "Name");
+
+
+ ks.replica_placement_strategy =
xmlUtils.getNodeValue("/Storage/Keyspaces/keyspa...@name='" + ks.name +
"']/ReplicaPlacementStrategy");
+ /* Data replication factor */
+ value =
xmlUtils.getNodeValue("/Storage/Keyspaces/keyspa...@name='" + ks.name +
"']/ReplicationFactor");
+ if (value != null)
+ {
+ ks.replication_factor = Integer.parseInt(value);
+ }
+
+
+ String xqlTable = "/Storage/Keyspaces/keyspa...@name='" +
ks.name + "']/";
+ NodeList columnFamilies =
xmlUtils.getRequestedNodeList(xqlTable + "ColumnFamily");
+
+ int size2 = columnFamilies.getLength();
+ ks.column_families = new ColumnFamily[size2];
+ for ( int j = 0; j < size2; ++j )
+ {
+ Node columnFamily = columnFamilies.item(j);
+ ks.column_families[j] = new ColumnFamily();
+ ks.column_families[j].name =
XMLUtils.getAttributeValue(columnFamily, "Name");
+ String xqlCF = xqlTable + "columnfami...@name='" +
ks.column_families[j].name + "']/";
+ ks.column_families[j].column_type =
XMLUtils.getAttributeValue(columnFamily, "ColumnType");
+ ks.column_families[j].compare_with =
XMLUtils.getAttributeValue(columnFamily, "CompareWith");
+
+ if (ks.column_families[j].column_type != null &&
ks.column_families[j].column_type.equals("Super"))
+ ks.column_families[j].compare_subcolumns_with =
XMLUtils.getAttributeValue(columnFamily, "CompareSubcolumnsWith");
+
+ if ((value = XMLUtils.getAttributeValue(columnFamily,
"KeysCached")) != null)
+ {
+ ks.column_families[j].keys_cached =
FBUtilities.parseDoubleOrPercent(value);
+ }
+
+ if ((value = XMLUtils.getAttributeValue(columnFamily,
"RowsCached")) != null)
+ {
+ ks.column_families[j].rows_cached =
FBUtilities.parseDoubleOrPercent(value);
+ }
+
+ if ((value = XMLUtils.getAttributeValue(columnFamily,
"ReadRepairChance")) != null)
+ {
+ ks.column_families[j].read_repair_chance =
FBUtilities.parseDoubleOrPercent(value);
+ }
+
+ ks.column_families[j].comment =
xmlUtils.getNodeValue(xqlCF + "Comment");
+ }
+ keyspaces.add(ks);
+ }
+ return keyspaces;
+ }
+ catch (XPathExpressionException e)
+ {
+ throw new ConfigurationException("XPath expression error.");
+ }
+ catch (TransformerException e)
+ {
+ throw new ConfigurationException("Error occurred during the
transformation process.");
+ }
+ }
+
+
+ private static void loadPreviousConfig(String config) throws
ConfigurationException
+ {
+ try {
+ XMLUtils xmlUtils = new XMLUtils(config);
+ conf.cluster_name = xmlUtils.getNodeValue("/Storage/ClusterName");
+
+ String syncRaw = xmlUtils.getNodeValue("/Storage/CommitLogSync");
+ conf.commitlog_sync = Config.CommitLogSync.valueOf(syncRaw);
+
+ if (conf.commitlog_sync != null)
+ {
+ if (conf.commitlog_sync == Config.CommitLogSync.batch)
+ conf.commitlog_sync_batch_window_in_ms =
Double.valueOf(xmlUtils.getNodeValue("/Storage/CommitLogSyncBatchWindowInMS"));
+ else
+ conf.commitlog_sync_period_in_ms =
Integer.valueOf(xmlUtils.getNodeValue("/Storage/CommitLogSyncPeriodInMS"));
+
+ }
+
+ String modeRaw = xmlUtils.getNodeValue("/Storage/DiskAccessMode");
+ conf.disk_access_mode = Config.DiskAccessMode.valueOf(modeRaw);
+
+ conf.authenticator =
xmlUtils.getNodeValue("/Storage/Authenticator");
+
+ /* Hashing strategy */
+ conf.partitioner = xmlUtils.getNodeValue("/Storage/Partitioner");
+
+ conf.job_tracker_host =
xmlUtils.getNodeValue("/Storage/JobTrackerHost");
+
+ conf.job_jar_file_location =
xmlUtils.getNodeValue("/Storage/JobJarFileLocation");
+
+ String gcGrace = xmlUtils.getNodeValue("/Storage/GCGraceSeconds");
+ if ( gcGrace != null )
+ conf.gc_grace_seconds = Integer.parseInt(gcGrace);
+
+ conf.initial_token =
xmlUtils.getNodeValue("/Storage/InitialToken");
+
+ String rpcTimeout =
xmlUtils.getNodeValue("/Storage/RpcTimeoutInMillis");
+ if ( rpcTimeout != null )
+ conf.rpc_timeout_in_ms = Long.parseLong(rpcTimeout);
+
+ String rawReaders =
xmlUtils.getNodeValue("/Storage/ConcurrentReads");
+ if (rawReaders != null)
+ {
+ conf.concurrent_reads = Integer.parseInt(rawReaders);
+ }
+
+ String rawWriters =
xmlUtils.getNodeValue("/Storage/ConcurrentWrites");
+ if (rawWriters != null)
+ {
+ conf.concurrent_writes = Integer.parseInt(rawWriters);
+ }
+
+ String rawFlushData =
xmlUtils.getNodeValue("/Storage/FlushDataBufferSizeInMB");
+ if (rawFlushData != null)
+ {
+ conf.flush_data_buffer_size_in_mb =
Double.parseDouble(rawFlushData);
+ }
+
+ String rawFlushIndex =
xmlUtils.getNodeValue("/Storage/FlushIndexBufferSizeInMB");
+ if (rawFlushIndex != null)
+ {
+ conf.flush_index_buffer_size_in_mb =
Double.parseDouble(rawFlushIndex);
+ }
+
+ String rawSlicedBuffer =
xmlUtils.getNodeValue("/Storage/SlicedBufferSizeInKB");
+ if (rawSlicedBuffer != null)
+ {
+ conf.sliced_buffer_size_in_kb =
Integer.parseInt(rawSlicedBuffer);
+ }
+
+ String bmtThresh =
xmlUtils.getNodeValue("/Storage/BinaryMemtableThroughputInMB");
+ if (bmtThresh != null)
+ {
+ conf.binary_memtable_throughput_in_mb =
Integer.parseInt(bmtThresh);
+ }
+
+ /* TCP port on which the storage system listens */
+ String port = xmlUtils.getNodeValue("/Storage/StoragePort");
+ if ( port != null )
+ conf.storage_port = Integer.parseInt(port);
+
+ /* Local IP or hostname to bind services to */
+ conf.listen_address =
xmlUtils.getNodeValue("/Storage/ListenAddress");
+
+ conf.rpc_address = xmlUtils.getNodeValue("/Storage/RPCAddress");
+
+ port = xmlUtils.getNodeValue("/Storage/RPCPort");
+ if (port != null)
+ conf.rpc_port = Integer.parseInt(port);
+
+ String framedRaw =
xmlUtils.getNodeValue("/Storage/ThriftFramedTransport");
+ if (framedRaw != null)
+ {
+ conf.thrift_framed_transport = Boolean.valueOf(framedRaw);
+ }
+
+ conf.endpoint_snitch =
xmlUtils.getNodeValue("/Storage/EndpointSnitch");
+
+ String sbc =
xmlUtils.getNodeValue("/Storage/SnapshotBeforeCompaction");
+ if (sbc != null)
+ {
+ conf.snapshot_before_compaction = Boolean.valueOf(sbc);
+ }
+
+ String autoBootstr =
xmlUtils.getNodeValue("/Storage/AutoBootstrap");
+ if (autoBootstr != null)
+ {
+ conf.auto_bootstrap = Boolean.valueOf(autoBootstr);
+ }
+
+ String lifetime =
xmlUtils.getNodeValue("/Storage/MemtableFlushAfterMinutes");
+ if (lifetime != null)
+ conf.memtable_flush_after_mins = Integer.parseInt(lifetime);
+
+ String memtableSize =
xmlUtils.getNodeValue("/Storage/MemtableThroughputInMB");
+ if ( memtableSize != null )
+ conf.memtable_throughput_in_mb =
Integer.parseInt(memtableSize);
+
+ String memtableObjectCount =
xmlUtils.getNodeValue("/Storage/MemtableOperationsInMillions");
+ if ( memtableObjectCount != null )
+ conf.memtable_operations_in_millions =
Double.parseDouble(memtableObjectCount);
+
+ String columnIndexSize =
xmlUtils.getNodeValue("/Storage/ColumnIndexSizeInKB");
+ if(columnIndexSize != null)
+ {
+ conf.column_index_size_in_kb =
Integer.parseInt(columnIndexSize);
+ }
+
+ String rowWarning =
xmlUtils.getNodeValue("/Storage/RowWarningThresholdInMB");
+ if (rowWarning != null)
+ {
+ conf.row_warning_threshold_in_mb = Long.parseLong(rowWarning);
+ }
+
+ conf.data_file_directories =
xmlUtils.getNodeValues("/Storage/DataFileDirectories/DataFileDirectory");
+
+ conf.commitlog_directory =
xmlUtils.getNodeValue("/Storage/CommitLogDirectory");
+
+ String value =
xmlUtils.getNodeValue("/Storage/CommitLogRotationThresholdInMB");
+ if ( value != null)
+ conf.commitlog_rotation_threshold_in_mb =
Integer.parseInt(value);
+
+ conf.seeds = xmlUtils.getNodeValues("/Storage/Seeds/Seed");
+
+ conf.keyspaces = readTablesFromXml(xmlUtils);
+
+ }
+ catch (ParserConfigurationException e) {
+ System.out.println("Parser error during previous config load.");
+ throw new ConfigurationException("Parser error during previous
config load.");
+ } catch (SAXException e) {
+ System.out.println("SAX error during previous config load.");
+ throw new ConfigurationException("SAX error during previous config
load.");
+ } catch (IOException e) {
+ System.out.println("File I/O error during previous config load.");
+ throw new ConfigurationException("File I/O error during previous
config load.");
+ } catch (XPathExpressionException e) {
+ System.out.println("XPath error during previous config load.");
+ throw new ConfigurationException("XPath error during previous
config load.");
+ }
+ }
+
+ private static void dumpConfig(String outfile) throws IOException
+ {
+ DumperOptions options = new DumperOptions();
+ /* Use a block YAML arrangement */
+ options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+ SkipNullRepresenter representer = new SkipNullRepresenter();
+ /* Use Tag.MAP to avoid the class name being included as global tag */
+ representer.addClassTag(Config.class, Tag.MAP);
+ representer.addClassTag(ColumnFamily.class, Tag.MAP);
+ Dumper dumper = new Dumper(representer, options);
+ Yaml yaml = new Yaml(dumper);
+ String output = yaml.dump(conf);
+
+ /* Write to output file */
+ BufferedWriter out = new BufferedWriter(new FileWriter(outfile));
+ out.write("# Cassandra YAML generated from previous config\n");
+ out.write("# Configuration wiki:
http://wiki.apache.org/cassandra/StorageConfiguration\n";);
+ out.write(output);
+ out.close();
+ }
+
+ public static void main (String[] args)
+ {
+ try
+ {
+ String configname = null;
+ ClassLoader loader = Converter.class.getClassLoader();
+ URL scpurl = loader.getResource(PREVIOUS_CONF_FILE);
+ if (scpurl == null)
+ scpurl = loader.getResource("storage-conf.xml");
+
+ if (scpurl != null)
+ configname = scpurl.getFile();
+ else
+ throw new ConfigurationException("Error finding previuos
configuration file.");
+
+ System.out.println("Found previous configuration: " + configname);
+
+ loadPreviousConfig(configname);
+
+ configname = configname.replace("cassandra.xml", "cassandra.yaml");
+
+ System.out.println("Creating new configuration: " + configname);
+
+ dumpConfig(configname);
+ }
+ catch (IOException e)
+ {
+ System.out.println("Error creating new configuration file.");
+ System.out.println(e.getMessage());
+ e.printStackTrace();
+ }
+ catch (ConfigurationException e)
+ {
+ System.out.println("There was an error during config conversion.");
+ System.out.println(e.getMessage());
+ e.printStackTrace();
+ }
+
+ }
+
+ /* used to prevent null values from being included in generated YAML */
+ private static class SkipNullRepresenter extends Representer {
+ protected NodeTuple representJavaBeanProperty(Object javaBean,
Property property,
+ Object propertyValue, Tag customTag) {
+ if (propertyValue == null) {
+ return null;
+ } else {
+ return super.representJavaBeanProperty(javaBean, property,
propertyValue, customTag);
+ }
+ }
+
+ }
+
+}
Added: cassandra/trunk/test/conf/cassandra.yaml
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/conf/cassandra.yaml?rev=936511&view=auto
==============================================================================
--- cassandra/trunk/test/conf/cassandra.yaml (added)
+++ cassandra/trunk/test/conf/cassandra.yaml Wed Apr 21 21:05:34 2010
@@ -0,0 +1,94 @@
+cluster_name: Test Cluster
+flush_data_buffer_size_in_mb: 1
+flush_index_buffer_size_in_mb: 8
+commitlog_sync: batch
+commitlog_sync_batch_window_in_ms: 1.0
+partitioner: org.apache.cassandra.dht.CollatingOrderPreservingPartitioner
+rpc_timeout_in_ms: 5000
+listen_address: 127.0.0.1
+storage_port: 7010
+rpc_port: 9170
+column_index_size_in_kb: 4
+commitlog_directory: build/test/cassandra/commitlog
+commitlog_rotation_threshold_in_mb: 128
+data_file_directories:
+ - build/test/cassandra/data
+disk_access_mode: mmap
+memtable_throughput_in_mb: 1
+memtable_operations_in_millions: 0.00002
+seeds:
+ - 127.0.0.2
+endpoint_snitch: org.apache.cassandra.locator.SimpleSnitch
+keyspaces:
+ - name: Keyspace1
+ replica_placement_strategy:
org.apache.cassandra.locator.RackUnawareStrategy
+ replication_factor: 1
+ column_families:
+ - name: Standard1
+ rows_cached: 10
+ keys_cached: 0
+
+ - name: Standard2
+
+ - name: StandardLong1
+ compare_with: LongType
+
+ - name: StandardLong2
+ compare_with: LongType
+
+ - name: Super1
+ column_type: Super
+ compare_subcolumns_with: LongType
+ rows_cached: 1000
+ keys_cached: 0
+
+ - name: Super2
+ column_type: Super
+ compare_subcolumns_with: LongType
+
+ - name: Super3
+ column_type: Super
+ compare_subcolumns_with: LongType
+
+ - name: Super4
+ column_type: Super
+ compare_subcolumns_with: UTF8Type
+
+ - name: Keyspace2
+ replica_placement_strategy:
org.apache.cassandra.locator.RackUnawareStrategy
+ replication_factor: 1
+ column_families:
+
+ - name: Standard1
+
+ - name: Standard3
+
+ - name: Super3
+ column_type: Super
+
+ - name: Super4
+ column_type: Super
+ compare_subcolumns_with: TimeUUIDType
+
+ - name: Keyspace3
+ replica_placement_strategy:
org.apache.cassandra.locator.RackUnawareStrategy
+ replication_factor: 5
+ column_families:
+
+ - name: Standard1
+
+ - name: Keyspace4
+ replica_placement_strategy:
org.apache.cassandra.locator.RackUnawareStrategy
+ replication_factor: 3
+ column_families:
+
+ - name: Standard1
+
+ - name: Standard3
+
+ - name: Super3
+ column_type: Super
+
+ - name: Super4
+ column_type: Super
+ compare_subcolumns_with: TimeUUIDType
