You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2019/10/11 11:58:42 UTC
[incubator-doris] branch master updated: Ignore some compaction
errors to reduce logs (#1955)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 71731b2 Ignore some compaction errors to reduce logs (#1955)
71731b2 is described below
commit 71731b25f4f97d87b7dc3e128b87c38cf440d170
Author: yiguolei <yi...@baidu.com>
AuthorDate: Fri Oct 11 19:58:38 2019 +0800
Ignore some compaction errors to reduce logs (#1955)
---
be/src/olap/base_compaction.cpp | 3 ---
be/src/olap/cumulative_compaction.cpp | 6 ------
be/src/olap/storage_engine.cpp | 18 +++++++++++-------
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/be/src/olap/base_compaction.cpp b/be/src/olap/base_compaction.cpp
index a77c6cc..cc64543 100644
--- a/be/src/olap/base_compaction.cpp
+++ b/be/src/olap/base_compaction.cpp
@@ -60,9 +60,6 @@ OLAPStatus BaseCompaction::pick_rowsets_to_compact() {
_input_rowsets.clear();
_tablet->pick_candicate_rowsets_to_base_compaction(&_input_rowsets);
if (_input_rowsets.size() <= 1) {
- LOG(WARNING) << "There is no enough rowsets to do base compaction."
- << ", the size of rowsets to compact=" << _input_rowsets.size()
- << ", cumulative_point=" << _tablet->cumulative_layer_point();
return OLAP_ERR_CUMULATIVE_NO_SUITABLE_VERSIONS;
}
diff --git a/be/src/olap/cumulative_compaction.cpp b/be/src/olap/cumulative_compaction.cpp
index ea09cf3..245e0f1 100755
--- a/be/src/olap/cumulative_compaction.cpp
+++ b/be/src/olap/cumulative_compaction.cpp
@@ -68,9 +68,6 @@ OLAPStatus CumulativeCompaction::pick_rowsets_to_compact() {
_tablet->pick_candicate_rowsets_to_cumulative_compaction(&candidate_rowsets);
if (candidate_rowsets.size() <= 1) {
- LOG(WARNING) << "There is no enough rowsets to cumulative compaction. "
- << "The size of rowsets to compact=" << candidate_rowsets.size()
- << ", cumulative_point=" << _tablet->cumulative_layer_point();
return OLAP_ERR_CUMULATIVE_NO_SUITABLE_VERSIONS;
}
@@ -120,9 +117,6 @@ OLAPStatus CumulativeCompaction::pick_rowsets_to_compact() {
}
if (_input_rowsets.size() <= 1) {
- LOG(INFO) << "There is no enough rowsets to cumulative compaction."
- << ", the size of rowsets to compact=" << candidate_rowsets.size()
- << ", cumulative_point=" << _tablet->cumulative_layer_point();
return OLAP_ERR_CUMULATIVE_NO_SUITABLE_VERSIONS;
}
diff --git a/be/src/olap/storage_engine.cpp b/be/src/olap/storage_engine.cpp
index 7ce5665..b15b6aa 100644
--- a/be/src/olap/storage_engine.cpp
+++ b/be/src/olap/storage_engine.cpp
@@ -558,11 +558,13 @@ void StorageEngine::perform_cumulative_compaction(DataDir* data_dir) {
OLAPStatus res = cumulative_compaction.compact();
if (res != OLAP_SUCCESS) {
- DorisMetrics::cumulative_compaction_request_failed.increment(1);
best_tablet->set_last_compaction_failure_time(UnixMillis());
- LOG(WARNING) << "failed to do cumulative compaction. res=" << res
- << ", table=" << best_tablet->full_name()
- << ", res=" << res;
+ if (res != OLAP_ERR_CUMULATIVE_NO_SUITABLE_VERSIONS) {
+ DorisMetrics::cumulative_compaction_request_failed.increment(1);
+ LOG(WARNING) << "failed to do cumulative compaction. res=" << res
+ << ", table=" << best_tablet->full_name()
+ << ", res=" << res;
+ }
return;
}
best_tablet->set_last_compaction_failure_time(0);
@@ -576,10 +578,12 @@ void StorageEngine::perform_base_compaction(DataDir* data_dir) {
BaseCompaction base_compaction(best_tablet);
OLAPStatus res = base_compaction.compact();
if (res != OLAP_SUCCESS) {
- DorisMetrics::base_compaction_request_failed.increment(1);
best_tablet->set_last_compaction_failure_time(UnixMillis());
- LOG(WARNING) << "failed to init base compaction. res=" << res
- << ", table=" << best_tablet->full_name();
+ if (res != OLAP_ERR_CUMULATIVE_NO_SUITABLE_VERSIONS) {
+ DorisMetrics::base_compaction_request_failed.increment(1);
+ LOG(WARNING) << "failed to init base compaction. res=" << res
+ << ", table=" << best_tablet->full_name();
+ }
return;
}
best_tablet->set_last_compaction_failure_time(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org