Skip to content

Commit 201f65d

Browse files
committed
[improvement] Enforce English grammar standards in FE and BE logs
Issue Number: close #xxx Problem Summary: 1. Standardized FE and BE logging grammar based on AGENTS.md rules ('Start [verb]ing', 'Begin to [verb]', 'Finished [verb]ing'). 2. Reduced massive log spam in fs_file_cache_storage.cpp. 3. Corrected misspellings (e.g. 'destoried', 'envorinment', 'founded', 'can not' -> 'cannot') and capitalized key info logs according to community standards. None - Test: Manual test - Behavior changed: No - Does this need documentation: No
1 parent 4fb37fa commit 201f65d

File tree

409 files changed

+955
-955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+955
-955
lines changed

be/src/agent/task_worker_pool.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ void update_tablet_meta_callback(StorageEngine& engine, const TAgentTaskRequest&
10451045
}
10461046
}
10471047

1048-
LOG(INFO) << "finish update tablet meta task. signature=" << req.signature;
1048+
LOG(INFO) << "Finished updating tablet meta task. signature=" << req.signature;
10491049
if (req.signature != -1) {
10501050
TFinishTaskRequest finish_task_request;
10511051
finish_task_request.__set_task_status(status.to_thrift());
@@ -1782,7 +1782,7 @@ void create_tablet_callback(StorageEngine& engine, const TAgentTaskRequest& req)
17821782
}
17831783
};
17841784
DorisMetrics::instance()->create_tablet_requests_total->increment(1);
1785-
VLOG_NOTICE << "Starting to create tablet " << create_tablet_req.tablet_id;
1785+
VLOG_NOTICE << "Start creating tablet " << create_tablet_req.tablet_id;
17861786

17871787
std::vector<TTabletInfo> finish_tablet_infos;
17881788
VLOG_NOTICE << "create tablet: " << create_tablet_req;
@@ -2410,7 +2410,7 @@ void calc_delete_bitmap_callback(CloudStorageEngine& engine, const TAgentTaskReq
24102410
SCOPED_ATTACH_TASK(engine_task.mem_tracker());
24112411
if (req.signature != calc_delete_bitmap_req.transaction_id) {
24122412
// transaction_id may not be the same as req.signature, so add a log here
2413-
LOG_INFO("Starting to execute calc delete bitmap task")
2413+
LOG_INFO("Start executing calc delete bitmap task")
24142414
.tag("signature", req.signature)
24152415
.tag("transaction_id", calc_delete_bitmap_req.transaction_id);
24162416
}
@@ -2443,7 +2443,7 @@ void make_cloud_committed_rs_visible_callback(CloudStorageEngine& engine,
24432443
if (!config::enable_cloud_make_rs_visible_on_be) {
24442444
return;
24452445
}
2446-
LOG(INFO) << "Starting to make cloud tmp rs visible, txn_id="
2446+
LOG(INFO) << "Start making cloud tmp rs visible, txn_id="
24472447
<< req.make_cloud_tmp_rs_visible_req.txn_id
24482448
<< ", tablet_count=" << req.make_cloud_tmp_rs_visible_req.tablet_ids.size();
24492449

be/src/cloud/cloud_compaction_action.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Status CloudCompactionAction::_handle_show_compaction(HttpRequest* req, std::str
120120
return Status::InternalError("check param failed: missing tablet_id");
121121
}
122122

123-
LOG(INFO) << "Starting to handle show compaction, tablet id: " << tablet_id;
123+
LOG(INFO) << "Start handling show compaction, tablet id: " << tablet_id;
124124

125125
//TabletSharedPtr tablet = _engine.tablet_manager()->get_tablet(tablet_id);
126126
CloudTabletSPtr tablet = DORIS_TRY(_engine.tablet_mgr().get_tablet(tablet_id));
@@ -129,7 +129,7 @@ Status CloudCompactionAction::_handle_show_compaction(HttpRequest* req, std::str
129129
}
130130

131131
tablet->get_compaction_status(json_result);
132-
LOG(INFO) << "Finished handle show compaction, tablet id: " << tablet_id;
132+
LOG(INFO) << "Finished handling show compaction, tablet id: " << tablet_id;
133133
return Status::OK();
134134
}
135135

@@ -139,7 +139,7 @@ Status CloudCompactionAction::_handle_run_compaction(HttpRequest* req, std::stri
139139
uint64_t tablet_id = 0;
140140
uint64_t table_id = 0;
141141
RETURN_NOT_OK_STATUS_WITH_WARN(_check_param(req, &tablet_id, &table_id), "check param failed");
142-
LOG(INFO) << "Starting to handle run compaction, tablet id: " << tablet_id
142+
LOG(INFO) << "Start handling run compaction, tablet id: " << tablet_id
143143
<< " table id: " << table_id;
144144

145145
// check compaction_type equals 'base' or 'cumulative'
@@ -186,7 +186,7 @@ Status CloudCompactionAction::_handle_run_status_compaction(HttpRequest* req,
186186
uint64_t tablet_id = 0;
187187
RETURN_NOT_OK_STATUS_WITH_WARN(_check_param(req, &tablet_id, TABLET_ID_KEY),
188188
"check param failed");
189-
LOG(INFO) << "Starting to handle run status compaction, tablet id: " << tablet_id;
189+
LOG(INFO) << "Start handling run status compaction, tablet id: " << tablet_id;
190190

191191
if (tablet_id == 0) {
192192
// overall compaction status
@@ -233,7 +233,7 @@ Status CloudCompactionAction::_handle_run_status_compaction(HttpRequest* req,
233233
// not running any compaction
234234
*json_result = absl::Substitute(json_template, run_status, msg, tablet_id, compaction_type);
235235
}
236-
LOG(INFO) << "Finished handle run status compaction, tablet id: " << tablet_id;
236+
LOG(INFO) << "Finished handling run status compaction, tablet id: " << tablet_id;
237237
return Status::OK();
238238
}
239239

be/src/cloud/cloud_delete_task.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace doris {
3131
using namespace ErrorCode;
3232

3333
Status CloudDeleteTask::execute(CloudStorageEngine& engine, const TPushReq& request) {
34-
VLOG_DEBUG << "Starting to process delete data. request=" << ThriftDebugString(request);
34+
VLOG_DEBUG << "Start processing delete data. request=" << ThriftDebugString(request);
3535

3636
if (!request.__isset.transaction_id) {
3737
return Status::InvalidArgument("transaction_id is not set");

be/src/cloud/cloud_engine_calc_delete_bitmap_task.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void CloudEngineCalcDeleteBitmapTask::add_succ_tablet_id(int64_t tablet_id) {
6767
Status CloudEngineCalcDeleteBitmapTask::execute() {
6868
int64_t transaction_id = _cal_delete_bitmap_req.transaction_id;
6969
OlapStopWatch watch;
70-
VLOG_NOTICE << "Starting to calculate delete bitmap. transaction_id=" << transaction_id;
70+
VLOG_NOTICE << "Start calculating delete bitmap. transaction_id=" << transaction_id;
7171
std::unique_ptr<ThreadPoolToken> token =
7272
_engine.calc_tablet_delete_bitmap_task_thread_pool().new_token(
7373
ThreadPool::ExecutionMode::CONCURRENT);
@@ -113,7 +113,7 @@ Status CloudEngineCalcDeleteBitmapTask::execute() {
113113
// wait for all finished
114114
token->wait();
115115

116-
LOG(INFO) << "finish to calculate delete bitmap on transaction."
116+
LOG(INFO) << "Finished calculating delete bitmap on transaction."
117117
<< "transaction_id=" << transaction_id << ", cost(us): " << watch.get_elapse_time_us()
118118
<< ", error_tablet_size=" << _error_tablet_ids->size()
119119
<< ", res=" << _res.to_string();
@@ -145,7 +145,7 @@ void CloudTabletCalcDeleteBitmapTask::set_tablet_state(int64_t tablet_state) {
145145
}
146146

147147
Status CloudTabletCalcDeleteBitmapTask::handle() const {
148-
VLOG_DEBUG << "start calculate delete bitmap on tablet " << _tablet_id
148+
VLOG_DEBUG << "Start calculating delete bitmap on tablet " << _tablet_id
149149
<< ", txn_id=" << _transaction_id;
150150
SCOPED_ATTACH_TASK(_mem_tracker);
151151
int64_t t1 = MonotonicMicros();
@@ -236,7 +236,7 @@ Status CloudTabletCalcDeleteBitmapTask::handle() const {
236236
for (const auto& sub_txn_id : _sub_txn_ids) {
237237
ss << sub_txn_id << ", ";
238238
}
239-
LOG(INFO) << "start calc delete bitmap for txn_id=" << _transaction_id << ", sub_txn_ids=["
239+
LOG(INFO) << "Start calculating delete bitmap for txn_id=" << _transaction_id << ", sub_txn_ids=["
240240
<< ss.str() << "], table_id=" << tablet->table_id()
241241
<< ", partition_id=" << tablet->partition_id() << ", tablet_id=" << _tablet_id
242242
<< ", start_version=" << _version;
@@ -255,7 +255,7 @@ Status CloudTabletCalcDeleteBitmapTask::handle() const {
255255
empty_rowset_count++;
256256
continue;
257257
}
258-
LOG(INFO) << "start calc delete bitmap for txn_id=" << _transaction_id
258+
LOG(INFO) << "Start calculating delete bitmap for txn_id=" << _transaction_id
259259
<< ", sub_txn_id=" << sub_txn_id << ", table_id=" << tablet->table_id()
260260
<< ", partition_id=" << tablet->partition_id() << ", tablet_id=" << _tablet_id
261261
<< ", start_version=" << _version << ", cur_version=" << version;
@@ -283,7 +283,7 @@ Status CloudTabletCalcDeleteBitmapTask::handle() const {
283283
}
284284
});
285285
auto total_update_delete_bitmap_time_us = MonotonicMicros() - t3;
286-
LOG(INFO) << "finish calculate delete bitmap on tablet"
286+
LOG(INFO) << "Finished calculating delete bitmap on tablet"
287287
<< ", table_id=" << tablet->table_id() << ", transaction_id=" << _transaction_id
288288
<< ", tablet_id=" << tablet->tablet_id()
289289
<< ", get_tablet_time_us=" << get_tablet_time_us

be/src/cloud/cloud_rowset_writer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Status CloudRowsetWriter::init(const RowsetWriterContext& rowset_writer_context)
8282
}
8383

8484
Status CloudRowsetWriter::_build_rowset_meta(RowsetMeta* rowset_meta, bool check_segment_num) {
85-
VLOG_NOTICE << "Starting to build rowset meta. tablet_id=" << rowset_meta->tablet_id()
85+
VLOG_NOTICE << "Start building rowset meta. tablet_id=" << rowset_meta->tablet_id()
8686
<< ", rowset_id=" << rowset_meta->rowset_id()
8787
<< ", check_segment_num=" << check_segment_num;
8888
// Call base class implementation
@@ -162,7 +162,7 @@ Status CloudRowsetWriter::build(RowsetSharedPtr& rowset) {
162162
}
163163

164164
Status CloudRowsetWriter::_collect_all_packed_slice_locations(RowsetMeta* rowset_meta) {
165-
VLOG_NOTICE << "Starting to collect packed slice locations for rowset meta. tablet_id="
165+
VLOG_NOTICE << "Start collecting packed slice locations for rowset meta. tablet_id="
166166
<< rowset_meta->tablet_id() << ", rowset_id=" << rowset_meta->rowset_id();
167167
if (!_context.packed_file_active) {
168168
return Status::OK();

be/src/cloud/cloud_snapshot_loader.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Status CloudSnapshotLoader::download(const std::map<std::string, std::string>& s
7878
return Status::InternalError("Storage backend not initialized.");
7979
}
8080

81-
LOG(INFO) << "Starting to transfer snapshot files. num: " << src_to_dest_path.size()
81+
LOG(INFO) << "Start transferring snapshot files. num: " << src_to_dest_path.size()
8282
<< ", broker addr: " << _broker_addr << ", job: " << _job_id
8383
<< ", task id: " << _task_id;
8484

@@ -187,7 +187,7 @@ Status CloudSnapshotLoader::download(const std::map<std::string, std::string>& s
187187
RETURN_IF_ERROR(_engine.cloud_snapshot_mgr().make_snapshot(
188188
target_tablet_id, *_storage_resource, file_mapping, true, &hdr_slice));
189189

190-
LOG(INFO) << "finish to make snapshot for tablet: " << target_tablet_id;
190+
LOG(INFO) << "Finished making snapshot for tablet: " << target_tablet_id;
191191

192192
// 1.5. download files
193193
for (auto& nested_iter : remote_files) {
@@ -202,7 +202,7 @@ Status CloudSnapshotLoader::download(const std::map<std::string, std::string>& s
202202
std::string target_file = find->second;
203203
std::string full_remote_file = remote_path + "/" + remote_file + "." + file_stat.md5;
204204
std::string full_target_file = target_path + "/" + target_file;
205-
LOG(INFO) << "Starting to download from " << full_remote_file << " to "
205+
LOG(INFO) << "Start downloading from " << full_remote_file << " to "
206206
<< full_target_file;
207207
io::FileReaderOptions nested_reader_options {
208208
.cache_type = io::FileCachePolicy::NO_CACHE,
@@ -239,7 +239,7 @@ Status CloudSnapshotLoader::download(const std::map<std::string, std::string>& s
239239
// (TODO) Add bvar metrics to track download time
240240
} // end for src_to_dest_path
241241

242-
LOG(INFO) << "Finished download snapshots. job: " << _job_id << ", task id: " << _task_id;
242+
LOG(INFO) << "Finished downloading snapshots. job: " << _job_id << ", task id: " << _task_id;
243243
return status;
244244
}
245245

be/src/cloud/cloud_tablet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ void CloudTablet::delete_rowsets(const std::vector<RowsetSharedPtr>& to_delete,
493493

494494
uint64_t CloudTablet::delete_expired_stale_rowsets() {
495495
if (config::enable_mow_verbose_log) {
496-
LOG_INFO("begin delete_expired_stale_rowset for tablet={}", tablet_id());
496+
LOG_INFO("Begin to delete_expired_stale_rowset for tablet={}", tablet_id());
497497
}
498498
std::vector<RowsetSharedPtr> expired_rowsets;
499499
// ATTN: trick, Use stale_rowsets to temporarily increase the reference count of the rowset shared pointer in _stale_rs_version_map so that in the recycle_cached_data function, it checks if the reference count is 2.
@@ -554,7 +554,7 @@ uint64_t CloudTablet::delete_expired_stale_rowsets() {
554554
manager.recycle_cache(tablet_id(), recycled_rowsets);
555555
}
556556
if (config::enable_mow_verbose_log) {
557-
LOG_INFO("finish delete_expired_stale_rowset for tablet={}", tablet_id());
557+
LOG_INFO("Finished deleting_expired_stale_rowset for tablet={}", tablet_id());
558558
}
559559

560560
add_unused_rowsets(expired_rowsets);

be/src/cloud/cloud_tablet_mgr.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ void CloudTabletMgr::erase_tablet(int64_t tablet_id) {
295295
}
296296

297297
void CloudTabletMgr::vacuum_stale_rowsets(const CountDownLatch& stop_latch) {
298-
LOG_INFO("Starting to vacuum stale rowsets");
298+
LOG_INFO("Start vacuuming stale rowsets");
299299
std::vector<std::shared_ptr<CloudTablet>> tablets_to_vacuum;
300300
tablets_to_vacuum.reserve(_tablet_map->size());
301301
_tablet_map->traverse([&tablets_to_vacuum](auto&& t) {
@@ -311,12 +311,12 @@ void CloudTabletMgr::vacuum_stale_rowsets(const CountDownLatch& stop_latch) {
311311

312312
num_vacuumed += t->delete_expired_stale_rowsets();
313313
}
314-
LOG_INFO("finish vacuum stale rowsets")
314+
LOG_INFO("Finished vacuuming stale rowsets")
315315
.tag("num_vacuumed", num_vacuumed)
316316
.tag("num_tablets", tablets_to_vacuum.size());
317317

318318
{
319-
LOG_INFO("Starting to remove unused rowsets");
319+
LOG_INFO("Start removing unused rowsets");
320320
std::vector<std::shared_ptr<CloudTablet>> tablets_to_remove_unused_rowsets;
321321
tablets_to_remove_unused_rowsets.reserve(_tablet_map->size());
322322
_tablet_map->traverse([&tablets_to_remove_unused_rowsets](auto&& t) {
@@ -327,7 +327,7 @@ void CloudTabletMgr::vacuum_stale_rowsets(const CountDownLatch& stop_latch) {
327327
for (auto& t : tablets_to_remove_unused_rowsets) {
328328
t->remove_unused_rowsets();
329329
}
330-
LOG_INFO("finish remove unused rowsets")
330+
LOG_INFO("Finished removing unused rowsets")
331331
.tag("num_tablets", tablets_to_remove_unused_rowsets.size());
332332
if (config::enable_check_agg_and_remove_pre_rowsets_delete_bitmap) {
333333
int64_t max_useless_rowset_count = 0;
@@ -352,7 +352,7 @@ void CloudTabletMgr::vacuum_stale_rowsets(const CountDownLatch& stop_latch) {
352352
g_max_rowsets_with_useless_delete_bitmap.set_value(max_useless_rowset_count);
353353
g_max_rowsets_with_useless_delete_bitmap_version.set_value(
354354
max_useless_rowset_version_count);
355-
LOG(INFO) << "finish check_agg_delete_bitmap_for_stale_rowsets, cost(us)="
355+
LOG(INFO) << "Finished check_agg_delete_bitmap_for_stale_rowsetsing, cost(us)="
356356
<< watch.get_elapse_time_us()
357357
<< ". max useless rowset count=" << max_useless_rowset_count
358358
<< ", tablet_id=" << tablet_id_with_max_useless_rowset_count
@@ -374,7 +374,7 @@ std::vector<std::weak_ptr<CloudTablet>> CloudTabletMgr::get_weak_tablets() {
374374
}
375375

376376
void CloudTabletMgr::sync_tablets(const CountDownLatch& stop_latch) {
377-
LOG_INFO("Starting to sync tablets");
377+
LOG_INFO("Start syncing tablets");
378378
int64_t last_sync_time_bound = ::time(nullptr) - config::tablet_sync_interval_s;
379379

380380
auto weak_tablets = get_weak_tablets();
@@ -421,7 +421,7 @@ void CloudTabletMgr::sync_tablets(const CountDownLatch& stop_latch) {
421421
}
422422
}
423423
}
424-
LOG_INFO("finish sync tablets").tag("num_sync", num_sync);
424+
LOG_INFO("Finished syncing tablets").tag("num_sync", num_sync);
425425
}
426426

427427
Status CloudTabletMgr::get_topn_tablets_to_compact(
@@ -523,7 +523,7 @@ Status CloudTabletMgr::get_topn_tablets_to_compact(
523523
void CloudTabletMgr::build_all_report_tablets_info(std::map<TTabletId, TTablet>* tablets_info,
524524
uint64_t* tablet_num) {
525525
DCHECK(tablets_info != nullptr);
526-
VLOG_NOTICE << "Starting to build all report cloud tablets info";
526+
VLOG_NOTICE << "Start building all report cloud tablets info";
527527

528528
HistogramStat tablet_version_num_hist;
529529

be/src/exec/operator/olap_scan_operator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ Status OlapScanLocalState::prepare(RuntimeState* state) {
774774
}
775775
if (config::enable_mow_verbose_log &&
776776
_tablets[i].tablet->enable_unique_key_merge_on_write()) {
777-
LOG_INFO("finish capture_rs_readers for tablet={}, query_id={}",
777+
LOG_INFO("Finished capturing_rs_readers for tablet={}, query_id={}",
778778
_tablets[i].tablet->tablet_id(),
779779
print_id(PipelineXLocalState<>::_state->query_id()));
780780
}

be/src/exec/sink/writer/vtablet_writer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,7 @@ Status VTabletWriter::close(Status exec_status) {
19801980

19811981
// print log of add batch time of all node, for tracing load performance easily
19821982
std::stringstream ss;
1983-
ss << "Finished close olap table sink. load_id=" << print_id(_load_id)
1983+
ss << "Finished closing olap table sink. load_id=" << print_id(_load_id)
19841984
<< ", txn_id=" << _txn_id
19851985
<< ", node add batch time(ms)/wait execution time(ms)/close time(ms)/num: ";
19861986
for (auto const& pair : node_add_batch_counter_map) {

0 commit comments

Comments
 (0)