@@ -709,30 +709,67 @@ inline std::vector<dsn::http_result> get_metrics(const std::vector<node_desc> &n
709709 return results;
710710}
711711
712+ // Adapt the result returned by `get_metrics` into the structure that could be processed by
713+ // `remote_command`.
714+ template <typename ... Args>
715+ inline dsn::error_s process_get_metrics_result (const dsn::http_result &result,
716+ const node_desc &node,
717+ const char *what,
718+ Args &&...args)
719+ {
720+ if (dsn_unlikely (!result.error ())) {
721+ return FMT_ERR (result.error ().code (),
722+ " ERROR: query {} metrics from node {} failed, msg={}"
723+ fmt::format (what, std::forward<Args>(args)...),
724+ node.hp ,
725+ result.error ());
726+ }
727+
728+ if (dsn_unlikely (result.status () != dsn::http_status_code::kOk )) {
729+ return FMT_ERR (dsn::ERR_HTTP_ERROR,
730+ " ERROR: query {} metrics from node {} failed, http_status={}, msg={}"
731+ fmt::format (what, std::forward<Args>(args)...),
732+ node.hp ,
733+ dsn::get_http_status_message (result.status ()),
734+ result.body ());
735+ }
736+
737+ return dsn::error_s::ok ();
738+ }
739+
712740#define RETURN_SHELL_IF_GET_METRICS_FAILED (result, node, what, ...) \
713741 do { \
714- if (dsn_unlikely (!result.error ())) { \
715- std::cout << " ERROR: send http request to query " fmt::format (what, ##__VA_ARGS__) \
716- << " metrics from node " hp << " failed: " error () \
717- << std::endl; \
718- return true ; \
719- } \
720- if (dsn_unlikely (result.status () != dsn::http_status_code::kOk )) { \
721- std::cout << " ERROR: send http request to query " " metrics from node "
722- << node.hp << " failed: " dsn::get_http_status_message (result.status ()) \
723- << std::endl \
724- << result.body () << std::endl; \
742+ const auto &res = process_get_metrics_result (result, node, what, ##__VA_ARGS__); \
743+ if (dsn_unlikely (!res)) { \
744+ fmt::println (res.description ()); \
725745 return true ; \
726746 } \
727747 } while (0 )
728748
749+ // Adapt the result of some parsing operations on the metrics returned by `get_metrics` into the
750+ // structure that could be processed by `remote_command`.
751+ template <typename ... Args>
752+ inline dsn::error_s process_parse_metrics_result (const dsn::error_s &result,
753+ const node_desc &node,
754+ const char *what,
755+ Args &&...args)
756+ {
757+ if (dsn_unlikely (!result)) {
758+ return FMT_ERR (result.code (),
759+ " ERROR: {} metrics response from node {} failed, msg={}"
760+ fmt::format (what, std::forward<Args>(args)...),
761+ node.hp ,
762+ result);
763+ }
764+
765+ return dsn::error_s::ok ();
766+ }
767+
729768#define RETURN_SHELL_IF_PARSE_METRICS_FAILED (expr, node, what, ...) \
730769 do { \
731- const auto &res = (expr); \
770+ const auto &res = process_parse_metrics_result (expr, node, what, ##__VA_ARGS__); \
732771 if (dsn_unlikely (!res)) { \
733- std::cout << " ERROR: parse " fmt::format (what, ##__VA_ARGS__) \
734- << " metrics response from node " hp << " failed: "
735- << std::endl; \
772+ fmt::println (res.description ()); \
736773 return true ; \
737774 } \
738775 } while (0 )
@@ -832,37 +869,59 @@ class aggregate_stats_calcs
832869 }
833870
834871 // Create the aggregations as needed.
872+ DEF_CALC_CREATOR (assignments)
835873 DEF_CALC_CREATOR (sums)
836874 DEF_CALC_CREATOR (increases)
837875 DEF_CALC_CREATOR (rates)
838876
839877#undef DEF_CALC_CREATOR
840878
879+ #define CALC_ASSIGNMENT_STATS (entities ) \
880+ do { \
881+ if (_assignments) { \
882+ RETURN_NOT_OK (_assignments->assign (entities)); \
883+ } \
884+ } while (0 )
885+
841886#define CALC_ACCUM_STATS (entities ) \
842887 do { \
843888 if (_sums) { \
844889 RETURN_NOT_OK (_sums->add_assign (entities)); \
845890 } \
846891 } while (0 )
847892
848- // Perform the chosen accum aggregations on the fetched metrics.
893+ // Perform the chosen aggregations (both assignment and accum) on the fetched metrics.
849894 dsn::error_s aggregate_metrics (const std::string &json_string)
850895 {
851896 DESERIALIZE_METRIC_QUERY_BRIEF_SNAPSHOT (value, json_string, query_snapshot);
852897
898+ return aggregate_metrics (query_snapshot);
899+ }
900+
901+ dsn::error_s aggregate_metrics (const dsn::metric_query_brief_value_snapshot &query_snapshot)
902+ {
903+ CALC_ASSIGNMENT_STATS (query_snapshot.entities );
853904 CALC_ACCUM_STATS (query_snapshot.entities );
854905
855906 return dsn::error_s::ok ();
856907 }
857908
858- // Perform all of the chosen aggregations (both accum and delta ) on the fetched metrics.
909+ // Perform the chosen aggregations (assignement, accum, delta and rate ) on the fetched metrics.
859910 dsn::error_s aggregate_metrics (const std::string &json_string_start,
860911 const std::string &json_string_end)
861912 {
862913 DESERIALIZE_METRIC_QUERY_BRIEF_2_SAMPLES (
863914 json_string_start, json_string_end, query_snapshot_start, query_snapshot_end);
864915
865- // Apply ending sample to the accum aggregations.
916+ return aggregate_metrics (query_snapshot_start, query_snapshot_end);
917+ }
918+
919+ dsn::error_s
920+ aggregate_metrics (const dsn::metric_query_brief_value_snapshot &query_snapshot_start,
921+ const dsn::metric_query_brief_value_snapshot &query_snapshot_end)
922+ {
923+ // Apply ending sample to the assignment and accum aggregations.
924+ CALC_ASSIGNMENT_STATS (query_snapshot_end.entities );
866925 CALC_ACCUM_STATS (query_snapshot_end.entities );
867926
868927 const std::array deltas_list = {&_increases, &_rates};
@@ -884,9 +943,12 @@ class aggregate_stats_calcs
884943
885944#undef CALC_ACCUM_STATS
886945
946+ #undef CALC_ASSIGNMENT_STATS
947+
887948private:
888949 DISALLOW_COPY_AND_ASSIGN (aggregate_stats_calcs);
889950
951+ std::unique_ptr<aggregate_stats> _assignments;
890952 std::unique_ptr<aggregate_stats> _sums;
891953 std::unique_ptr<aggregate_stats> _increases;
892954 std::unique_ptr<aggregate_stats> _rates;
@@ -1940,7 +2002,7 @@ get_table_stats(shell_context *sc, uint32_t sample_interval_ms, std::vector<row_
19402002 RETURN_SHELL_IF_PARSE_METRICS_FAILED (
19412003 calcs->aggregate_metrics (results_start[i].body (), results_end[i].body ()),
19422004 nodes[i],
1943- " row data requests"
2005+ " aggregate row data requests"
19442006 }
19452007
19462008 return true ;
@@ -1990,7 +2052,7 @@ inline bool get_partition_stats(shell_context *sc,
19902052 RETURN_SHELL_IF_PARSE_METRICS_FAILED (
19912053 calcs->aggregate_metrics (results_start[i].body (), results_end[i].body ()),
19922054 nodes[i],
1993- " row data requests for table(id={})"
2055+ " aggregate row data requests for table(id={})"
19942056 table_id);
19952057 }
19962058
0 commit comments