You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2019/08/15 21:58:06 UTC

[mesos] branch 1.8.x updated (9b2f77c -> 35bfd8a)

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

gilbert pushed a change to branch 1.8.x
in repository https://gitbox.apache.org/repos/asf/mesos.git.


    from 9b2f77c  Added MESOS-9893 to 1.8.2 CHANGELOG.
     new dd561ff  Included task group's resources in the ExecutorInfo.
     new 35bfd8a  Added MESOS-9925 to 1.8.2 CHANGELOG.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG           |  1 +
 src/slave/slave.cpp | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)


[mesos] 02/02: Added MESOS-9925 to 1.8.2 CHANGELOG.

Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gilbert pushed a commit to branch 1.8.x
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit 35bfd8ae356944bf6f6f4caf77135bd13ccc44dd
Author: Gilbert Song <so...@gmail.com>
AuthorDate: Thu Aug 15 14:05:30 2019 -0700

    Added MESOS-9925 to 1.8.2 CHANGELOG.
    
    (cherry picked from commit fc4f628f4b3d9ea87bccc574344c55e6d2500c2a)
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 0b53d07..07b37fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ Release Notes - Mesos - Version 1.8.2 (WIP)
   * [MESOS-9785] - Frameworks recovered from reregistered agents are not reported to master `/api/v1` subscribers.
   * [MESOS-9868] - NetworkInfo from the agent /state endpoint is not correct.
   * [MESOS-9893] - `volume/secret` isolator should cleanup the stored secret from runtime directory when the container is destroyed.
+  * [MESOS-9925] - Default executor takes a couple of seconds to start and subscribe Mesos agent.
 
 
 Release Notes - Mesos - Version 1.8.1


[mesos] 01/02: Included task group's resources in the ExecutorInfo.

Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gilbert pushed a commit to branch 1.8.x
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit dd561ff40867336a1c252e86ec5de4aadfd0b7b4
Author: Qian Zhang <zh...@gmail.com>
AuthorDate: Thu Aug 15 14:04:17 2019 -0700

    Included task group's resources in the ExecutorInfo.
    
    Review: https://reviews.apache.org/r/71244/
    (cherry picked from commit 7232dc139fe1e41db8d9476a16383df5ddbe427a)
---
 src/slave/slave.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 30039b0..bf87be0 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -2987,15 +2987,21 @@ void Slave::__run(
         defaultExecutorCommandInfo(flags.launcher_dir, executor->user);
     }
 
-    // NOTE: We modify the ExecutorInfo to include the task's resources when
-    // launching the executor so that the containerizer has non-zero resources
-    // to work with when the executor has no resources. This should be revisited
-    // after MESOS-600.
-    if (task.isSome()) {
-      *executorInfo_.mutable_resources() =
-        Resources(executorInfo.resources()) + task->resources();
+    // We modify the ExecutorInfo to include the task/task group's resources
+    // when launching the executor so that the containerizer has non-zero
+    // resources to work with when the executor has no resources. And this is
+    // also helpful for the executor to have enough resources to start because
+    // usually the resources that framework gives to executor are pretty small
+    // (e.g., Marathon/mesos-execute give 0.1 CPUs to the default executor) so
+    // the executor may be throttled by CFS, see MESOS-9925 for details.
+    Resources tasksResources;
+    foreach (const TaskInfo& _task, tasks) {
+      tasksResources += _task.resources();
     }
 
+    *executorInfo_.mutable_resources() =
+      Resources(executorInfo.resources()) + tasksResources;
+
     // Add the default container info to the executor info.
     // TODO(jieyu): Rename the flag to be default_mesos_container_info.
     if (!executorInfo_.has_container() &&