-
Notifications
You must be signed in to change notification settings - Fork 3.8k
CASSANDRA-21130: Fix flakey tests due to tests updating SSTable format dynamically #4577
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
dcapwell
wants to merge
2
commits into
apache:trunk
Choose a base branch
from
dcapwell:CASSANDRA-21130
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.
+130
−7
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
120 changes: 120 additions & 0 deletions
120
test/unit/org/apache/cassandra/config/TestDatabaseDescriptor.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,120 @@ | ||
| /* | ||
| * 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.config; | ||
|
|
||
| import java.util.ArrayList; | ||
|
|
||
| import org.apache.cassandra.db.ColumnFamilyStore; | ||
| import org.apache.cassandra.db.compaction.CompactionManager; | ||
| import org.apache.cassandra.io.sstable.format.SSTableFormat; | ||
|
|
||
| import static org.apache.cassandra.utils.Throwables.maybeFail; | ||
| import static org.apache.cassandra.utils.Throwables.merge; | ||
|
|
||
| /** | ||
| * Test utilities for DatabaseDescriptor that require server-side classes. | ||
| * These methods are separated from DatabaseDescriptor to avoid loading | ||
| * server classes during initialization. | ||
| */ | ||
| public class TestDatabaseDescriptor | ||
| { | ||
| /** | ||
| * Sets the global SSTable format after safely pausing all compactions. | ||
| * | ||
| * @param name the SSTable format name (e.g., "big" or "bti") | ||
| */ | ||
| public static void setUnsafeSelectedSSTableFormat(String name) | ||
| { | ||
| SSTableFormat<?, ?> format = DatabaseDescriptor.getSSTableFormats().get(name); | ||
| if (format == null) | ||
| throw new IllegalArgumentException("Unknown sstable format: " + name); | ||
| setUnsafeSelectedSSTableFormat(format); | ||
| } | ||
|
|
||
| /** | ||
| * Sets the global SSTable format after safely pausing all compactions. | ||
| * <p> | ||
| * This method: | ||
| * 1. Pauses global compactions | ||
| * 2. Pauses all table compaction strategies | ||
| * 3. Waits for in-flight compactions to complete | ||
| * 4. Changes the SSTable format | ||
| * 5. Resumes compactions | ||
| * | ||
| * @param format the SSTable format to set | ||
| */ | ||
| public static void setUnsafeSelectedSSTableFormat(SSTableFormat<?, ?> format) | ||
| { | ||
| // Get all CFSs across all keyspaces since SSTable format is global | ||
| Iterable<ColumnFamilyStore> allCfs = ColumnFamilyStore.all(); | ||
|
|
||
| // Pause both global compactions and all table compaction strategies | ||
| // This prevents NEW compactions from starting | ||
| try (CompactionManager.CompactionPauser globalPause = CompactionManager.instance.pauseGlobalCompaction(); | ||
| CompactionManager.CompactionPauser strategiesPause = pauseAllCompactionStrategies(allCfs)) | ||
| { | ||
| // Wait for all existing in-flight compactions to complete naturally (don't interrupt) | ||
| // Uses 1-minute timeout per waitForCessation implementation | ||
| CompactionManager.instance.waitForCessation(allCfs, sstable -> true); | ||
|
|
||
| // Now safe to change the global SSTable format | ||
| DatabaseDescriptor.setSelectedSSTableFormat(format); | ||
| } | ||
| // Compactions auto-resume when pausers are closed | ||
| } | ||
|
|
||
| /** | ||
| * Pauses compaction strategies for all given ColumnFamilyStores. | ||
| * Pattern matches {@link ColumnFamilyStore#pauseCompactionStrategies}. | ||
| */ | ||
| private static CompactionManager.CompactionPauser pauseAllCompactionStrategies(Iterable<ColumnFamilyStore> toPause) | ||
| { | ||
| ArrayList<ColumnFamilyStore> successfullyPaused = new ArrayList<>(); | ||
| try | ||
| { | ||
| for (ColumnFamilyStore cfs : toPause) | ||
| { | ||
| successfullyPaused.ensureCapacity(successfullyPaused.size() + 1); // to avoid OOM after pausing the strategies | ||
| cfs.getCompactionStrategyManager().pause(); | ||
| successfullyPaused.add(cfs); | ||
| } | ||
| return () -> maybeFail(resumeAll(null, toPause)); | ||
| } | ||
| catch (Throwable t) | ||
| { | ||
| resumeAll(t, successfullyPaused); | ||
| throw t; | ||
| } | ||
| } | ||
|
|
||
| private static Throwable resumeAll(Throwable accumulate, Iterable<ColumnFamilyStore> cfss) | ||
| { | ||
| for (ColumnFamilyStore cfs : cfss) | ||
| { | ||
| try | ||
| { | ||
| cfs.getCompactionStrategyManager().resume(); | ||
| } | ||
| catch (Throwable t) | ||
| { | ||
| accumulate = merge(accumulate, t); | ||
| } | ||
| } | ||
| return accumulate; | ||
| } | ||
| } | ||
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
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.
Would it not be safe to just fail hard on OOME?
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.
prob, this was mostly copy/paste to keep inline with w/e the reasoning was. I thought about making the methods public and marked as for tests vs copying... I don't think
ColumnFamilyStoreis a public API or consumed by a public API... but given that we really don't document whats public i didn't really want to take the risk