natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sanity check configuration before starting. patch by jbellis; reviewed by Eric Evans for #6 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@763387 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-04-08 20:49:37 +00:00
parent f0f5ec427c
commit db2fdd8740
2 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -22,6 +22,8 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.io.*;
import org.apache.log4j.Logger;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.db.TypeInfo;
@ -41,6 +43,8 @@ import org.apache.cassandra.io.*;
public class DatabaseDescriptor
{
private static Logger logger_ = Logger.getLogger(DatabaseDescriptor.class);
public static final String random_ = "RANDOM";
public static final String ophf_ = "OPHF";
private static int storagePort_ = 7000;
@ -225,15 +229,11 @@ public class DatabaseDescriptor
/* metadata directory */
metadataDirectory_ = xmlUtils.getNodeValue("/Storage/MetadataDirectory");
if ( metadataDirectory_ != null )
FileUtils.createDirectory(metadataDirectory_);
else
if (metadataDirectory_ == null)
{
if ( os.equals("Linux") )
{
metadataDirectory_ = "/var/storage/system";
}
throw new ConfigurationException("MetadataDirectory must be specified");
}
FileUtils.createDirectory(metadataDirectory_);
/* snapshot directory */
snapshotDirectory_ = xmlUtils.getNodeValue("/Storage/SnapshotDirectory");
@ -246,42 +246,28 @@ public class DatabaseDescriptor
/* data file directory */
dataFileDirectories_ = xmlUtils.getNodeValues("/Storage/DataFileDirectories/DataFileDirectory");
if ( dataFileDirectories_.length > 0 )
if (dataFileDirectories_.length == 0)
{
for ( String dataFileDirectory : dataFileDirectories_ )
FileUtils.createDirectory(dataFileDirectory);
}
else
{
if ( os.equals("Linux") )
{
dataFileDirectories_ = new String[]{"/var/storage/data"};
}
throw new ConfigurationException("At least one DataFileDirectory must be specified");
}
for ( String dataFileDirectory : dataFileDirectories_ )
FileUtils.createDirectory(dataFileDirectory);
/* bootstrap file directory */
bootstrapFileDirectory_ = xmlUtils.getNodeValue("/Storage/BootstrapFileDirectory");
if ( bootstrapFileDirectory_ != null )
FileUtils.createDirectory(bootstrapFileDirectory_);
else
if (bootstrapFileDirectory_ == null)
{
if ( os.equals("Linux") )
{
bootstrapFileDirectory_ = "/var/storage/bootstrap";
}
throw new ConfigurationException("MetadataDirectory must be specified");
}
FileUtils.createDirectory(bootstrapFileDirectory_);
/* commit log directory */
logFileDirectory_ = xmlUtils.getNodeValue("/Storage/CommitLogDirectory");
if ( logFileDirectory_ != null )
FileUtils.createDirectory(logFileDirectory_);
else
if (logFileDirectory_ == null)
{
if ( os.equals("Linux") )
{
logFileDirectory_ = "/var/storage/commitlog";
}
throw new ConfigurationException("MetadataDirectory must be specified");
}
FileUtils.createDirectory(logFileDirectory_);
/* threshold after which commit log should be rotated. */
String value = xmlUtils.getNodeValue("/Storage/CommitLogRotationThresholdInMB");
@ -309,6 +295,10 @@ public class DatabaseDescriptor
/* parsing out the table name */
String tName = XMLUtils.getAttributeValue(table, "Name");
if (tName == null)
{
throw new ConfigurationException("Table name attribute is required");
}
tables_.add(tName);
tableToCFMetaDataMap_.put(tName, new HashMap<String, CFMetaData>());
@ -327,18 +317,30 @@ public class DatabaseDescriptor
{
Node columnFamily = columnFamilies.item(j);
String cName = XMLUtils.getAttributeValue(columnFamily, "Name");
if (cName == null)
{
throw new ConfigurationException("ColumnFamily name attribute is required");
}
String xqlCF = xqlTable + "ColumnFamily[@Name='" + cName + "']/";
/* squirrel away the application column families */
applicationColumnFamilies_.add(cName);
// Parse out the column type
String columnType = xmlUtils.getAttributeValue(columnFamily, "ColumnType");
columnType = ColumnFamily.getColumnType(columnType);
String rawColumnType = XMLUtils.getAttributeValue(columnFamily, "ColumnType");
String columnType = ColumnFamily.getColumnType(rawColumnType);
if (columnType == null)
{
throw new ConfigurationException("Column " + cName + " has invalid type " + rawColumnType);
}
// Parse out the column family sorting property for columns
String columnIndexProperty = XMLUtils.getAttributeValue(columnFamily, "ColumnSort");
String columnIndexType = ColumnFamily.getColumnSortProperty(columnIndexProperty);
String rawColumnIndexType = XMLUtils.getAttributeValue(columnFamily, "ColumnSort");
String columnIndexType = ColumnFamily.getColumnSortProperty(rawColumnIndexType);
if (columnIndexType == null)
{
throw new ConfigurationException("invalid column sort value " + rawColumnIndexType);
}
// Parse out user-specified logical names for the various dimensions
// of a the column family from the config.
@ -398,7 +400,13 @@ public class DatabaseDescriptor
seeds_.add( seeds[i] );
}
}
catch (Exception e) {
catch (ConfigurationException e)
{
logger_.error("Fatal error: " + e.getMessage());
System.exit(1);
}
catch (Exception e)
{
throw new RuntimeException(e);
}
@ -776,4 +784,12 @@ public class DatabaseDescriptor
{
return tableToCFMetaDataMap_;
}
private static class ConfigurationException extends Exception
{
public ConfigurationException(String message)
{
super(message);
}
}
}

6
src/org/apache/cassandra/db/ColumnFamily.java
View File

@ -42,10 +42,9 @@ import org.apache.cassandra.utils.FBUtilities;
*/
public final class ColumnFamily
{
/* The column serializer for this Column Family. Create based on config. */
private static ICompactSerializer2<ColumnFamily> serializer_;
public static final short utfPrefix_ = 2;
public static final String defaultColumnSortProperty_ = "Time";
/* The column serializer for this Column Family. Create based on config. */
private static Logger logger_ = Logger.getLogger( ColumnFamily.class );
private static Map<String, String> columnTypes_ = new HashMap<String, String>();
@ -87,8 +86,7 @@ public final class ColumnFamily
{
if ( columnIndexProperty == null )
return indexTypes_.get("Time");
String columnSortType = indexTypes_.get(columnIndexProperty);
return (columnSortType == null) ? ColumnFamily.defaultColumnSortProperty_ : columnSortType;
return indexTypes_.get(columnIndexProperty);
}
private transient AbstractColumnFactory columnFactory_;