This is an automated email from the ASF dual-hosted git repository. marcuse pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bc348c99852b210d7ca6d6a09a4d24b274ea1210 Merge: b085591 b9d8700 Author: Marcus Eriksson <[email protected]> AuthorDate: Mon Sep 20 14:35:46 2021 +0200 Merge branch 'cassandra-4.0' into trunk CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 3 +- .../cassandra/io/sstable/format/SSTableReader.java | 14 ++++++- .../unit/org/apache/cassandra/db/SnapshotTest.java | 46 ++++++++++++++++++++++ 4 files changed, 61 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 3c470f7,c72dd0e..65350c1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,12 +1,38 @@@ -4.0.2 - * Avoid trying to acquire 0 permits from the rate limiter when taking snapshot (CASSANDRA-16872) - * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153) +4.1 + * Upgrade Caffeine to 2.9.2 (CASSANDRA-15153) + * Allow DELETE and TRUNCATE to work on Virtual Tables if the implementation allows it (CASSANDRA-16806) * Include SASI components to snapshots (CASSANDRA-15134) * Fix missed wait latencies in the output of `nodetool tpstats -F` (CASSANDRA-16938) + * Reduce native transport max frame size to 16MB (CASSANDRA-16886) + * Add support for filtering using IN restrictions (CASSANDRA-14344) + * Provide a nodetool command to invalidate auth caches (CASSANDRA-16404) + * Catch read repair timeout exceptions and add metric (CASSANDRA-16880) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Add client warnings and abort to tombstone and coordinator reads which go past a low/high watermark (CASSANDRA-16850) + * Add TTL support to nodetool snapshots (CASSANDRA-16789) + * Allow CommitLogSegmentReader to optionally skip sync marker CRC checks (CASSANDRA-16842) + * allow blocking IPs from updating metrics about traffic (CASSANDRA-16859) + * Request-Based Native Transport Rate-Limiting (CASSANDRA-16663) + * Implement nodetool getauditlog command (CASSANDRA-16725) + * Clean up repair code (CASSANDRA-13720) + * Background schedule to clean up orphaned hints files (CASSANDRA-16815) + * Modify SecondaryIndexManager#indexPartition() to retrieve only columns for which indexes are actually being built (CASSANDRA-16776) + * Batch the token metadata update to improve the speed (CASSANDRA-15291) + * Reduce the log level on "expected" repair exceptions (CASSANDRA-16775) + * Make JMXTimer expose attributes using consistent time unit (CASSANDRA-16760) + * Remove check on gossip status from DynamicEndpointSnitch::updateScores (CASSANDRA-11671) + * Fix AbstractReadQuery::toCQLString not returning valid CQL (CASSANDRA-16510) + * Log when compacting many tombstones (CASSANDRA-16780) + * Display bytes per level in tablestats for LCS tables (CASSANDRA-16799) + * Add isolated flush timer to CommitLogMetrics and ensure writes correspond to single WaitingOnCommit data points (CASSANDRA-16701) + * Add a system property to set hostId if not yet initialized (CASSANDRA-14582) + * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651) +Merged from 4.0: ++ * Avoid trying to acquire 0 permits from the rate limiter when taking snapshot (CASSANDRA-16872) * Remove all the state pollution between tests in SSTableReaderTest (CASSANDRA-16888) * Delay auth setup until after gossip has settled to avoid unavailables on startup (CASSANDRA-16783) - * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898) * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData includes data twice (CASSANDRA-16900) + * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898) * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) Merged from 3.11: * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 2cfb3b8,4855d7c..11fb56b --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -1873,8 -1846,8 +1873,7 @@@ public class ColumnFamilyStore implemen for (SSTableReader ssTable : currentView.sstables) { File snapshotDirectory = Directories.getSnapshotDirectory(ssTable.descriptor, snapshotName); - rateLimiter.acquire(SSTableReader.componentsFor(ssTable.descriptor).size()); - ssTable.createLinks(snapshotDirectory.getPath()); // hard links + ssTable.createLinks(snapshotDirectory.getPath(), rateLimiter); // hard links - filesJSONArr.add(ssTable.descriptor.relativeFilenameFor(Component.DATA)); if (logger.isTraceEnabled()) logger.trace("Snapshot for {} keyspace data file {} created in {}", keyspace, ssTable.getFilename(), snapshotDirectory); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
