Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 4734ce7d9 -> 0bc45aa46 refs/heads/trunk 5ea2c6b8e -> 289f6b157
Fix the computation of cdc_total_space_in_mb for exabyte filesystems patch by Benjamin Lerer; reviewed by Alex Petrov for CASSANDRA-13808 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bc45aa4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bc45aa4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bc45aa4 Branch: refs/heads/cassandra-3.11 Commit: 0bc45aa46766625698e6e4c47085dfe94766c7df Parents: 4734ce7 Author: Benjamin Lerer <[email protected]> Authored: Fri Sep 29 09:30:02 2017 +0200 Committer: Benjamin Lerer <[email protected]> Committed: Fri Sep 29 09:30:02 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bc45aa4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 06d62b8..80a8295 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 3.11.1 ======= + * Fix the computation of cdc_total_space_in_mb for exabyte filesystems (CASSANDRA-13808) * Handle limit correctly on tables with strict liveness (CASSANDRA-13883) * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is a single leaf and overflow collisions (CASSANDRA-13869) * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bc45aa4/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 97c868e..4ce2728 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -484,7 +484,7 @@ public class DatabaseDescriptor try { // use 1/8th of available space. See discussion on #10013 and #10199 on the CL, taking half that for CDC - minSize = Ints.checkedCast((guessFileStore(conf.cdc_raw_directory).getTotalSpace() / 1048576) / 8); + minSize = Ints.saturatedCast((guessFileStore(conf.cdc_raw_directory).getTotalSpace() / 1048576) / 8); } catch (IOException e) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
