[mesos] 01/02: Fixed HTTP framework disconnection/removal to terminate heartbeater.

[asekretenko]

This is an automated email from the ASF dual-hosted git repository.

asekretenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit 2113b76b861af1233151d1a64117795d18b0c3eb
Author: Andrei Sekretenko <asekrete...@apache.org>
AuthorDate: Thu Feb 13 12:39:24 2020 +0100

    Fixed HTTP framework disconnection/removal to terminate heartbeater.
    
    This patch gets rid of idle-looping heartbeater processes
    that previously could occur after HTTP framework disconnection
    (see MESOS-10097).
    
    Review: https://reviews.apache.org/r/72130
---
 src/master/master.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/master/master.cpp b/src/master/master.cpp
index d41ae72..84963b4 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -3316,11 +3316,7 @@ void Master::disconnect(Framework* framework)
     // a framework will always reauthenticate before (re-)registering.
     authenticated.erase(framework->pid.get());
   } else {
-    CHECK_SOME(framework->http);
-
-    // Close the HTTP connection, which may already have
-    // been closed due to scheduler disconnection.
-    framework->http->close();
+    framework->closeHttpConnection();
   }
 }
 
@@ -10905,9 +10901,8 @@ void Master::removeFramework(Framework* framework)
 
   // TODO(benh): unlink(framework->pid);
 
-  // For http frameworks, close the connection.
   if (framework->http.isSome()) {
-    framework->http->close();
+    framework->closeHttpConnection();
   }
 
   framework->unregisteredTime = Clock::now();