diff --git a/rdsn b/rdsn index 6135e4596a..a63f4531c2 160000 --- a/rdsn +++ b/rdsn @@ -1 +1 @@ -Subproject commit 6135e4596a36bb7d303a8703f6c4ab15a14fedb8 +Subproject commit a63f4531c2d654e36298586dcf993ad64a49f65f diff --git a/src/server/info_collector.cpp b/src/server/info_collector.cpp index 601bf517e9..ec46d15370 100644 --- a/src/server/info_collector.cpp +++ b/src/server/info_collector.cpp @@ -222,6 +222,7 @@ info_collector::app_stat_counters *info_collector::get_app_counters(const std::s INIT_COUNTER(recent_backup_request_throttling_reject_count); INIT_COUNTER(recent_write_splitting_reject_count); INIT_COUNTER(recent_read_splitting_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 a077cd4a42..c812ed210c 100644 --- a/src/server/info_collector.h +++ b/src/server/info_collector.h @@ -82,6 +82,8 @@ class info_collector row_stats.recent_backup_request_throttling_reject_count); recent_write_splitting_reject_count->set(row_stats.recent_write_splitting_reject_count); recent_read_splitting_reject_count->set(row_stats.recent_read_splitting_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( @@ -153,6 +155,7 @@ class info_collector ::dsn::perf_counter_wrapper recent_backup_request_throttling_reject_count; ::dsn::perf_counter_wrapper recent_write_splitting_reject_count; ::dsn::perf_counter_wrapper recent_read_splitting_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 fd80f1d561..c075d50dcf 100644 --- a/src/shell/command_helper.h +++ b/src/shell/command_helper.h @@ -629,6 +629,8 @@ struct row_data row.recent_backup_request_throttling_reject_count; recent_write_splitting_reject_count += row.recent_write_splitting_reject_count; recent_read_splitting_reject_count += row.recent_read_splitting_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; @@ -688,6 +690,7 @@ struct row_data double recent_backup_request_throttling_reject_count = 0; double recent_write_splitting_reject_count = 0; double recent_read_splitting_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; @@ -774,6 +777,8 @@ update_app_pegasus_perf_counter(row_data &row, const std::string &counter_name, row.recent_write_splitting_reject_count += value; else if (counter_name == "recent.read.splitting.reject.count") row.recent_read_splitting_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 1c746491e7..e4d16c26dc 100644 --- a/src/shell/commands/table_management.cpp +++ b/src/shell/commands/table_management.cpp @@ -513,6 +513,8 @@ bool app_stat(command_executor *e, shell_context *sc, arguments args) row.recent_backup_request_throttling_reject_count; sum.recent_write_splitting_reject_count += row.recent_write_splitting_reject_count; sum.recent_read_splitting_reject_count += row.recent_read_splitting_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;