rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-17 21:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: metric engine deadlock when altering a group of tables (#7308)

Browse Source 
Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2025-11-27 17:45:06 +08:00
committed by GitHub
parent 020477994b
commit 4c07d2d5de
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/metric-engine/src/engine/alter.rs
View File

@@ -15,7 +15,7 @@
mod extract_new_columns;
mod validate;
use std::collections::{HashMap, HashSet};
use std::collections::{BTreeSet, HashMap, HashSet};
use extract_new_columns::extract_new_columns;
use snafu::{OptionExt, ResultExt, ensure};
@@ -143,16 +143,20 @@ impl MetricEngineInner {
};
let data_region_id = to_data_region_id(physical_region_id);
let mut write_guards = HashMap::with_capacity(requests.len());
for (region_id, _) in requests.iter() {
if write_guards.contains_key(region_id) {
continue;
}
let _write_guard = self
.metadata_region
.write_lock_logical_region(*region_id)
.await?;
write_guards.insert(*region_id, _write_guard);
// Acquire logical region locks in a deterministic order to avoid deadlocks when multiple
// alter operations target overlapping regions concurrently.
let region_ids = requests
.iter()
.map(|(region_id, _)| *region_id)
.collect::<BTreeSet<_>>();
let mut write_guards = Vec::with_capacity(region_ids.len());
for region_id in region_ids {
write_guards.push(
self.metadata_region
.write_lock_logical_region(region_id)
.await?,
);
}
self.data_region