This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new aae04d9680 [Chore](log) Remove some verbose log && Change log level
(#20236)
aae04d9680 is described below
commit aae04d9680de25e9f08455d429b33c62c31c60b0
Author: Jack Drogon <[email protected]>
AuthorDate: Wed May 31 09:15:01 2023 +0800
[Chore](log) Remove some verbose log && Change log level (#20236)
---
be/src/olap/olap_meta.cpp | 10 ++++------
be/src/olap/rowset/beta_rowset.cpp | 6 +++---
be/src/olap/rowset/rowset_meta_manager.cpp | 16 +++++++---------
be/src/olap/txn_manager.cpp | 5 ++---
be/src/service/backend_service.cpp | 2 --
5 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/be/src/olap/olap_meta.cpp b/be/src/olap/olap_meta.cpp
index 2a31617216..889090d36c 100644
--- a/be/src/olap/olap_meta.cpp
+++ b/be/src/olap/olap_meta.cpp
@@ -145,8 +145,8 @@ Status OlapMeta::put(const int column_family_index, const
std::string& key,
DorisMetrics::instance()->meta_write_request_total->increment(1);
// log all params
- LOG(INFO) << "column_family_index: " << column_family_index << ", key: "
<< key
- << ", value: " << value;
+ VLOG_DEBUG << "column_family_index: " << column_family_index << ", key: "
<< key
+ << ", value: " << value;
auto& handle = _handles[column_family_index];
rocksdb::Status s;
@@ -172,8 +172,6 @@ Status OlapMeta::put(const int column_family_index, const
std::string& key,
Status OlapMeta::put(const int column_family_index, const
std::vector<BatchEntry>& entries) {
DorisMetrics::instance()->meta_write_request_total->increment(1);
- // log all params
-
auto* handle = _handles[column_family_index].get();
rocksdb::Status s;
{
@@ -186,8 +184,8 @@ Status OlapMeta::put(const int column_family_index, const
std::vector<BatchEntry
// construct write batch
rocksdb::WriteBatch write_batch;
for (auto entry : entries) {
- LOG(INFO) << "column_family_index: " << column_family_index << ",
key: " << entry.key
- << ", value: " << entry.value;
+ VLOG_DEBUG << "column_family_index: " << column_family_index << ",
key: " << entry.key
+ << ", value: " << entry.value;
write_batch.Put(handle, rocksdb::Slice(entry.key),
rocksdb::Slice(entry.value));
}
diff --git a/be/src/olap/rowset/beta_rowset.cpp
b/be/src/olap/rowset/beta_rowset.cpp
index 4ab84dd710..e0cbee0f5b 100644
--- a/be/src/olap/rowset/beta_rowset.cpp
+++ b/be/src/olap/rowset/beta_rowset.cpp
@@ -414,8 +414,8 @@ Status BetaRowset::add_to_binlog() {
std::string binlog_dir;
auto segments_num = num_segments();
- LOG(INFO) << fmt::format("add rowset to binlog. rowset_id={},
segments_num={}",
- rowset_id().to_string(), segments_num);
+ VLOG_DEBUG << fmt::format("add rowset to binlog. rowset_id={},
segments_num={}",
+ rowset_id().to_string(), segments_num);
for (int i = 0; i < segments_num; ++i) {
auto seg_file = segment_file_path(i);
@@ -432,7 +432,7 @@ Status BetaRowset::add_to_binlog() {
auto binlog_file =
(std::filesystem::path(binlog_dir) /
std::filesystem::path(seg_file).filename())
.string();
- LOG(INFO) << "link " << seg_file << " to " << binlog_file;
+ VLOG_DEBUG << "link " << seg_file << " to " << binlog_file;
if (!local_fs->link_file(seg_file, binlog_file).ok()) {
LOG(WARNING) << "fail to create hard link. from=" << seg_file <<
", "
<< "to=" << binlog_file << ", errno=" << Errno::no();
diff --git a/be/src/olap/rowset/rowset_meta_manager.cpp
b/be/src/olap/rowset/rowset_meta_manager.cpp
index f84282feaf..29e5a4eae3 100644
--- a/be/src/olap/rowset/rowset_meta_manager.cpp
+++ b/be/src/olap/rowset/rowset_meta_manager.cpp
@@ -166,14 +166,14 @@ std::vector<std::string>
RowsetMetaManager::get_binlog_filenames(OlapMeta* meta,
std::string_view binlog_version,
int64_t
segment_idx) {
auto prefix_key = make_binlog_filename_key(tablet_uid, binlog_version);
- LOG(INFO) << fmt::format("prefix_key:{}", prefix_key);
+ VLOG_DEBUG << fmt::format("prefix_key:{}", prefix_key);
std::vector<std::string> binlog_files;
std::string rowset_id;
int64_t num_segments = -1;
auto traverse_func = [&rowset_id, &num_segments](const std::string& key,
const std::string& value)
-> bool {
- LOG(INFO) << fmt::format("key:{}, value:{}", key, value);
+ VLOG_DEBUG << fmt::format("key:{}, value:{}", key, value);
// key is
'binglog_meta_6943f1585fe834b5-e542c2b83a21d0b7_00000000000000000069_020000000000000135449d7cd7eadfe672aa0f928fa99593',
extract last part '020000000000000135449d7cd7eadfe672aa0f928fa99593'
// check starts with "binlog_meta_"
if (!starts_with_binlog_meta(key)) {
@@ -196,7 +196,6 @@ std::vector<std::string>
RowsetMetaManager::get_binlog_filenames(OlapMeta* meta,
return false;
};
- LOG(INFO) << "result:" << rowset_id;
// get binlog meta by prefix
Status status = meta->iterate(META_COLUMN_FAMILY_INDEX, prefix_key,
traverse_func);
@@ -224,16 +223,16 @@ std::vector<std::string>
RowsetMetaManager::get_binlog_filenames(OlapMeta* meta,
std::pair<std::string, int64_t> RowsetMetaManager::get_binlog_info(
OlapMeta* meta, TabletUid tablet_uid, std::string_view binlog_version)
{
- LOG(INFO) << fmt::format("tablet_uid:{}, binlog_version:{}",
tablet_uid.to_string(),
- binlog_version);
+ VLOG_DEBUG << fmt::format("tablet_uid:{}, binlog_version:{}",
tablet_uid.to_string(),
+ binlog_version);
auto prefix_key = make_binlog_filename_key(tablet_uid, binlog_version);
- LOG(INFO) << fmt::format("prefix_key:{}", prefix_key);
+ VLOG_DEBUG << fmt::format("prefix_key:{}", prefix_key);
std::string rowset_id;
int64_t num_segments = -1;
auto traverse_func = [&rowset_id, &num_segments](const std::string& key,
const std::string& value)
-> bool {
- LOG(INFO) << fmt::format("key:{}, value:{}", key, value);
+ VLOG_DEBUG << fmt::format("key:{}, value:{}", key, value);
// key is
'binglog_meta_6943f1585fe834b5-e542c2b83a21d0b7_00000000000000000069_020000000000000135449d7cd7eadfe672aa0f928fa99593',
extract last part '020000000000000135449d7cd7eadfe672aa0f928fa99593'
auto pos = key.rfind("_");
if (pos == std::string::npos) {
@@ -248,7 +247,6 @@ std::pair<std::string, int64_t>
RowsetMetaManager::get_binlog_info(
return false;
};
- LOG(INFO) << "result:" << rowset_id;
// get binlog meta by prefix
Status status = meta->iterate(META_COLUMN_FAMILY_INDEX, prefix_key,
traverse_func);
@@ -267,7 +265,7 @@ std::string
RowsetMetaManager::get_binlog_rowset_meta(OlapMeta* meta, TabletUid
std::string_view
binlog_version,
std::string_view
rowset_id) {
auto binlog_data_key = make_binlog_data_key(tablet_uid.to_string(),
binlog_version, rowset_id);
- LOG(INFO) << fmt::format("get binlog_meta_key:{}", binlog_data_key);
+ VLOG_DEBUG << fmt::format("get binlog_meta_key:{}", binlog_data_key);
std::string binlog_meta_value;
Status status = meta->get(META_COLUMN_FAMILY_INDEX, binlog_data_key,
&binlog_meta_value);
diff --git a/be/src/olap/txn_manager.cpp b/be/src/olap/txn_manager.cpp
index 1ae78379e4..37fc94bd23 100644
--- a/be/src/olap/txn_manager.cpp
+++ b/be/src/olap/txn_manager.cpp
@@ -394,7 +394,6 @@ Status TxnManager::publish_txn(OlapMeta* meta, TPartitionId
partition_id,
/// Step 4: save meta
auto status = RowsetMetaManager::save(meta, tablet_uid,
rowset->rowset_id(),
rowset->rowset_meta()->get_rowset_pb(), enable_binlog);
- LOG(INFO) << "rowset meta pb: " <<
rowset->rowset_meta()->get_rowset_pb().DebugString();
if (!status.ok()) {
LOG(WARNING) << "save committed rowset failed. when publish txn
rowset_id:"
<< rowset->rowset_id() << ", tablet id: " << tablet_id
@@ -405,8 +404,8 @@ Status TxnManager::publish_txn(OlapMeta* meta, TPartitionId
partition_id,
// TODO(Drogon): remove these test codes
if (enable_binlog) {
auto version_str = fmt::format("{}", version.first);
- LOG(INFO) << fmt::format("tabletid: {}, version: {}, binlog filepath:
{}", tablet_id,
- version_str,
tablet->get_binlog_filepath(version_str));
+ VLOG_DEBUG << fmt::format("tabletid: {}, version: {}, binlog filepath:
{}", tablet_id,
+ version_str,
tablet->get_binlog_filepath(version_str));
}
/// Step 5: remove tablet_info from tnx_tablet_map
diff --git a/be/src/service/backend_service.cpp
b/be/src/service/backend_service.cpp
index f555004dd1..a5e528b45f 100644
--- a/be/src/service/backend_service.cpp
+++ b/be/src/service/backend_service.cpp
@@ -526,14 +526,12 @@ void BackendService::ingest_binlog(TIngestBinlogResult&
result,
status.to_thrift(&tstatus);
return;
}
- LOG(INFO) << "remote rowset meta pb: " <<
rowset_meta_pb.ShortDebugString();
// rewrite rowset meta
rowset_meta_pb.set_tablet_id(local_tablet_id);
rowset_meta_pb.set_partition_id(local_tablet->tablet_meta()->partition_id());
rowset_meta_pb.set_tablet_schema_hash(local_tablet->tablet_meta()->schema_hash());
rowset_meta_pb.set_txn_id(txn_id);
rowset_meta_pb.set_rowset_state(RowsetStatePB::COMMITTED);
- LOG(INFO) << "local rowset meta pb: " << rowset_meta_pb.ShortDebugString();
auto rowset_meta = std::make_shared<RowsetMeta>();
if (!rowset_meta->init_from_pb(rowset_meta_pb)) {
LOG(WARNING) << "failed to init rowset meta from " <<
get_rowset_meta_url;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
