commit 378c8efbb34003c8dcf02ffcd51dc8564408c627
author Dmitry Rusakov <dnrusakov@gmail.com> Mon Apr 01 10:55:53 2019 -0700
committer Ning Wang <nwang@twitter.com> Mon Apr 01 10:55:53 2019 -0700
tree cc4cc96aada4465eab599e62fb816d286339e0bd
parent 5c64d53a6270c9f0154fd9db34897f434b90bf81

memory leak in tmaster fixed (#3230)

heron/tmaster/src/cpp/manager/stats-interface.cpp

diff --git a/heron/tmaster/src/cpp/manager/stats-interface.cpp b/heron/tmaster/src/cpp/manager/stats-interface.cpp
index 4d42913..4b2086d 100644
--- a/heron/tmaster/src/cpp/manager/stats-interface.cpp
+++ b/heron/tmaster/src/cpp/manager/stats-interface.cpp
@@ -160,7 +160,6 @@
   http_response->AddHeader("Content-Length", std::to_string(response_string.size()));
   http_response->AddResponse(response_string);
   http_server_->SendReply(_request, 200, http_response);
-  delete stmgrs_reg_summary_response;
   delete _request;
   LOG(INFO) << "Returned stream managers registration summary response";
 }

heron/tmaster/src/cpp/manager/tmaster.cpp

diff --git a/heron/tmaster/src/cpp/manager/tmaster.cpp b/heron/tmaster/src/cpp/manager/tmaster.cpp
index 44d9a15..206d8fb 100644
--- a/heron/tmaster/src/cpp/manager/tmaster.cpp
+++ b/heron/tmaster/src/cpp/manager/tmaster.cpp
@@ -847,15 +847,19 @@
   return false;
 }
 
-proto::tmaster::StmgrsRegistrationSummaryResponse* TMaster::GetStmgrsRegSummary() {
-  auto response = new proto::tmaster::StmgrsRegistrationSummaryResponse();
+std::unique_ptr<proto::tmaster::StmgrsRegistrationSummaryResponse> TMaster::GetStmgrsRegSummary() {
+  auto response = std::unique_ptr<proto::tmaster::StmgrsRegistrationSummaryResponse>(
+          new proto::tmaster::StmgrsRegistrationSummaryResponse());
+
   for (auto it = stmgrs_.begin(); it != stmgrs_.end(); ++it) {
     response->add_registered_stmgrs(it->first);
   }
+
   for (auto it = absent_stmgrs_.begin(); it != absent_stmgrs_.end(); ++it) {
     response->add_absent_stmgrs(*it);
   }
-  return response;
+
+  return std::move(response);
 }
 
 proto::system::PhysicalPlan* TMaster::MakePhysicalPlan() {

heron/tmaster/src/cpp/manager/tmaster.h

diff --git a/heron/tmaster/src/cpp/manager/tmaster.h b/heron/tmaster/src/cpp/manager/tmaster.h
index 8c48f36..8869618 100644
--- a/heron/tmaster/src/cpp/manager/tmaster.h
+++ b/heron/tmaster/src/cpp/manager/tmaster.h
@@ -90,7 +90,7 @@
   void HandleCleanStatefulCheckpointResponse(proto::system::StatusCode);
 
   // Get stream managers registration summary
-  proto::tmaster::StmgrsRegistrationSummaryResponse* GetStmgrsRegSummary();
+  std::unique_ptr<proto::tmaster::StmgrsRegistrationSummaryResponse> GetStmgrsRegSummary();
 
   // Accessors
   const proto::system::PhysicalPlan* getPhysicalPlan() const { return current_pplan_; }