-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Fix incorrect data file length for early open sstables #4114
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
blambov
wants to merge
1
commit into
apache:trunk
Choose a base branch
from
blambov:CASSANDRA-20592
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 157 additions & 0 deletions
157
test/unit/org/apache/cassandra/io/sstable/EarlyOpenIterationTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.cassandra.io.sstable; | ||
|
|
||
| import java.nio.ByteBuffer; | ||
| import java.util.Collection; | ||
| import java.util.Random; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
| import java.util.function.Consumer; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
| import com.google.common.collect.Sets; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.Parameterized; | ||
|
|
||
| import com.carrotsearch.randomizedtesting.generators.RandomStrings; | ||
| import org.apache.cassandra.config.Config; | ||
| import org.apache.cassandra.config.DatabaseDescriptor; | ||
| import org.apache.cassandra.cql3.CQLTester; | ||
| import org.apache.cassandra.db.ColumnFamilyStore; | ||
| import org.apache.cassandra.db.DecoratedKey; | ||
| import org.apache.cassandra.db.compaction.OperationType; | ||
| import org.apache.cassandra.db.lifecycle.LifecycleTransaction; | ||
| import org.apache.cassandra.db.lifecycle.WrappedLifecycleTransaction; | ||
| import org.apache.cassandra.io.sstable.format.SSTableFormat; | ||
| import org.apache.cassandra.io.sstable.format.SSTableReader; | ||
|
|
||
| import static org.apache.cassandra.config.CassandraRelevantProperties.SSTABLE_FORMAT_DEFAULT; | ||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| @RunWith(Parameterized.class) | ||
| public class EarlyOpenIterationTest extends CQLTester | ||
| { | ||
| @Parameterized.Parameters(name = "format={0}") | ||
| public static Collection<Object> generateParameters() | ||
| { | ||
| // We need to set up the class here, as the parameterized test runner will not call the @BeforeClass method | ||
| paramaterizedSetUpClass(); | ||
|
|
||
| return Lists.newArrayList(DatabaseDescriptor.getSSTableFormats().values()); | ||
| } | ||
|
|
||
| public static void paramaterizedSetUpClass() | ||
| { | ||
| CQLTester.setUpClass(); | ||
| DatabaseDescriptor.setDiskAccessMode(Config.DiskAccessMode.standard); | ||
| } | ||
|
|
||
| Random rand = new Random(); | ||
|
|
||
| @Parameterized.Parameter | ||
| public SSTableFormat<?, ?> format = DatabaseDescriptor.getSelectedSSTableFormat(); | ||
|
|
||
| @BeforeClass | ||
| public static void setUpClass() // override CQLTester's setUpClass | ||
| { | ||
| // No-op, as initialization was done in paramaterizedSetUpClass, and we don't want to call CQLTester.setUpClass again | ||
| } | ||
|
|
||
| @Test | ||
| public void testFinalOpenIteration() throws InterruptedException | ||
| { | ||
| SSTABLE_FORMAT_DEFAULT.setString(format.name()); | ||
| createTable("CREATE TABLE %s (pkey text, ckey text, val blob, PRIMARY KEY (pkey, ckey))"); | ||
|
|
||
| for (int i = 0; i < 800; i++) | ||
| { | ||
| String pkey = RandomStrings.randomAsciiOfLengthBetween(rand, 10, 10); | ||
| for (int j = 0; j < 100; j++) | ||
| execute("INSERT INTO %s (pkey, ckey, val) VALUES (?, ?, ?)", pkey, "" + j, ByteBuffer.allocate(300)); | ||
| } | ||
| flush(); | ||
| ColumnFamilyStore cfs = getCurrentColumnFamilyStore(); | ||
|
|
||
| AtomicInteger opened = new AtomicInteger(0); | ||
| assertEquals(1, cfs.getLiveSSTables().size()); | ||
| SSTableReader source = cfs.getLiveSSTables().iterator().next(); | ||
|
|
||
| Consumer<Iterable<SSTableReader>> consumer = current -> { | ||
| for (SSTableReader s : current) | ||
| { | ||
| readAllAndVerifyKeySpan(s); | ||
| if (s.openReason == SSTableReader.OpenReason.EARLY) | ||
| opened.incrementAndGet(); | ||
| } | ||
| }; | ||
|
|
||
| SSTableReader finalReader; | ||
| try (WrappedLifecycleTransaction txn = new WrappedLifecycleTransaction(cfs.getTracker().tryModify(source, OperationType.COMPACTION)) | ||
| { | ||
| @Override | ||
| public void checkpoint() | ||
| { | ||
| consumer.accept(((LifecycleTransaction) delegate).current()); | ||
| super.checkpoint(); | ||
| } | ||
| }; | ||
| SSTableRewriter writer = new SSTableRewriter(txn, 1000, 100L << 10, false)) | ||
| { | ||
| writer.switchWriter(SSTableWriterTestBase.getWriter(format, cfs, cfs.getDirectories().getDirectoryForNewSSTables(), txn)); | ||
| var iter = source.getScanner(); | ||
| while (iter.hasNext()) | ||
| { | ||
| var next = iter.next(); | ||
| writer.append(next); | ||
| } | ||
| finalReader = writer.finish().iterator().next(); | ||
| } | ||
| assertTrue("No early opening occured", opened.get() > 0); | ||
|
|
||
| assertEquals(Sets.newHashSet(finalReader), cfs.getLiveSSTables()); | ||
| readAllAndVerifyKeySpan(finalReader); | ||
| } | ||
|
|
||
| private static void readAllAndVerifyKeySpan(SSTableReader s) | ||
| { | ||
| DecoratedKey firstKey = null; | ||
| DecoratedKey lastKey = null; | ||
| try (var iter = s.getScanner()) | ||
| { | ||
| while (iter.hasNext()) | ||
| { | ||
| try (var partition = iter.next()) | ||
| { | ||
| // consume all rows, so that the data is cached | ||
| partition.forEachRemaining(column -> { | ||
| // consume all columns | ||
| }); | ||
| if (firstKey == null) | ||
| firstKey = partition.partitionKey(); | ||
| lastKey = partition.partitionKey(); | ||
| } | ||
| } | ||
| } | ||
| assertEquals("Simple scanner does not iterate all content", s.getFirst(), firstKey); | ||
| assertEquals("Simple scanner does not iterate all content", s.getLast(), lastKey); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Depending on this being on a hot path or not we might contemplate about removing streams in favor of plain for loop.
https://lists.apache.org/thread/65glsjzkmpktzmns6j9wvr4nczvskx36
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is only meant to be used in tests.