Revert "Added reaper thread for model instance in python_backend"

This reverts commit a31e5a2.
CGranger-sorenson · May 13, 2024 · 61a8631 · 61a8631
1 parent 7197508
commit 61a8631
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 52 deletions.
diff --git a/src/ipc_message.h b/src/ipc_message.h
@@ -66,8 +66,7 @@ typedef enum PYTHONSTUB_commandtype_enum {
   PYTHONSTUB_LoadModelRequest,
   PYTHONSTUB_UnloadModelRequest,
   PYTHONSTUB_ModelReadinessRequest,
-  PYTHONSTUB_IsRequestCancelled,
-  PYTHONSTUB_CheckCorrid
+  PYTHONSTUB_IsRequestCancelled
 } PYTHONSTUB_CommandType;
 
 ///

diff --git a/src/pb_stub.cc b/src/pb_stub.cc
@@ -272,9 +272,6 @@ Stub::RunCommand()
     ipc_message = this->PopMessage();
   }
   switch (ipc_message->Command()) {
-    case PYTHONSTUB_CommandType::PYTHONSTUB_CheckCorrid: {
-      CheckCorrid();
-    } break;
     case PYTHONSTUB_CommandType::PYTHONSTUB_AutoCompleteRequest: {
       // Only run this case when auto complete was requested by
       // Triton core.
@@ -759,13 +756,6 @@ Stub::ProcessRequestsDecoupled(RequestBatch* request_batch_shm_ptr)
   }
 }
 
-void Stub::CheckCorrid(){
-  if(py::hasattr(model_instance_, "check_corrid")){
-    model_instance_.attr("check_corrid")();
-  }
-  return;
-}
-
 void
 Stub::ProcessRequests(RequestBatch* request_batch_shm_ptr)
 {

diff --git a/src/pb_stub.h b/src/pb_stub.h
@@ -253,8 +253,6 @@ class Stub {
   /// Execute a batch of requests.
   void ProcessRequests(RequestBatch* request_batch_shm_ptr);
 
-  void CheckCorrid();
-
   void ProcessRequestsDecoupled(RequestBatch* request_batch_shm_ptr);
 
   py::object GetAsyncEventLoop();

diff --git a/src/python_be.cc b/src/python_be.cc
@@ -37,24 +37,6 @@ namespace triton { namespace backend { namespace python {
 
 namespace bi = boost::interprocess;
 
-void ModelInstanceState::ReaperThread(){
-  // wait for stub to fully load
-  while (!IsStubProcessAlive()){}
-
-  while (true){
-    std::this_thread::sleep_for(std::chrono::milliseconds(30000));
-
-    // Check that we still have a valid stub
-    if (!reaper_thread_exit){
-      SendMessageToStub(ipc_message->ShmHandle());
-    }
-    // if stub is invalid just return
-    else{
-      break;
-    }
-  }
-}
-
 ModelInstanceState::ModelInstanceState(
     ModelState* model_state, TRITONBACKEND_ModelInstance* triton_model_instance)
     : BackendModelInstance(model_state, triton_model_instance),
@@ -474,13 +456,6 @@ ModelInstanceState::LaunchStubProcess()
   }
   request_executor_ = std::make_unique<RequestExecutor>(
       Stub()->ShmPool(), model_state->TritonServer());
-
-  // Save this object so it doesnt get deleted before the stub MQ can access it
-  ipc_message = IPCMessage::Create(Stub()->ShmPool(), false);
-  ipc_message->Command() = PYTHONSTUB_CommandType::PYTHONSTUB_CheckCorrid;
-
-  // Launch reaper thread after stub creation
-  reaper_thread_ = new std::thread([this]() { this->ReaperThread(); });
 
   return nullptr;
 }
@@ -1898,10 +1873,6 @@ ModelInstanceState::ShareCUDAMemoryPool(const int32_t device_id)
 
 ModelInstanceState::~ModelInstanceState()
 {
-  // Allow reaper thread to exit first so we don't run into issues on close
-  reaper_thread_exit = true;
-  ipc_message.reset();
-
   ModelState* model_state = reinterpret_cast<ModelState*>(Model());
   Stub()->UpdateHealth();
   if (Stub()->IsHealthy()) {
@@ -1922,10 +1893,6 @@ ModelInstanceState::~ModelInstanceState()
   Stub()->ClearQueues();
   received_message_.reset();
   Stub().reset();
-
-  // join last so we don't block closing
-  reaper_thread_->join();
-  delete reaper_thread_;
 }
 
 TRITONSERVER_Error*

diff --git a/src/python_be.h b/src/python_be.h
@@ -298,9 +298,6 @@ class ModelInstanceState : public BackendModelInstance {
   std::unordered_map<intptr_t, std::shared_ptr<InferPayload>> infer_payload_;
   std::mutex infer_payload_mu_;
   std::unique_ptr<RequestExecutor> request_executor_;
-  std::thread* reaper_thread_;
-  std::shared_ptr<IPCMessage> ipc_message;
-  bool reaper_thread_exit = false;
 
  public:
   static TRITONSERVER_Error* Create(
@@ -326,8 +323,6 @@ class ModelInstanceState : public BackendModelInstance {
       std::shared_ptr<std::vector<TRITONBACKEND_Response*>>& responses,
       TRITONBACKEND_Request** requests, const uint32_t request_count);
 
-  void ReaperThread();
-
   // Responds to all the requests with an error message.
   void RespondErrorToAllRequests(
       const char* message,