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

fix: close issue #5466 by do not shortcut the drop command (#5467)

Browse Source 
fix: close issue #5466 by do not shortcut by back it to READY when fail

Signed-off-by: yihong0618 <zouzou0208@gmail.com>
This commit is contained in:
yihong
2025-02-10 11:28:34 +08:00
committed by GitHub
parent 480b05c590
commit ccb1978c98
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/datanode/src/region_server.rs
View File

@@ -661,7 +661,7 @@ impl RegionServerInner {
}
}
Err(e) => {
self.unset_region_status(region_id, *region_change);
self.unset_region_status(region_id, &engine, *region_change);
error!(e; "Failed to open region: {}", region_id);
errors.push(e);
}
@@ -670,7 +670,7 @@ impl RegionServerInner {
}
Err(e) => {
for (&region_id, region_change) in &region_changes {
self.unset_region_status(region_id, *region_change);
self.unset_region_status(region_id, &engine, *region_change);
}
error!(e; "Failed to open batch regions");
errors.push(BoxedError::new(e));
@@ -780,7 +780,7 @@ impl RegionServerInner {
}
Err(err) => {
// Removes the region status if the operation fails.
self.unset_region_status(region_id, region_change);
self.unset_region_status(region_id, &engine, region_change);
Err(err)
}
}
@@ -809,12 +809,21 @@ impl RegionServerInner {
}
}
fn unset_region_status(&self, region_id: RegionId, region_change: RegionChange) {
fn unset_region_status(
&self,
region_id: RegionId,
engine: &RegionEngineRef,
region_change: RegionChange,
) {
match region_change {
RegionChange::None => {}
RegionChange::Register(_) | RegionChange::Deregisters => {
RegionChange::Register(_) => {
self.region_map.remove(&region_id);
}
RegionChange::Deregisters => {
self.region_map
.insert(region_id, RegionEngineWithStatus::Ready(engine.clone()));
}
RegionChange::Catchup => {}
}
}
@@ -1195,7 +1204,7 @@ mod tests {
.unwrap_err();
let status = mock_region_server.inner.region_map.get(&region_id);
assert!(status.is_none());
assert!(status.is_some());
}
struct CurrentEngineTest {