Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9dbc10d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9dbc10d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f9dbc10d Branch: refs/heads/cassandra-2.1 Commit: f9dbc10db3046a783c601833ceb8f2ad0115e95e Parents: 1366c0a fad5ad5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jul 15 16:20:53 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jul 15 16:20:53 2014 -0500 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9dbc10d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 9a54581,d89967d..eeea33a --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@@ -290,22 -288,9 +290,13 @@@ public class DatabaseDescripto logger.info("Global memtable off-heap threshold is disabled, HeapAllocator will be used instead"); else logger.info("Global memtable off-heap threshold is enabled at {}MB", conf.memtable_offheap_space_in_mb); - if (conf.memtable_cleanup_threshold < 0.01f) - throw new ConfigurationException("memtable_cleanup_threshold must be >= 0.01"); - if (conf.memtable_cleanup_threshold > 0.99f) - throw new ConfigurationException("memtable_cleanup_threshold must be <= 0.99"); - if (conf.memtable_cleanup_threshold < 0.1f) - logger.warn("memtable_cleanup_threshold is set very low, which may cause performance degradation"); - - if (conf.memtable_flush_writers < 1) - throw new ConfigurationException("memtable_flush_writers must be at least 1"); - /* Local IP or hostname to bind services to */ - if (conf.listen_address != null) + /* Local IP, hostname or interface to bind services to */ + if (conf.listen_address != null && conf.listen_interface != null) + { + throw new ConfigurationException("Set listen_address OR listen_interface, not both"); + } + else if (conf.listen_address != null) { if (conf.listen_address.equals("0.0.0.0")) throw new ConfigurationException("listen_address cannot be 0.0.0.0!");
