You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2020/11/10 11:57:30 UTC
[cassandra] branch trunk updated (32874dd -> 23a9301)
This is an automated email from the ASF dual-hosted git repository.
blerer pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 32874dd Ensure that CacheMetrics.requests is picked up by the metric reporter
add 548ef43 Fix a race condition on ColumnFamilyStore and TableMetrics
add 3106607 Merge branch cassandra-3.0 into cassandra-3.11
new 23a9301 Merge branch cassandra-3.11 into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ColumnFamilyStore.java | 14 ++-
.../org/apache/cassandra/db/lifecycle/Tracker.java | 13 ++-
.../cassandra/db/ColumnFamilyMetricTest.java | 102 ++++++++++++++++++++-
4 files changed, 121 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch cassandra-3.11 into trunk
Posted by bl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 23a9301f85e95c2e784e637f0b8b482f6052a179
Merge: 32874dd 3106607
Author: Benjamin Lerer <b....@gmail.com>
AuthorDate: Tue Nov 10 12:51:44 2020 +0100
Merge branch cassandra-3.11 into trunk
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ColumnFamilyStore.java | 14 ++-
.../org/apache/cassandra/db/lifecycle/Tracker.java | 13 ++-
.../cassandra/db/ColumnFamilyMetricTest.java | 102 ++++++++++++++++++++-
4 files changed, 121 insertions(+), 9 deletions(-)
diff --cc CHANGES.txt
index 384ab79,1083096..5e3f8c6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,12 +1,45 @@@
-3.11.10
+4.0-beta4
+ * Ensure that CacheMetrics.requests is picked up by the metric reporter (CASSANDRA-16228)
+ * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
+ * Produce consistent tombstone for reads to avoid digest mistmatch (CASSANDRA-15369)
+ * Fix SSTableloader issue when restoring a table named backups (CASSANDRA-16235)
+ * Invalid serialized size for responses caused by increasing message time by 1ms which caused extra bytes in size calculation (CASSANDRA-16103)
+ * Throw BufferOverflowException from DataOutputBuffer for better visibility (CASSANDRA-16214)
+ * TLS connections to the storage port on a node without server encryption configured causes java.io.IOException accessing missing keystore (CASSANDRA-16144)
+Merged from 3.11:
Merged from 3.0:
+ * Fix a race condition on ColumnFamilyStore and TableMetrics (CASSANDRA-16228)
* Remove the SEPExecutor blocking behavior (CASSANDRA-16186)
- * Fix invalid cell value skipping when reading from disk (CASSANDRA-16223)
+ * Wait for schema agreement when bootstrapping (CASSANDRA-15158)
* Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
-3.11.9
- * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
+4.0-beta3
+ * Segregate Network and Chunk Cache BufferPools and Recirculate Partially Freed Chunks (CASSANDRA-15229)
+ * Fail truncation requests when they fail on a replica (CASSANDRA-16208)
+ * Move compact storage validation earlier in startup process (CASSANDRA-16063)
+ * Fix ByteBufferAccessor cast exceptions are thrown when trying to query a virtual table (CASSANDRA-16155)
+ * Consolidate node liveness check for forced repair (CASSANDRA-16113)
+ * Use unsigned short in ValueAccessor.sliceWithShortLength (CASSANDRA-16147)
+ * Abort repairs when getting a truncation request (CASSANDRA-15854)
+ * Remove bad assert when getting active compactions for an sstable (CASSANDRA-15457)
+ * Avoid failing compactions with very large partitions (CASSANDRA-15164)
+ * Prevent NPE in StreamMessage in type lookup (CASSANDRA-16131)
+ * Avoid invalid state transition exception during incremental repair (CASSANDRA-16067)
+ * Allow zero padding in timestamp serialization (CASSANDRA-16105)
+ * Add byte array backed cells (CASSANDRA-15393)
+ * Correctly handle pending ranges with adjacent range movements (CASSANDRA-14801)
+ * Avoid adding locahost when streaming trivial ranges (CASSANDRA-16099)
+ * Add nodetool getfullquerylog (CASSANDRA-15988)
+ * Fix yaml format and alignment in tpstats (CASSANDRA-11402)
+ * Avoid trying to keep track of RTs for endpoints we won't write to during read repair (CASSANDRA-16084)
+ * When compaction gets interrupted, the exception should include the compactionId (CASSANDRA-15954)
+ * Make Table/Keyspace Metric Names Consistent With Each Other (CASSANDRA-15909)
+ * Mutating sstable component may race with entire-sstable-streaming(ZCS) causing checksum validation failure (CASSANDRA-15861)
+ * NPE thrown while updating speculative execution time if keyspace is removed during task execution (CASSANDRA-15949)
+ * Show the progress of data streaming and index build (CASSANDRA-15406)
+ * Add flag to disable chunk cache and disable by default (CASSANDRA-16036)
+ * Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix (CASSANDRA-16150)
+Merged from 3.11:
* Fix ColumnFilter to avoid querying cells of unselected complex columns (CASSANDRA-15977)
* Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
* Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index d0d6ed1,abdc3f8..f712d1b
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -90,7 -83,6 +90,8 @@@ import org.apache.cassandra.utils.memor
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
++
import static org.apache.cassandra.utils.Throwables.maybeFail;
import static org.apache.cassandra.utils.Throwables.merge;
@@@ -385,16 -412,14 +386,15 @@@ public class ColumnFamilyStore implemen
this.keyspace = keyspace;
this.metadata = metadata;
+ this.directories = directories;
name = columnFamilyName;
- minCompactionThreshold = new DefaultValue<>(metadata.params.compaction.minCompactionThreshold());
- maxCompactionThreshold = new DefaultValue<>(metadata.params.compaction.maxCompactionThreshold());
- crcCheckChance = new DefaultValue<>(metadata.params.crcCheckChance);
- indexManager = new SecondaryIndexManager(this);
- viewManager = keyspace.viewManager.forTable(metadata);
+ minCompactionThreshold = new DefaultValue<>(metadata.get().params.compaction.minCompactionThreshold());
+ maxCompactionThreshold = new DefaultValue<>(metadata.get().params.compaction.maxCompactionThreshold());
+ crcCheckChance = new DefaultValue<>(metadata.get().params.crcCheckChance);
+ viewManager = keyspace.viewManager.forTable(metadata.id);
- metric = new TableMetrics(this);
fileIndexGenerator.set(generation);
- sampleLatencyNanos = TimeUnit.MILLISECONDS.toNanos(DatabaseDescriptor.getReadRpcTimeout() / 2);
+ sampleReadLatencyNanos = DatabaseDescriptor.getReadRpcTimeout(NANOSECONDS) / 2;
+ additionalWriteLatencyNanos = DatabaseDescriptor.getWriteRpcTimeout(NANOSECONDS) / 2;
logger.info("Initializing {}.{}", keyspace.getName(), name);
@@@ -408,10 -434,20 +409,10 @@@
if (data.loadsstables)
{
Directories.SSTableLister sstableFiles = directories.sstableLister(Directories.OnTxnErr.IGNORE).skipTemporary(true);
- Collection<SSTableReader> sstables = SSTableReader.openAll(sstableFiles.list().entrySet(), metadata);
- data.addInitialSSTables(sstables);
+ sstables = SSTableReader.openAll(sstableFiles.list().entrySet(), metadata);
+ data.addInitialSSTablesWithoutUpdatingSize(sstables);
}
- /**
- * When creating a CFS offline we change the default logic needed by CASSANDRA-8671
- * and link the passed directories to be picked up by the compaction strategy
- */
- if (offline)
- this.directories = directories;
- else
- this.directories = new Directories(metadata, Directories.dataDirectories);
-
-
// compaction strategy should be created after the CFS has been prepared
compactionStrategyManager = new CompactionStrategyManager(this);
@@@ -422,12 -461,16 +423,19 @@@
}
// create the private ColumnFamilyStores for the secondary column indexes
- for (IndexMetadata info : metadata.getIndexes())
- indexManager.addIndex(info);
+ indexManager = new SecondaryIndexManager(this);
+ for (IndexMetadata info : metadata.get().indexes)
+ {
+ indexManager.addIndex(info, true);
+ }
+ metric = new TableMetrics(this);
+
+ if (data.loadsstables)
+ {
+ data.updateInitialSSTableSize(sstables);
+ }
+
if (registerBookeeping)
{
// register the mbean
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org