Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7e27b55f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e27b55f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7e27b55f Branch: refs/heads/trunk Commit: 7e27b55fdf86f15eee4474d1a554656523f75f7b Parents: c7d604b b3a225e Author: Jonathan Ellis <[email protected]> Authored: Wed Apr 23 07:25:54 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Apr 23 07:25:54 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++-- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e27b55f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 633d2cb,211e55c..ec92978 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ +3.0 + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7208) + + 2.1.0-beta2 + * Increase default CL space to 8GB (CASSANDRA-7031) * Add range tombstones to read repair digests (CASSANDRA-6863) * Fix BTree.clear for large updates (CASSANDRA-6943) * Fail write instead of logging a warning when unable to append to CL http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e27b55f/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java index cf11b77,ef2c4fc..c65d6d8 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@@ -187,36 -187,25 +187,36 @@@ public class DatabaseDescripto } if (conf.commitlog_total_space_in_mb == null) - conf.commitlog_total_space_in_mb = hasLargeAddressSpace() ? 1024 : 32; + conf.commitlog_total_space_in_mb = hasLargeAddressSpace() ? 8192 : 32; - /* evaluate the DiskAccessMode Config directive, which also affects indexAccessMode selection */ - if (conf.disk_access_mode == Config.DiskAccessMode.auto) + if (FBUtilities.isUnix()) { - conf.disk_access_mode = hasLargeAddressSpace() ? Config.DiskAccessMode.mmap : Config.DiskAccessMode.standard; - indexAccessMode = conf.disk_access_mode; - logger.info("DiskAccessMode 'auto' determined to be {}, indexAccessMode is {}", conf.disk_access_mode, indexAccessMode); - } - else if (conf.disk_access_mode == Config.DiskAccessMode.mmap_index_only) - { - conf.disk_access_mode = Config.DiskAccessMode.standard; - indexAccessMode = Config.DiskAccessMode.mmap; - logger.info("DiskAccessMode is {}, indexAccessMode is {}", conf.disk_access_mode, indexAccessMode); + /* evaluate the DiskAccessMode Config directive, which also affects indexAccessMode selection */ + if (conf.disk_access_mode == Config.DiskAccessMode.auto) + { + conf.disk_access_mode = hasLargeAddressSpace() ? Config.DiskAccessMode.mmap : Config.DiskAccessMode.standard; + indexAccessMode = conf.disk_access_mode; + logger.info("DiskAccessMode 'auto' determined to be {}, indexAccessMode is {}", conf.disk_access_mode, indexAccessMode); + } + else if (conf.disk_access_mode == Config.DiskAccessMode.mmap_index_only) + { + conf.disk_access_mode = Config.DiskAccessMode.standard; + indexAccessMode = Config.DiskAccessMode.mmap; + logger.info("DiskAccessMode is {}, indexAccessMode is {}", conf.disk_access_mode, indexAccessMode); + } + else + { + indexAccessMode = conf.disk_access_mode; + logger.info("DiskAccessMode is {}, indexAccessMode is {}", conf.disk_access_mode, indexAccessMode); + } } + // Always force standard mode access on Windows - CASSANDRA-6993. Windows won't allow deletion of hard-links to files that + // are memory-mapped which causes trouble with snapshots. else { + conf.disk_access_mode = Config.DiskAccessMode.standard; indexAccessMode = conf.disk_access_mode; - logger.info("DiskAccessMode is {}, indexAccessMode is {}", conf.disk_access_mode, indexAccessMode); + logger.info("Non-unix environment detected. DiskAccessMode set to {}, indexAccessMode {}", conf.disk_access_mode, indexAccessMode); } /* Authentication and authorization backend, implementing IAuthenticator and IAuthorizer */
