[mesos] 03/04: Eliminated redundant update broadcasts in UPDATE_FRAMEWORK.

[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 720cc709339efb51a7c464bb3fc547cf0935c911
Author: Andrei Sekretenko <asekrete...@mesosphere.com>
AuthorDate: Mon Aug 31 18:35:16 2020 +0200

    Eliminated redundant update broadcasts in UPDATE_FRAMEWORK.
    
    This patch makes the UPDATE_FRAMEWORK call avoid sending the
    `UpdatedFrameworkMessage` to agents and the `FRAMEWORK_UPDATED`
    event to V1 API subscribers when the FrameworkInfo is not changed
    by the call.
    
    Review: https://reviews.apache.org/r/72824
---
 src/master/master.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/master/master.cpp b/src/master/master.cpp
index 0272329..5b5d5c3 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -2844,12 +2844,21 @@ void Master::_subscribe(
         std::move(options));
   }
 
+  // TODO(asekretenko): Consider avoiding to broadcast `FrameworkInfo` to 
agents
+  // when it has not changed. Note that the API event FRAMEWORK_UPDATED needs
+  // to be sent to the subscribers regardless of that, and that agents must
+  // be notified about the scheduler PID removal when this call performs
+  // a V0->V1 upgrade.
   sendFrameworkUpdates(*framework);
 }
 
 
 void Master::sendFrameworkUpdates(const Framework& framework)
 {
+  LOG(INFO) << "Sending a FRAMEWORK_UPDATED event for framework " << framework
+            << " to all subscribers and broadcasting its up-to-date"
+            << " FrameworkInfo and PID to all registered agents";
+
   if (!subscribers.subscribed.empty()) {
     subscribers.send(
       protobuf::master::event::createFrameworkUpdated(framework));
@@ -3206,6 +3215,9 @@ void Master::_subscribe(
         std::move(options));
   }
 
+  // TODO(asekretenko): Consider avoiding to broadcast `FrameworkInfo` and
+  // the V0 framework PID to agents when they have not changed. Note that the
+  // API event FRAMEWORK_UPDATED needs to be sent regardless regardless of 
that.
   sendFrameworkUpdates(*framework);
 }
 
@@ -3254,6 +3266,9 @@ Future<process::http::Response> Master::updateFramework(
         "FrameworkInfo update is not valid: " + error->message);
   }
 
+  const bool frameworkInfoChanged =
+    !typeutils::equivalent(framework->info, call.framework_info());
+
   allocator::FrameworkOptions allocatorOptions;
   if (call.has_offer_constraints()) {
     // TODO(asekretenko): Validate roles in offer constraints (see 
MESOS-10176).
@@ -3294,7 +3309,14 @@ Future<process::http::Response> Master::updateFramework(
   updateFramework(
       framework, call.framework_info(), std::move(allocatorOptions));
 
-  sendFrameworkUpdates(*framework);
+  if (frameworkInfoChanged) {
+    // NOTE: Among the framework properties that can be changed by this call
+    // (`FrameworkInfo`, suppressed roles and offer constraints),
+    // only the `FrameworkInfo` change needs to be forwarded to the agents
+    // and the API subscribers. This call changes neither the V0 framework PID
+    // nor the framework activeness or state 
(RECOVERED/CONNECTED/DISCONNECTED).
+    sendFrameworkUpdates(*framework);
+  }
 
   return process::http::OK();
 }