Skip to content
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

fix(compaction): avoid merge a emergency group #20327

Merged
merged 4 commits into from
Feb 7, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(compaction): avoid merge a emergency group
Li0k committed Jan 27, 2025
commit 5c260e6c2a6dc7c6068f2e903e9a40f9db6adca6
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
// limitations under the License.

use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
use std::ops::DerefMut;
use std::ops::{Deref, DerefMut};
use std::sync::Arc;

use bytes::Bytes;
@@ -33,7 +33,7 @@ use risingwave_pb::hummock::{
};
use thiserror_ext::AsReport;

use super::CompactionGroupStatistic;
use super::{check_cg_write_limit, CompactionGroupStatistic};
use crate::hummock::error::{Error, Result};
use crate::hummock::manager::transaction::HummockVersionTransaction;
use crate::hummock::manager::{commit_multi_var, HummockManager};
@@ -929,6 +929,41 @@ impl HummockManager {
)));
}

{
// TODO: check emergency state
let versioning_guard = self.versioning.read().await;
if check_cg_write_limit(
versioning_guard
.current_version
.get_compaction_group_levels(group.group_id),
group.compaction_group_config.compaction_config().deref(),
)
.is_write_stop()
{
return Err(Error::CompactionGroup(format!(
"Not Merge write limit group {} next group {}",
group.group_id, next_group.group_id
)));
}

if check_cg_write_limit(
versioning_guard
.current_version
.get_compaction_group_levels(next_group.group_id),
next_group
.compaction_group_config
.compaction_config()
.deref(),
)
.is_write_stop()
{
return Err(Error::CompactionGroup(format!(
"Not Merge write limit next group {} group {}",
next_group.group_id, group.group_id
)));
}
}

match self
.merge_compaction_group(group.group_id, next_group.group_id)
.await