Skip to content

Commit 3e4eb78

Browse files
authored
chore: fix logs and style (apache#1011)
## Rationale See title. ## Detailed Changes See title. ## Test Plan None.
1 parent 9a9c0f7 commit 3e4eb78

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

analytic_engine/src/instance/open.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ impl ShardOpener {
294294
Ok(table_data.map(|data| (data, ctx.space.clone())))
295295
}
296296
Err(e) => {
297-
error!("ShardOpener recover single table meta failed, table:{:?}, shard_id:{}", ctx.table_def, self.shard_id);
297+
error!("ShardOpener recover single table meta failed, table:{:?}, shard_id:{}, err:{e}", ctx.table_def, self.shard_id);
298298
Err(e)
299299
}
300300
};
@@ -387,7 +387,7 @@ impl ShardOpener {
387387
}
388388

389389
(TableOpenStage::RecoverTableData(_), Some(e)) => {
390-
error!("ShardOpener replay wals of single table failed, table:{}, table_id:{}, shard_id:{}", table_data.name, table_data.id, self.shard_id);
390+
error!("ShardOpener replay wals of single table failed, table:{}, table_id:{}, shard_id:{}, err:{e}", table_data.name, table_data.id, self.shard_id);
391391
*stage = TableOpenStage::Failed(e);
392392
}
393393

analytic_engine/src/instance/wal_replayer.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -204,21 +204,20 @@ impl TableBasedReplay {
204204
let mut log_entry_buf = VecDeque::with_capacity(context.wal_replay_batch_size);
205205
loop {
206206
// fetch entries to log_entry_buf
207-
let timer = PULL_LOGS_DURATION_HISTOGRAM.start_timer();
207+
let _timer = PULL_LOGS_DURATION_HISTOGRAM.start_timer();
208208
let decoder = WalDecoder::default();
209209
log_entry_buf = log_iter
210210
.next_log_entries(decoder, log_entry_buf)
211211
.await
212212
.box_err()
213213
.context(ReplayWalWithCause { msg: None })?;
214-
drop(timer);
215214

216215
if log_entry_buf.is_empty() {
217216
break;
218217
}
219218

220219
// Replay all log entries of current table
221-
let timer = APPLY_LOGS_DURATION_HISTOGRAM.start_timer();
220+
let _timer = APPLY_LOGS_DURATION_HISTOGRAM.start_timer();
222221
replay_table_log_entries(
223222
&context.flusher,
224223
context.max_retry_flush_limit,
@@ -227,7 +226,6 @@ impl TableBasedReplay {
227226
log_entry_buf.iter(),
228227
)
229228
.await?;
230-
drop(timer);
231229
}
232230

233231
Ok(())
@@ -298,23 +296,21 @@ impl RegionBasedReplay {
298296

299297
// Split and replay logs.
300298
loop {
301-
let timer = PULL_LOGS_DURATION_HISTOGRAM.start_timer();
299+
let _timer = PULL_LOGS_DURATION_HISTOGRAM.start_timer();
302300
let decoder = WalDecoder::default();
303301
log_entry_buf = log_iter
304302
.next_log_entries(decoder, log_entry_buf)
305303
.await
306304
.box_err()
307305
.context(ReplayWalWithCause { msg: None })?;
308-
drop(timer);
309306

310307
if log_entry_buf.is_empty() {
311308
break;
312309
}
313310

314-
let timer = APPLY_LOGS_DURATION_HISTOGRAM.start_timer();
311+
let _timer = APPLY_LOGS_DURATION_HISTOGRAM.start_timer();
315312
Self::replay_single_batch(context, &log_entry_buf, &mut serial_exec_ctxs, faileds)
316313
.await?;
317-
drop(timer);
318314
}
319315

320316
Ok(())

wal/src/message_queue_impl/log_cleaner.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022 CeresDB Project Authors. Licensed under Apache-2.0.
1+
// Copyright 2022-2023 CeresDB Project Authors. Licensed under Apache-2.0.
22

33
//! Log cleaner
44
@@ -68,7 +68,7 @@ impl<M: MessageQueue> LogCleaner<M> {
6868

6969
pub async fn maybe_clean_logs(&mut self, safe_delete_offset: Offset) -> Result<()> {
7070
info!(
71-
"Begin to check and clean logs, region id:{}, topic:{}, safe delete offset:{:?}",
71+
"Region clean logs begin, region id:{}, topic:{}, safe delete offset:{:?}",
7272
self.region_id, self.log_topic, safe_delete_offset
7373
);
7474

@@ -102,7 +102,7 @@ impl<M: MessageQueue> LogCleaner<M> {
102102
}
103103

104104
info!(
105-
"Finished to check and clean logs, do clean:{}, region id:{}, topic:{}, prepare delete to offset:{:?}",
105+
"Region clean logs finish, do clean:{}, region id:{}, topic:{}, prepare delete to offset:{:?}",
106106
do_clean, self.region_id, self.log_topic, safe_delete_offset
107107
);
108108

wal/src/message_queue_impl/region.rs

+2
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,8 @@ impl<M: MessageQueue> Region<M> {
618618
};
619619

620620
let safe_delete_offset = snapshot.safe_delete_offset();
621+
info!("Region clean logs, snapshot:{snapshot:?}, safe_delete_offset:{safe_delete_offset}");
622+
621623
// Sync snapshot first.
622624
synchronizer
623625
.sync(snapshot)

0 commit comments

Comments
 (0)