Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 45 additions & 14 deletions src/shell/commands/node_management.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,23 @@ dsn::metric_filters server_stat_filters()
{
dsn::metric_filters filters;
filters.with_metric_fields = {dsn::kMetricNameField, dsn::kMetricSingleValueField};
filters.entity_types = {"server"};
filters.entity_metrics = {"virtual_mem_usage_mb", "resident_mem_usage_mb"};
filters.entity_types = {"server", "replica"};
filters.entity_metrics = {
"virtual_mem_usage_mb",
"resident_mem_usage_mb",
"total_replicas",
"opening_replicas",
"closing_replicas",
"inactive_replicas",
"error_replicas",
"primary_replicas",
"secondary_replicas",
"learning_replicas",
"splitting_replicas",
"rdb_block_cache_mem_usage_bytes",
"rdb_manual_compact_queued_tasks",
"rdb_manual_compact_running_tasks",
};
return filters;
}

Expand Down Expand Up @@ -299,6 +314,10 @@ struct replica_server_stats
double learning_replicas{0.0};
double splitting_replicas{0.0};

double rdb_block_cache_mem_usage_bytes{0.0};
double rdb_manual_compact_queued_tasks{0.0};
double rdb_manual_compact_running_tasks{0.0};

DEFINE_JSON_SERIALIZATION(virt_mem_mb,
res_mem_mb,
total_replicas,
Expand All @@ -309,7 +328,10 @@ struct replica_server_stats
primary_replicas,
secondary_replicas,
learning_replicas,
splitting_replicas)
splitting_replicas,
rdb_block_cache_mem_usage_bytes,
rdb_manual_compact_queued_tasks,
rdb_manual_compact_running_tasks)
};

std::pair<bool, std::string>
Expand All @@ -321,17 +343,26 @@ aggregate_replica_server_stats(const node_desc &node,
replica_server_stats stats;
calcs.create_assignments<total_aggregate_stats>(
"server",
stat_var_map({{"virtual_mem_usage_mb", &stats.virt_mem_mb},
{"resident_mem_usage_mb", &stats.res_mem_mb},
{"total_replicas", &stats.total_replicas},
{"opening_replicas", &stats.opening_replicas},
{"closing_replicas", &stats.closing_replicas},
{"inactive_replicas", &stats.inactive_replicas},
{"error_replicas", &stats.error_replicas},
{"primary_replicas", &stats.primary_replicas},
{"secondary_replicas", &stats.secondary_replicas},
{"learning_replicas", &stats.learning_replicas},
{"splitting_replicas", &stats.splitting_replicas}}));
stat_var_map({
{"virtual_mem_usage_mb", &stats.virt_mem_mb},
{"resident_mem_usage_mb", &stats.res_mem_mb},
{"total_replicas", &stats.total_replicas},
{"opening_replicas", &stats.opening_replicas},
{"closing_replicas", &stats.closing_replicas},
{"inactive_replicas", &stats.inactive_replicas},
{"error_replicas", &stats.error_replicas},
{"primary_replicas", &stats.primary_replicas},
{"secondary_replicas", &stats.secondary_replicas},
{"learning_replicas", &stats.learning_replicas},
{"splitting_replicas", &stats.splitting_replicas},
{"rdb_block_cache_mem_usage_bytes", &stats.rdb_block_cache_mem_usage_bytes},
}));
calcs.create_sums<total_aggregate_stats>(
"replica",
stat_var_map({
{"rdb_manual_compact_queued_tasks", &stats.rdb_manual_compact_queued_tasks},
{"rdb_manual_compact_running_tasks", &stats.rdb_manual_compact_running_tasks},
}));

const auto command_result = process_parse_metrics_result(
calcs.aggregate_metrics(query_snapshot_start, query_snapshot_end),
Expand Down
Loading