chaoyli commented on a change in pull request #4440:
URL: https://github.com/apache/incubator-doris/pull/4440#discussion_r481784554
##########
File path: be/src/olap/olap_server.cpp
##########
@@ -263,27 +238,24 @@ void*
StorageEngine::_garbage_sweeper_thread_callback(void* arg) {
// do nothing. continue next loop.
}
}
-
- return nullptr;
}
-void* StorageEngine::_disk_stat_monitor_thread_callback(void* arg) {
+void StorageEngine::_disk_stat_monitor_thread_callback() {
#ifdef GOOGLE_PROFILER
ProfilerRegisterThread();
#endif
- while (!_stop_bg_worker) {
+
+ int32_t interval = config::disk_stat_monitor_interval;
+ do {
_start_disk_stat_monitor();
- int32_t interval = config::disk_stat_monitor_interval;
+ interval = config::disk_stat_monitor_interval;
Review comment:
redundant assignment
##########
File path: be/src/olap/olap_server.cpp
##########
@@ -330,108 +303,92 @@ void*
StorageEngine::_cumulative_compaction_thread_callback(void* arg, DataDir*
_perform_cumulative_compaction(data_dir);
}
}
- int32_t interval =
config::cumulative_compaction_check_interval_seconds;
+
+ interval = config::cumulative_compaction_check_interval_seconds;
if (interval <= 0) {
LOG(WARNING) << "cumulative compaction check interval config is
illegal:" << interval
<< "will be forced set to one";
interval = 1;
}
- SLEEP_IN_BG_WORKER(interval);
- }
-
- return nullptr;
+ } while
(!_stop_background_threads_latch.wait_for(MonoDelta::FromSeconds(interval)));
}
-void* StorageEngine::_unused_rowset_monitor_thread_callback(void* arg) {
+void StorageEngine::_unused_rowset_monitor_thread_callback() {
#ifdef GOOGLE_PROFILER
ProfilerRegisterThread();
#endif
- while (!_stop_bg_worker) {
+ int32_t interval = config::unused_rowset_monitor_interval;
+ do {
start_delete_unused_rowset();
- int32_t interval = config::unused_rowset_monitor_interval;
+ interval = config::unused_rowset_monitor_interval;
if (interval <= 0) {
LOG(WARNING) << "unused_rowset_monitor_interval config is illegal:
" << interval
<< ", force set to 1";
interval = 1;
}
- SLEEP_IN_BG_WORKER(interval);
- }
-
- return nullptr;
+ } while
(!_stop_background_threads_latch.wait_for(MonoDelta::FromSeconds(interval)));
}
-
-
-void* StorageEngine::_path_gc_thread_callback(void* arg) {
+void StorageEngine::_path_gc_thread_callback(DataDir* data_dir) {
#ifdef GOOGLE_PROFILER
ProfilerRegisterThread();
#endif
LOG(INFO) << "try to start path gc thread!";
-
- while (!_stop_bg_worker) {
+ int32_t interval = config::path_gc_check_interval_second;
+ do {
LOG(INFO) << "try to perform path gc by tablet!";
- ((DataDir*)arg)->perform_path_gc_by_tablet();
+ data_dir->perform_path_gc_by_tablet();
LOG(INFO) << "try to perform path gc by rowsetid!";
- // perform path gc by rowset id
- ((DataDir*)arg)->perform_path_gc_by_rowsetid();
+ data_dir->perform_path_gc_by_rowsetid();
- int32_t interval = config::path_gc_check_interval_second;
+ interval = config::path_gc_check_interval_second;
if (interval <= 0) {
LOG(WARNING) << "path gc thread check interval config is illegal:"
<< interval
<< "will be forced set to half hour";
interval = 1800; // 0.5 hour
}
- SLEEP_IN_BG_WORKER(interval);
- }
-
- return nullptr;
+ } while
(!_stop_background_threads_latch.wait_for(MonoDelta::FromSeconds(interval)));
}
-void* StorageEngine::_path_scan_thread_callback(void* arg) {
+void StorageEngine::_path_scan_thread_callback(DataDir* data_dir) {
#ifdef GOOGLE_PROFILER
ProfilerRegisterThread();
#endif
- LOG(INFO) << "try to start path scan thread!";
-
- while (!_stop_bg_worker) {
+ int32_t interval = config::path_scan_interval_second;
+ do {
LOG(INFO) << "try to perform path scan!";
- ((DataDir*)arg)->perform_path_scan();
+ data_dir->perform_path_scan();
int32_t interval = config::path_scan_interval_second;
Review comment:
redundant assignment
##########
File path: be/src/olap/olap_server.cpp
##########
@@ -208,20 +186,17 @@ void*
StorageEngine::_base_compaction_thread_callback(void* arg, DataDir* data_d
}
}
- int32_t interval = config::base_compaction_check_interval_seconds;
+ interval = config::base_compaction_check_interval_seconds;
Review comment:
abundant assignment
##########
File path: be/src/olap/olap_server.cpp
##########
@@ -330,108 +303,92 @@ void*
StorageEngine::_cumulative_compaction_thread_callback(void* arg, DataDir*
_perform_cumulative_compaction(data_dir);
}
}
- int32_t interval =
config::cumulative_compaction_check_interval_seconds;
+
+ interval = config::cumulative_compaction_check_interval_seconds;
Review comment:
redundant assignment
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
