From db373d44af6f01bc9f682cb87e400400a35cdf63 Mon Sep 17 00:00:00 2001 From: "siyuanzhang.zsy" Date: Fri, 16 Jun 2023 10:19:32 +0800 Subject: [PATCH 1/2] Print metrics of application running time --- analytical_engine/core/app/app_invoker.h | 19 +++++++++++++------ coordinator/gscoordinator/cluster_builder.py | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/analytical_engine/core/app/app_invoker.h b/analytical_engine/core/app/app_invoker.h index c618cf38fa6d..42de18060d96 100644 --- a/analytical_engine/core/app/app_invoker.h +++ b/analytical_engine/core/app/app_invoker.h @@ -16,13 +16,14 @@ #ifndef ANALYTICAL_ENGINE_CORE_APP_APP_INVOKER_H_ #define ANALYTICAL_ENGINE_CORE_APP_APP_INVOKER_H_ -#include - #include #include #include #include +#include "glog/logging.h" +#include "grape/util.h" + #ifdef NETWORKX #include "core/object/dynamic.h" #endif @@ -186,15 +187,18 @@ class AppInvoker { static void query_impl(std::shared_ptr worker, const rpc::QueryArgs& query_args, std::index_sequence) { + double t0 = grape::GetCurrentTime(); worker->Query( ArgsUnpacker::type>::type>:: type>::unpack(query_args.args(I))...); + double t1 = grape::GetCurrentTime(); + LOG(INFO) << "Query time: " << t1 - t0; } public: - static bl::result Query(std::shared_ptr worker, - const rpc::QueryArgs& query_args) { + static bl::result Query(std::shared_ptr worker, + const rpc::QueryArgs& query_args) { constexpr std::size_t args_num = ArgsNum::value - 1; // There maybe default argument CHECK_OR_RAISE(args_num >= query_args.args_size()); @@ -212,15 +216,18 @@ class FlashAppInvoker { static void query_impl(std::shared_ptr worker, const rpc::QueryArgs& query_args, std::index_sequence) { + double t0 = grape::GetCurrentTime(); worker->Query( ArgsUnpacker::type>::type>::type>:: unpack(query_args.args(I))...); + double t1 = grape::GetCurrentTime(); + LOG(INFO) << "Query time: " << t1 - t0; } public: - static bl::result Query(std::shared_ptr worker, - const rpc::QueryArgs& query_args) { + static bl::result Query(std::shared_ptr worker, + const rpc::QueryArgs& query_args) { constexpr std::size_t args_num = ArgsNum::value - 2; // There maybe default argument CHECK_OR_RAISE(args_num >= query_args.args_size()); diff --git a/coordinator/gscoordinator/cluster_builder.py b/coordinator/gscoordinator/cluster_builder.py index dcb47916cc9f..b7010b8f4af4 100644 --- a/coordinator/gscoordinator/cluster_builder.py +++ b/coordinator/gscoordinator/cluster_builder.py @@ -301,7 +301,7 @@ def get_interactive_executor_container(self, volume_mounts): args = [ "bash", "-c", - self._get_tail_if_exists_cmd("/var/log/graphscope/current/executor.log"), + self._get_tail_if_exists_cmd("/var/log/graphscope/current/executor.*.log"), ] container = self.get_engine_container_helper( name, From ad7ce6cf4315ac797538051930b862a4923e8195 Mon Sep 17 00:00:00 2001 From: "siyuanzhang.zsy" Date: Fri, 16 Jun 2023 02:40:34 +0000 Subject: [PATCH 2/2] update Committed-by: siyuanzhang.zsy from Dev container --- analytical_engine/core/app/app_invoker.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/analytical_engine/core/app/app_invoker.h b/analytical_engine/core/app/app_invoker.h index 42de18060d96..be4c38ff5808 100644 --- a/analytical_engine/core/app/app_invoker.h +++ b/analytical_engine/core/app/app_invoker.h @@ -187,13 +187,13 @@ class AppInvoker { static void query_impl(std::shared_ptr worker, const rpc::QueryArgs& query_args, std::index_sequence) { - double t0 = grape::GetCurrentTime(); + double start_time = grape::GetCurrentTime(); worker->Query( ArgsUnpacker::type>::type>:: type>::unpack(query_args.args(I))...); - double t1 = grape::GetCurrentTime(); - LOG(INFO) << "Query time: " << t1 - t0; + double end_time = grape::GetCurrentTime(); + LOG(INFO) << "Query time: " << end_time - start_time << " seconds"; } public: @@ -216,13 +216,13 @@ class FlashAppInvoker { static void query_impl(std::shared_ptr worker, const rpc::QueryArgs& query_args, std::index_sequence) { - double t0 = grape::GetCurrentTime(); + double start_time = grape::GetCurrentTime(); worker->Query( ArgsUnpacker::type>::type>::type>:: unpack(query_args.args(I))...); - double t1 = grape::GetCurrentTime(); - LOG(INFO) << "Query time: " << t1 - t0; + double end_time = grape::GetCurrentTime(); + LOG(INFO) << "Query time: " << end_time - start_time << " seconds"; } public: