You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2016/11/03 20:22:27 UTC
[1/3] mesos git commit: Fixed the command executor to not generate
RUNNING after KILLING.
Repository: mesos
Updated Branches:
refs/heads/1.1.x f847be7b5 -> 18566cf7d
Fixed the command executor to not generate RUNNING after KILLING.
The command executor would send health updates even after having
transitioned a task to `TASK_KILLING`. This plus the fact that
health updates always have the `TASK_RUNNING` state leads to
`TASK_KILLING -> TASK_RUNNING` transitions.
This patch makes the executor skip health updates after starting
to kill a task.
Review: https://reviews.apache.org/r/53378/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e8be6eeb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e8be6eeb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e8be6eeb
Branch: refs/heads/1.1.x
Commit: e8be6eeb88577543fefd88b0c22fd8e515e64972
Parents: f847be7
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Thu Nov 3 21:08:22 2016 +0100
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu Nov 3 21:21:25 2016 +0100
----------------------------------------------------------------------
src/launcher/executor.cpp | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e8be6eeb/src/launcher/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp
index dec1e07..ef7a4c1 100644
--- a/src/launcher/executor.cpp
+++ b/src/launcher/executor.cpp
@@ -302,6 +302,12 @@ protected:
const bool healthy,
const bool initiateTaskKill)
{
+ // This check prevents us from sending `TASK_RUNNING` updates
+ // after the task has been transitioned to `TASK_KILLING`.
+ if (killed) {
+ return;
+ }
+
cout << "Received task health update, healthy: "
<< stringify(healthy) << endl;
[2/3] mesos git commit: Fixed the Docker executor to not generate
RUNNING after KILLING.
Posted by al...@apache.org.
Fixed the Docker executor to not generate RUNNING after KILLING.
The Docker executor would send health updates even after having
transitioned a task to `TASK_KILLING`. This plus the fact that
health updates always have the `TASK_RUNNING` state leads to
`TASK_KILLING -> TASK_RUNNING` transitions.
This patch makes the executor skip health updates after starting
to kill a task.
Review: https://reviews.apache.org/r/53407/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2ef6c04b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2ef6c04b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2ef6c04b
Branch: refs/heads/1.1.x
Commit: 2ef6c04b32f15aca11672821d88972125fd5cd6c
Parents: e8be6ee
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Thu Nov 3 21:13:37 2016 +0100
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu Nov 3 21:21:42 2016 +0100
----------------------------------------------------------------------
src/docker/executor.cpp | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2ef6c04b/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index ab3f047..1428590 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -295,6 +295,12 @@ protected:
return;
}
+ // This check prevents us from sending `TASK_RUNNING` updates
+ // after the task has been transitioned to `TASK_KILLING`.
+ if (killed) {
+ return;
+ }
+
cout << "Received task health update, healthy: "
<< stringify(healthy) << endl;
[3/3] mesos git commit: Added MESOS-6457 to CHANGELOG for 1.1.0.
Posted by al...@apache.org.
Added MESOS-6457 to CHANGELOG for 1.1.0.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/18566cf7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/18566cf7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/18566cf7
Branch: refs/heads/1.1.x
Commit: 18566cf7d4a296d3be23a0302b4dd9257feb9321
Parents: 2ef6c04
Author: Alexander Rukletsov <al...@apache.org>
Authored: Thu Nov 3 21:22:58 2016 +0100
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu Nov 3 21:22:58 2016 +0100
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/18566cf7/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 6aea886..09b092e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -218,6 +218,7 @@ All Issues:
* [MESOS-6420] - Mesos Agent leaking sockets when port mapping network isolator is ON.
* [MESOS-6445] - Reconciliation for unreachable agent after master failover is incorrect.
* [MESOS-6446] - WebUI redirect doesn't work with stats from /metric/snapshot.
+ * [MESOS-6457] - Tasks shouldn't transition from TASK_KILLING to TASK_RUNNING.
* [MESOS-6461] - Duplicate framework ids in /master/frameworks endpoint 'unregistered_frameworks'.
* [MESOS-6482] - Master check failure when marking an agent unreachable.
* [MESOS-6483] - Check failure when a 1.1 master marking a 0.28 agent as unreachable.