[07/10] mesos git commit: Removed logic for handling missing FrameworkID in ExecutorInfo.

[ne...@apache.org]

Removed logic for handling missing FrameworkID in ExecutorInfo.

The master will inject missing `FrameworkID`s into `ExecutorInfo` since
Mesos 0.23 (see MESOS-2290), so it should be safe to assume it is always
set.

Review: https://reviews.apache.org/r/59219


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/207b6198
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/207b6198
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/207b6198

Branch: refs/heads/master
Commit: 207b61981d6f3084b8d13c9535ebe40215d6d699
Parents: 85569d0
Author: Neil Conway <ne...@gmail.com>
Authored: Thu May 11 16:04:09 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Wed May 31 11:40:49 2017 -0700

----------------------------------------------------------------------
 src/master/master.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/207b6198/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 1e7af16..7a4a420 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -7573,16 +7573,8 @@ void Master::reconcileKnownSlave(
   // for resources. First we index the executors for fast lookup below.
   multihashmap<FrameworkID, ExecutorID> slaveExecutors;
   foreach (const ExecutorInfo& executor, executors) {
-    // TODO(bmahler): The slave ensures the framework id is set in the
-    // framework info when re-registering. This can be killed in 0.15.0
-    // as we've added code in 0.14.0 to ensure the framework id is set
-    // in the scheduler driver.
-    if (!executor.has_framework_id()) {
-      LOG(ERROR) << "Agent " << *slave
-                 << " re-registered with executor '" << executor.executor_id()
-                 << "' without setting the framework id";
-      continue;
-    }
+    // Master validates that `framework_id` is set during task launch.
+    CHECK(executor.has_framework_id());
     slaveExecutors.put(executor.framework_id(), executor.executor_id());
   }