You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2020/05/07 09:09:01 UTC
[cassandra] branch cassandra-3.11 updated (2f8fe37 -> 18736b4)
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 2f8fe37 Merge branch 'cassandra-3.0' into cassandra-3.11
new b105e91 liveDiskSpaceUsed and totalDiskSpaceUsed get corrupted if IndexSummaryRedistribution gets interrupted
new 18736b4 Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 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 +
.../db/lifecycle/LifecycleTransaction.java | 44 +++++++
.../io/sstable/IndexSummaryRedistribution.java | 27 +++-
.../cassandra/io/sstable/format/SSTableReader.java | 6 -
.../apache/cassandra/io/DiskSpaceMetricsTest.java | 139 +++++++++++++++++++++
5 files changed, 210 insertions(+), 7 deletions(-)
create mode 100644 test/unit/org/apache/cassandra/io/DiskSpaceMetricsTest.java
---------------------------------------------------------------------
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.0' into cassandra-3.11
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 18736b413692c75806427e0e665f31ced678e6ff
Merge: 2f8fe37 b105e91
Author: Marcus Eriksson <ma...@apache.org>
AuthorDate: Thu May 7 10:50:33 2020 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
.../db/lifecycle/LifecycleTransaction.java | 44 +++++++
.../io/sstable/IndexSummaryRedistribution.java | 27 +++-
.../cassandra/io/sstable/format/SSTableReader.java | 6 -
.../apache/cassandra/io/DiskSpaceMetricsTest.java | 139 +++++++++++++++++++++
5 files changed, 210 insertions(+), 7 deletions(-)
diff --cc CHANGES.txt
index 4e9632e,0a0a4d5..c326801
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-3.0.21
+3.11.7
+ * Allow sstableloader to use SSL on the native port (CASSANDRA-14904)
+Merged from 3.0:
+ * liveDiskSpaceUsed and totalDiskSpaceUsed get corrupted if IndexSummaryRedistribution gets interrupted (CASSANDRA-15674)
* Fix Debian init start/stop (CASSANDRA-15770)
* Fix infinite loop on index query paging in tables with clustering (CASSANDRA-14242)
* Fix chunk index overflow due to large sstable with small chunk length (CASSANDRA-15595)
diff --cc src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
index d80adc0,45bd7eb..b914963
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
@@@ -42,7 -41,7 +41,8 @@@ import org.apache.cassandra.db.compacti
import org.apache.cassandra.db.compaction.CompactionInfo.Unit;
import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
import org.apache.cassandra.io.sstable.format.SSTableReader;
+ import org.apache.cassandra.metrics.StorageMetrics;
+import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.concurrent.Refs;
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index a90cadd,0485275..803fcb3
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -1180,14 -1154,13 +1179,9 @@@ public abstract class SSTableReader ext
"no adjustments to min/max_index_interval");
}
- //Always save the resampled index
- try(SegmentedFile.Builder ibuilder = SegmentedFile.getBuilder(DatabaseDescriptor.getIndexAccessMode(), false);
- SegmentedFile.Builder dbuilder = SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode(), compression))
- {
- saveSummary(ibuilder, dbuilder, newSummary);
- }
+ // Always save the resampled index
+ saveSummary(newSummary);
- // The new size will be added in Transactional.commit() as an updated SSTable, more details: CASSANDRA-13738
- StorageMetrics.load.dec(oldSize);
- parent.metric.liveDiskSpaceUsed.dec(oldSize);
- parent.metric.totalDiskSpaceUsed.dec(oldSize);
-
return cloneAndReplace(first, OpenReason.METADATA_CHANGE, newSummary);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org