fix

Author: koarz

be/src/cloud/cloud_base_compaction.cpp

@@ -303,8 +303,8 @@ Status CloudBaseCompaction::execute_compact() {
             .tag("output_rowset_data_size", _output_rowset->data_disk_size())
             .tag("output_rowset_index_size", _output_rowset->index_disk_size())
             .tag("output_rowset_total_size", _output_rowset->total_disk_size())
-            .tag("local_read_time_ns", _stats.cloud_local_read_time)
-            .tag("remote_read_time_ns", _stats.cloud_remote_read_time);
+            .tag("local_read_time_ms", _stats.cloud_local_read_time)
+            .tag("remote_read_time_ms", _stats.cloud_remote_read_time);
 
     //_compaction_succeed = true;
     _state = CompactionState::SUCCESS;

be/src/cloud/cloud_cumulative_compaction.cpp

@@ -227,8 +227,8 @@ Status CloudCumulativeCompaction::execute_compact() {
             .tag("cumulative_point", cloud_tablet()->cumulative_layer_point())
             .tag("num_rowsets", cloud_tablet()->fetch_add_approximate_num_rowsets(0))
             .tag("cumu_num_rowsets", cloud_tablet()->fetch_add_approximate_cumu_num_rowsets(0))
-            .tag("local_read_time_ns", _stats.cloud_local_read_time)
-            .tag("remote_read_time_ns", _stats.cloud_remote_read_time);
+            .tag("local_read_time_ms", _stats.cloud_local_read_time)
+            .tag("remote_read_time_ms", _stats.cloud_remote_read_time);
 
     _state = CompactionState::SUCCESS;
 

be/src/cloud/cloud_full_compaction.cpp

@@ -183,8 +183,8 @@ Status CloudFullCompaction::execute_compact() {
             .tag("output_rowset_data_size", _output_rowset->data_disk_size())
             .tag("output_rowset_index_size", _output_rowset->index_disk_size())
             .tag("output_rowset_total_size", _output_rowset->total_disk_size())
-            .tag("local_read_time_ns", _stats.cloud_local_read_time)
-            .tag("remote_read_time_ns", _stats.cloud_remote_read_time);
+            .tag("local_read_time_ms", _stats.cloud_local_read_time)
+            .tag("remote_read_time_ms", _stats.cloud_remote_read_time);
 
     _state = CompactionState::SUCCESS;
 

be/src/cloud/cloud_tablet.cpp

@@ -17,6 +17,7 @@
 
 #include "cloud/cloud_tablet.h"
 
+#include <gen_cpp/Types_types.h>
 #include <gen_cpp/olap_file.pb.h>
 #include <rapidjson/document.h>
 #include <rapidjson/encodings.h>
@@ -733,6 +734,21 @@ void CloudTablet::get_compaction_status(std::string* json_result) {
                                            cast_set<uint>(_last_full_compaction_status.length()),
                                            root.GetAllocator());
     root.AddMember("last full status", full_compaction_status_value, root.GetAllocator());
+    rapidjson::Value exec_compaction_time;
+    std::string num_str {std::to_string(exec_compaction_time_ms.load())};
+    full_schedule_value.SetString(num_str.c_str(), cast_set<uint>(num_str.length()),
+                                  root.GetAllocator());
+    root.AddMember("exec compaction time ms", full_schedule_value, root.GetAllocator());
+    rapidjson::Value local_read_time;
+    num_str = std::to_string(local_read_time_ms.load());
+    full_schedule_value.SetString(num_str.c_str(), cast_set<uint>(num_str.length()),
+                                  root.GetAllocator());
+    root.AddMember("compaction local read time ms", full_schedule_value, root.GetAllocator());
+    rapidjson::Value remote_read_time;
+    num_str = std::to_string(remote_read_time_ms.load());
+    full_schedule_value.SetString(num_str.c_str(), cast_set<uint>(num_str.length()),
+                                  root.GetAllocator());
+    root.AddMember("compaction remote read time ms", full_schedule_value, root.GetAllocator());
 
     // print all rowsets' version as an array
     rapidjson::Document versions_arr;

be/src/cloud/cloud_tablet.h

@@ -260,6 +260,10 @@ class CloudTablet final : public BaseTablet {
     int64_t last_cumu_no_suitable_version_ms = 0;
     int64_t last_access_time_ms = 0;
 
+    std::atomic<int64_t> local_read_time_ms = 0;
+    std::atomic<int64_t> remote_read_time_ms = 0;
+    std::atomic<int64_t> exec_compaction_time_ms = 0;
+
     // Return merged extended schema
     TabletSchemaSPtr merged_tablet_schema() const override;
 

be/src/olap/compaction.cpp

@@ -38,6 +38,7 @@
 
 #include "cloud/cloud_meta_mgr.h"
 #include "cloud/cloud_storage_engine.h"
+#include "cloud/cloud_tablet.h"
 #include "common/config.h"
 #include "common/status.h"
 #include "cpp/sync_point.h"
@@ -1468,6 +1469,12 @@ Status CloudCompactionMixin::execute_compact_impl(int64_t permits) {
     // 4. modify rowsets in memory
     RETURN_IF_ERROR(modify_rowsets());
 
+    // update compaction status data
+    auto tablet = std::static_pointer_cast<CloudTablet>(_tablet);
+    tablet->local_read_time_ms.fetch_add(_stats.cloud_local_read_time);
+    tablet->remote_read_time_ms.fetch_add(_stats.cloud_remote_read_time);
+    tablet->exec_compaction_time_ms.fetch_add(watch.get_elapse_time_us() / 1000);
+
     return Status::OK();
 }
 

be/src/olap/merger.cpp

@@ -145,8 +145,10 @@ Status Merger::vmerge_rowsets(BaseTabletSPtr tablet, ReaderType reader_type,
         stats_output->merged_rows = reader.merged_rows();
         stats_output->filtered_rows = reader.filtered_rows();
         if (config::is_cloud_mode()) {
-            stats_output->cloud_local_read_time = reader.stats().file_cache_stats.local_io_timer;
-            stats_output->cloud_remote_read_time = reader.stats().file_cache_stats.remote_io_timer;
+            stats_output->cloud_local_read_time =
+                    reader.stats().file_cache_stats.local_io_timer / 1000 / 1000;
+            stats_output->cloud_remote_read_time =
+                    reader.stats().file_cache_stats.remote_io_timer / 1000 / 1000;
         }
     }
 
@@ -325,8 +327,10 @@ Status Merger::vertical_compact_one_group(
         stats_output->merged_rows = reader.merged_rows();
         stats_output->filtered_rows = reader.filtered_rows();
         if (config::is_cloud_mode()) {
-            stats_output->cloud_local_read_time = reader.stats().file_cache_stats.local_io_timer;
-            stats_output->cloud_remote_read_time = reader.stats().file_cache_stats.remote_io_timer;
+            stats_output->cloud_local_read_time =
+                    reader.stats().file_cache_stats.local_io_timer / 1000 / 1000;
+            stats_output->cloud_remote_read_time =
+                    reader.stats().file_cache_stats.remote_io_timer / 1000 / 1000;
         }
     }
     RETURN_IF_ERROR(dst_rowset_writer->flush_columns(is_key));