Avoid overwriting non-okay status due to shutdown or manual compaction pause #13891
+11
−14
Conversation
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
hx235
force-pushed
the
no_override_non_okay_s_ci
branch
from
a1ef82f to
4b9507e
Compare
hx235
force-pushed
the
no_override_non_okay_s_ci
branch
from
4b9507e to
3fd995a
Compare
hx235
force-pushed
the
no_override_non_okay_s_ci
branch
from
3fd995a to
a9a5676
Compare
hx235
changed the title
hx235
changed the title
hx235
changed the title
jaykorean
reviewed
Aug 29, 2025
db/compaction/compaction_iterator.cc
Outdated
| @@ -1120,16 +1120,16 @@ void CompactionIterator::NextFromInput() { | |||
| } | |||
| } | |||
|
|
|||
| if (!Valid() && IsShuttingDown()) { | |||
| if (!Valid() && status_.ok() && IsShuttingDown()) { | |||
There was a problem hiding this comment.
nit: wondering if we can place all three checks under the same status_.ok check and use else if
if (status_.ok()) {
if (!Valid() && IsShuttingDown()) {
status_ = Status::ShutdownInProgress();
} else if (IsPausingManualCompaction()) {
status_ = Status::Incomplete(Status::SubCode::kManualCompactionPaused);
} else if (!input_.Valid() && input_.status().IsCorruption()) {
status_ = input_.status();
}
}
to avoid two additional status_.ok() checks.
| @@ -1610,11 +1610,10 @@ Status CompactionJob::FinalizeProcessKeyValueStatus( | |||
| status = | |||
| Status::ColumnFamilyDropped("Column family dropped during compaction"); | |||
| } | |||
| if ((status.ok() || status.IsColumnFamilyDropped()) && | |||
| shutting_down_->load(std::memory_order_relaxed)) { | |||
| if (status.ok() && shutting_down_->load(std::memory_order_relaxed)) { | |||
There was a problem hiding this comment.
Curious why we were overwriting ColumnFamilyDropped() status with IsShutdown or IsPaused status previously.
As opposed to the change above in NextFromInput(), this checks were explicitly checking IsColumnFamilyDropped(), so I'm wondering if there was a reason for this.
There was a problem hiding this comment.
Probably just an honest inconsistency.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Context/Summary:
A small change as titled.
Test plan: