Add repo agents to console log

src/backends/backend/triton_backend_manager.cc

@@ -333,13 +333,11 @@ TritonBackendManager::BackendState(
   TritonBackendManager& singleton_manager = Singleton();
   std::lock_guard<std::mutex> lock(singleton_manager.mu_);
 
-  auto backend_map = singleton_manager.backend_map_;
-
   std::unique_ptr<std::unordered_map<std::string, std::vector<std::string>>>
       backend_state_map(
           new std::unordered_map<std::string, std::vector<std::string>>);
-  for (const auto& backend_pair : backend_map) {
-    auto libpath = backend_pair.first;
+  for (const auto& backend_pair : singleton_manager.backend_map_) {
+    auto& libpath = backend_pair.first;
     auto backend = backend_pair.second.lock();
 
     if (backend != nullptr) {

src/core/server.cc

@@ -46,6 +46,7 @@
 #include "src/core/model_config_utils.h"
 #include "src/core/model_repository_manager.h"
 #include "src/core/pinned_memory_manager.h"
+#include "src/core/triton_repo_agent.h"
 #include "triton/common/table_printer.h"
 
 #ifdef TRITON_ENABLE_GPU
@@ -467,11 +468,31 @@ InferenceServer::UnloadModel(const std::string& model_name)
 Status
 InferenceServer::PrintBackendAndModelSummary()
 {
+  // Repository Agents Summary
+  std::vector<std::string> repoagent_headers;
+  repoagent_headers.emplace_back("Repository Agent");
+  repoagent_headers.emplace_back("Path");
+
+  triton::common::TablePrinter repoagents_table(repoagent_headers);
+
+  std::unique_ptr<std::unordered_map<std::string, std::string>>
+      repoagent_state;
+  RETURN_IF_ERROR(TritonRepoAgentManager::AgentState(&repoagent_state));
+
+  for (const auto& repoagent_pair : *repoagent_state) {
+    std::vector<std::string> repoagent_record;
+    repoagent_record.emplace_back(repoagent_pair.first);
+    repoagent_record.emplace_back(repoagent_pair.second);
+    repoagents_table.InsertRow(repoagent_record);
+  }
+  std::string repoagents_table_string = repoagents_table.PrintTable();
+  LOG_INFO << repoagents_table_string;
+
   // Backends Summary
   std::vector<std::string> backend_headers;
   backend_headers.emplace_back("Backend");
-  backend_headers.emplace_back("Config");
   backend_headers.emplace_back("Path");
+  backend_headers.emplace_back("Config");
 
   triton::common::TablePrinter backends_table(backend_headers);
 

src/core/triton_repo_agent.cc

@@ -369,9 +369,9 @@ TritonRepoAgentManager::CreateAgent(
   auto& singleton_manager = Singleton();
   std::lock_guard<std::mutex> lock(singleton_manager.mu_);
 
-  // Get the path to the backend shared library. Search path is
-  // model directory, global agent directory.
-  // FIXME expose global path as Triton option
+  // Get the path to the agent shared library. Search path is model
+  // directory, global agent directory.  FIXME expose global path as
+  // Triton option
   const std::vector<std::string> search_paths = {
       model_dir, singleton_manager.global_search_path_};
 
@@ -398,10 +398,10 @@ TritonRepoAgentManager::CreateAgent(
   const auto& itr = singleton_manager.agent_map_.find(libpath);
   if (itr != singleton_manager.agent_map_.end()) {
     // Found in map. If the weak_ptr is still valid that means that
-    // there are other models using the backend and we just reuse that
-    // same backend. If the weak_ptr is not valid then backend has
-    // been unloaded so we need to remove the weak_ptr from the map
-    // and create the backend again.
+    // there are other models using the agent and we just reuse that
+    // same agent. If the weak_ptr is not valid then agent has been
+    // unloaded so we need to remove the weak_ptr from the map and
+    // create the agent again.
     *agent = itr->second.lock();
     if (*agent != nullptr) {
       return Status::Success;
@@ -415,6 +415,32 @@ TritonRepoAgentManager::CreateAgent(
   return Status::Success;
 }
 
+Status
+TritonRepoAgentManager::AgentState(
+      std::unique_ptr<
+          std::unordered_map<std::string, std::string>>*
+          agent_state)
+{
+  auto& singleton_manager = Singleton();
+  std::lock_guard<std::mutex> lock(singleton_manager.mu_);
+
+  std::unique_ptr<std::unordered_map<std::string, std::string>>
+      agent_state_map(
+          new std::unordered_map<std::string, std::string>);
+  for (const auto& agent_pair : singleton_manager.agent_map_) {
+    auto& libpath = agent_pair.first;
+    auto agent = agent_pair.second.lock();
+
+    if (agent != nullptr) {
+      agent_state_map->insert({agent->Name(), libpath});
+    }
+  }
+
+  *agent_state = std::move(agent_state_map);
+
+  return Status::Success;
+}
+
 extern "C" {
 
 TRITONSERVER_Error*
@@ -541,4 +567,4 @@ TRITONREPOAGENT_SetState(TRITONREPOAGENT_Agent* agent, void* state)
 
 }  // extern C
 
-}}  // namespace nvidia::inferenceserver
+}}  // namespace nvidia::inferenceserver

src/core/triton_repo_agent.h

@@ -165,6 +165,11 @@ class TritonRepoAgentManager {
       const std::string& model_dir, const std::string& agent_name,
       std::shared_ptr<TritonRepoAgent>* agent);
 
+  static Status AgentState(
+      std::unique_ptr<
+          std::unordered_map<std::string, std::string>>*
+          agent_state);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TritonRepoAgentManager);