Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/abd9be1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abd9be1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/abd9be1e Branch: refs/heads/trunk Commit: abd9be1e4639c975b1fdf5d1ce26f6095236bb74 Parents: a798257 d73f45b Author: Marcus Eriksson <[email protected]> Authored: Mon Feb 19 07:53:43 2018 -0800 Committer: Marcus Eriksson <[email protected]> Committed: Mon Feb 19 07:53:43 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 7 ++- .../apache/cassandra/db/lifecycle/Helpers.java | 19 ++----- .../apache/cassandra/db/lifecycle/LogFile.java | 38 +++++++++++-- .../cassandra/db/lifecycle/LogRecord.java | 11 ++-- .../cassandra/db/lifecycle/LogTransaction.java | 33 ++++++------ .../apache/cassandra/db/lifecycle/Tracker.java | 2 +- .../cassandra/db/lifecycle/HelpersTest.java | 56 +++++--------------- 7 files changed, 79 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abd9be1e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f8af8c4,8cf665e..33d5da3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,17 +1,43 @@@ -3.0.17 +3.11.3 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) - Merged from 2.2 ++Merged from 3.0: + * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763) -Merged from 2.1: - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183) + Merged from 2.2: * Backport circleci yaml (CASSANDRA-14240) - Merged from 2.1 ++Merged from 2.1: + * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183) -3.0.16 - * Fix unit test failures in ViewComplexTest (CASSANDRA-14219) - * Add MinGW uname check to start scripts (CASSANDRA-12940) - * Protect against overflow of local expiration time (CASSANDRA-14092) ++ +3.11.2 + * Fix ReadCommandTest (CASSANDRA-14234) + * Remove trailing period from latency reports at keyspace level (CASSANDRA-14233) + * Backport CASSANDRA-13080: Use new token allocation for non bootstrap case as well (CASSANDRA-14212) + * Remove dependencies on JVM internal classes from JMXServerUtils (CASSANDRA-14173) + * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` (CASSANDRA-14205) + * Add Unittest for schema migration fix (CASSANDRA-14140) + * Print correct snitch info from nodetool describecluster (CASSANDRA-13528) + * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630) + * Enable CDC unittest (CASSANDRA-14141) + * Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139) + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143) + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083) + * Avoid exposing compaction strategy index externally (CASSANDRA-14082) + * Prevent continuous schema exchange between 3.0 and 3.11 nodes (CASSANDRA-14109) + * Fix imbalanced disks when replacing node with same address with JBOD (CASSANDRA-14084) + * Reload compaction strategies when disk boundaries are invalidated (CASSANDRA-13948) + * Remove OpenJDK log warning (CASSANDRA-13916) + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079) + * Cache disk boundaries (CASSANDRA-13215) + * Add asm jar to build.xml for maven builds (CASSANDRA-11193) + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897) + * Update jackson JSON jars (CASSANDRA-13949) + * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) + * Correctly count range tombstones in traces and tombstone thresholds (CASSANDRA-8527) +Merged from 3.0: + * Add MinGW uname check to start scripts (CASSANDRA-12840) * Use the correct digest file and reload sstable metadata in nodetool verify (CASSANDRA-14217) * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933) - * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630) * Set encoding for javadoc generation (CASSANDRA-14154) * Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104) * Improve commit log chain marker updating (CASSANDRA-14108) http://git-wip-us.apache.org/repos/asf/cassandra/blob/abd9be1e/src/java/org/apache/cassandra/db/lifecycle/LogFile.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/lifecycle/LogFile.java index 123dd8a,8425a6d..af6f435 --- a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java @@@ -316,6 -318,20 +321,21 @@@ final class LogFile implements AutoClos return LogRecord.make(type, table); } + /** + * this version of makeRecord takes an existing LogRecord and converts it to a + * record with the given type. This avoids listing the directory and if the + * LogRecord already exists, we have all components for the sstable + */ + private LogRecord makeRecord(Type type, SSTable table, LogRecord record) + { + assert type == Type.ADD || type == Type.REMOVE; + - File folder = table.descriptor.directory; - replicas.maybeCreateReplica(folder, getFileName(folder), records); ++ File directory = table.descriptor.directory; ++ String fileName = StringUtils.join(directory, File.separator, getFileName()); ++ replicas.maybeCreateReplica(directory, fileName, records); + return record.asType(type); + } + private boolean addRecord(LogRecord record) { if (records.contains(record)) http://git-wip-us.apache.org/repos/asf/cassandra/blob/abd9be1e/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abd9be1e/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abd9be1e/src/java/org/apache/cassandra/db/lifecycle/Tracker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abd9be1e/test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
