From 9d0fa780af50b2d8e0d9d9e8983f5a663cfa3a7c Mon Sep 17 00:00:00 2001 From: heyuchen Date: Tue, 31 Aug 2021 11:01:38 +0800 Subject: [PATCH] feat(bulk-load): add table-level bulk load reject count --- rdsn | 2 +- src/server/info_collector.cpp | 1 + src/server/info_collector.h | 3 +++ src/shell/command_helper.h | 5 +++++ src/shell/commands/table_management.cpp | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/rdsn b/rdsn index 2b7cbf5294..a63f4531c2 160000 --- a/rdsn +++ b/rdsn @@ -1 +1 @@ -Subproject commit 2b7cbf5294fbfd05b0b3eda68a60292916cb6370 +Subproject commit a63f4531c2d654e36298586dcf993ad64a49f65f diff --git a/src/server/info_collector.cpp b/src/server/info_collector.cpp index c7f2a84d94..34a2bb763a 100644 --- a/src/server/info_collector.cpp +++ b/src/server/info_collector.cpp @@ -220,6 +220,7 @@ info_collector::app_stat_counters *info_collector::get_app_counters(const std::s INIT_COUNTER(recent_read_throttling_reject_count); INIT_COUNTER(recent_backup_request_throttling_delay_count); INIT_COUNTER(recent_backup_request_throttling_reject_count); + INIT_COUNTER(recent_write_bulk_load_ingestion_reject_count); INIT_COUNTER(storage_mb); INIT_COUNTER(storage_count); INIT_COUNTER(rdb_block_cache_hit_rate); diff --git a/src/server/info_collector.h b/src/server/info_collector.h index a9e8ab0ef7..e63ae20cbf 100644 --- a/src/server/info_collector.h +++ b/src/server/info_collector.h @@ -80,6 +80,8 @@ class info_collector row_stats.recent_backup_request_throttling_delay_count); recent_backup_request_throttling_reject_count->set( row_stats.recent_backup_request_throttling_reject_count); + recent_write_bulk_load_ingestion_reject_count->set( + row_stats.recent_write_bulk_load_ingestion_reject_count); storage_mb->set(row_stats.storage_mb); storage_count->set(row_stats.storage_count); rdb_block_cache_hit_rate->set(convert_to_1M_ratio( @@ -149,6 +151,7 @@ class info_collector ::dsn::perf_counter_wrapper recent_read_throttling_reject_count; ::dsn::perf_counter_wrapper recent_backup_request_throttling_delay_count; ::dsn::perf_counter_wrapper recent_backup_request_throttling_reject_count; + ::dsn::perf_counter_wrapper recent_write_bulk_load_ingestion_reject_count; ::dsn::perf_counter_wrapper storage_mb; ::dsn::perf_counter_wrapper storage_count; ::dsn::perf_counter_wrapper rdb_block_cache_hit_rate; diff --git a/src/shell/command_helper.h b/src/shell/command_helper.h index c6364a413b..2dddd8b6cc 100644 --- a/src/shell/command_helper.h +++ b/src/shell/command_helper.h @@ -627,6 +627,8 @@ struct row_data row.recent_backup_request_throttling_delay_count; recent_backup_request_throttling_reject_count += row.recent_backup_request_throttling_reject_count; + recent_write_bulk_load_ingestion_reject_count += + row.recent_write_bulk_load_ingestion_reject_count; storage_mb += row.storage_mb; storage_count += row.storage_count; rdb_block_cache_hit_count += row.rdb_block_cache_hit_count; @@ -684,6 +686,7 @@ struct row_data double recent_read_throttling_reject_count = 0; double recent_backup_request_throttling_delay_count = 0; double recent_backup_request_throttling_reject_count = 0; + double recent_write_bulk_load_ingestion_reject_count = 0; double storage_mb = 0; double storage_count = 0; double rdb_block_cache_hit_count = 0; @@ -766,6 +769,8 @@ update_app_pegasus_perf_counter(row_data &row, const std::string &counter_name, row.recent_backup_request_throttling_delay_count += value; else if (counter_name == "recent.backup.request.throttling.reject.count") row.recent_backup_request_throttling_reject_count += value; + else if (counter_name == "recent.write.bulk.load.ingestion.reject.count") + row.recent_write_bulk_load_ingestion_reject_count += value; else if (counter_name == "disk.storage.sst(MB)") row.storage_mb += value; else if (counter_name == "disk.storage.sst.count") diff --git a/src/shell/commands/table_management.cpp b/src/shell/commands/table_management.cpp index 272b5d89b9..b8147228cd 100644 --- a/src/shell/commands/table_management.cpp +++ b/src/shell/commands/table_management.cpp @@ -511,6 +511,8 @@ bool app_stat(command_executor *e, shell_context *sc, arguments args) row.recent_backup_request_throttling_delay_count; sum.recent_backup_request_throttling_reject_count += row.recent_backup_request_throttling_reject_count; + sum.recent_write_bulk_load_ingestion_reject_count += + row.recent_write_bulk_load_ingestion_reject_count; sum.storage_mb += row.storage_mb; sum.storage_count += row.storage_count; sum.rdb_block_cache_hit_count += row.rdb_block_cache_hit_count;