Skip to content

Commit

Permalink
fix(metric-engine): missing catchup implementation (#4048)
Browse files Browse the repository at this point in the history
* fix(metric-engine): missing catchup implementation

* fix: should be `metadata_region_id`
  • Loading branch information
WenyXu authored May 27, 2024
1 parent 75bddc0 commit 20ce7d4
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/metric-engine/src/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

mod alter;
mod catchup;
mod close;
mod create;
mod drop;
Expand Down Expand Up @@ -147,8 +148,7 @@ impl RegionEngine for MetricEngine {
| RegionRequest::Flush(_)
| RegionRequest::Compact(_)
| RegionRequest::Truncate(_) => UnsupportedRegionRequestSnafu { request }.fail(),
// It always Ok(0), all data is the latest.
RegionRequest::Catchup(_) => Ok(0),
RegionRequest::Catchup(ref req) => self.inner.catchup_region(region_id, *req).await,
};

result.map_err(BoxedError::new).map(|rows| RegionResponse {
Expand Down
61 changes: 61 additions & 0 deletions src/metric-engine/src/engine/catchup.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright 2023 Greptime Team
//
// Licensed 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.

use snafu::ResultExt;
use store_api::region_engine::RegionEngine;
use store_api::region_request::{AffectedRows, RegionCatchupRequest, RegionRequest};
use store_api::storage::RegionId;

use crate::engine::MetricEngineInner;
use crate::error::{MitoCatchupOperationSnafu, Result, UnsupportedRegionRequestSnafu};
use crate::utils;

impl MetricEngineInner {
pub async fn catchup_region(
&self,
region_id: RegionId,
req: RegionCatchupRequest,
) -> Result<AffectedRows> {
if !self.is_physical_region(region_id) {
return UnsupportedRegionRequestSnafu {
request: RegionRequest::Catchup(req),
}
.fail();
}
let metadata_region_id = utils::to_metadata_region_id(region_id);
// TODO(weny): improve the catchup, we can read the wal entries only once.
self.mito
.handle_request(
metadata_region_id,
RegionRequest::Catchup(RegionCatchupRequest {
set_writable: req.set_writable,
entry_id: None,
}),
)
.await
.context(MitoCatchupOperationSnafu)?;

self.mito
.handle_request(
region_id,
RegionRequest::Catchup(RegionCatchupRequest {
set_writable: req.set_writable,
entry_id: req.entry_id,
}),
)
.await
.context(MitoCatchupOperationSnafu)
.map(|response| response.affected_rows)
}
}
10 changes: 9 additions & 1 deletion src/metric-engine/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ pub enum Error {
location: Location,
},

#[snafu(display("Mito catchup operation fails"))]
MitoCatchupOperation {
source: BoxedError,
#[snafu(implicit)]
location: Location,
},

#[snafu(display("Failed to collect record batch stream"))]
CollectRecordBatchStream {
source: common_recordbatch::error::Error,
Expand Down Expand Up @@ -267,7 +274,8 @@ impl ErrorExt for Error {
| OpenMitoRegion { source, .. }
| CloseMitoRegion { source, .. }
| MitoReadOperation { source, .. }
| MitoWriteOperation { source, .. } => source.status_code(),
| MitoWriteOperation { source, .. }
| MitoCatchupOperation { source, .. } => source.status_code(),

CollectRecordBatchStream { source, .. } => source.status_code(),

Expand Down
2 changes: 1 addition & 1 deletion src/store-api/src/region_request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ pub struct RegionTruncateRequest {}
///
/// Makes a readonly region to catch up to leader region changes.
/// There is no effect if it operating on a leader region.
#[derive(Debug)]
#[derive(Debug, Clone, Copy)]
pub struct RegionCatchupRequest {
/// Sets it to writable if it's available after it has caught up with all changes.
pub set_writable: bool,
Expand Down

0 comments on commit 20ce7d4

Please sign in to comment.