You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by qi...@apache.org on 2017/11/14 12:46:21 UTC
[1/3] mesos git commit: Updated the comments of TASK_FINISHED to make
it more clear.
Repository: mesos
Updated Branches:
refs/heads/1.2.x fdadfa416 -> f8706e580
Updated the comments of TASK_FINISHED to make it more clear.
Review: https://reviews.apache.org/r/62685
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/00d79da8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/00d79da8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/00d79da8
Branch: refs/heads/1.2.x
Commit: 00d79da80956f1c9a75f1c6802e483d8c58127de
Parents: fdadfa4
Author: Qian Zhang <zh...@gmail.com>
Authored: Fri Sep 29 15:28:58 2017 +0800
Committer: Qian Zhang <zh...@gmail.com>
Committed: Tue Nov 14 16:59:18 2017 +0800
----------------------------------------------------------------------
include/mesos/mesos.proto | 4 +++-
include/mesos/v1/mesos.proto | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/00d79da8/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index ae2de6b..ee767a1 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -1678,7 +1678,9 @@ enum TaskState {
// the TASK_KILLING_STATE capability.
TASK_KILLING = 8; // The task is being killed by the executor.
- TASK_FINISHED = 2; // TERMINAL: The task finished successfully.
+ // The task finished successfully on its own without external interference.
+ TASK_FINISHED = 2; // TERMINAL.
+
TASK_FAILED = 3; // TERMINAL: The task failed to finish successfully.
TASK_KILLED = 4; // TERMINAL: The task was killed by the executor.
TASK_ERROR = 7; // TERMINAL: The task description contains an error.
http://git-wip-us.apache.org/repos/asf/mesos/blob/00d79da8/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index c0ad505..609d836 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -1677,7 +1677,9 @@ enum TaskState {
// the TASK_KILLING_STATE capability.
TASK_KILLING = 8; // The task is being killed by the executor.
- TASK_FINISHED = 2; // TERMINAL: The task finished successfully.
+ // The task finished successfully on its own without external interference.
+ TASK_FINISHED = 2; // TERMINAL.
+
TASK_FAILED = 3; // TERMINAL: The task failed to finish successfully.
TASK_KILLED = 4; // TERMINAL: The task was killed by the executor.
TASK_ERROR = 7; // TERMINAL: The task description contains an error.
[3/3] mesos git commit: Added MESOS-7975 to the 1.2.3 CHANGELOG.
Posted by qi...@apache.org.
Added MESOS-7975 to the 1.2.3 CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f8706e58
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f8706e58
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f8706e58
Branch: refs/heads/1.2.x
Commit: f8706e580251cc7ad7cb6971577f761c6525952b
Parents: bfadf67
Author: Qian Zhang <zh...@gmail.com>
Authored: Tue Nov 14 17:19:05 2017 +0800
Committer: Qian Zhang <zh...@gmail.com>
Committed: Tue Nov 14 17:19:05 2017 +0800
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f8706e58/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 6553e68..6f9a72d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ All Issues:
* [MESOS-7909] - Ordering dependency between 'linux/capabilities' and 'docker/runtime' isolator.
* [MESOS-7926] - Abnormal termination of default executor can cause MesosContainerizer::destroy to fail.
* [MESOS-7934] - OOM due to LibeventSSLSocket send incorrectly returning 0 after shutdown.
+ * [MESOS-7975] - The command/default/docker executor can incorrectly send a TASK_FINISHED update even when the task is killed.
* [MESOS-8051] - Killing TASK_GROUP fail to kill some tasks.
* [MESOS-8080] - The default executor does not propagate missing task exit status correctly.
* [MESOS-8135] - Masters can lose track of tasks' executor IDs.
[2/3] mesos git commit: Always send TASK_KILLED when the task is
killed by a framework.
Posted by qi...@apache.org.
Always send TASK_KILLED when the task is killed by a framework.
This change is done for command, docker and default executors.
Review: https://reviews.apache.org/r/62326
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bfadf67a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bfadf67a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bfadf67a
Branch: refs/heads/1.2.x
Commit: bfadf67a38eedbc1cdd3edfa0c6ea9b15b6d4eb3
Parents: 00d79da
Author: Qian Zhang <zh...@gmail.com>
Authored: Thu Sep 14 17:29:39 2017 +0800
Committer: Qian Zhang <zh...@gmail.com>
Committed: Tue Nov 14 16:59:19 2017 +0800
----------------------------------------------------------------------
src/docker/executor.cpp | 6 +++---
src/launcher/default_executor.cpp | 6 +++---
src/launcher/executor.cpp | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bfadf67a/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index d7f2134..ac826e6 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -463,9 +463,7 @@ private:
CHECK(WIFEXITED(status) || WIFSIGNALED(status))
<< "Unexpected wait status " << status;
- if (WSUCCEEDED(status)) {
- state = TASK_FINISHED;
- } else if (killed) {
+ if (killed) {
// Send TASK_KILLED if the task was killed as a result of
// kill() or shutdown(). Note that in general there is a
// race between signaling the container and it terminating
@@ -475,6 +473,8 @@ private:
// determine whether the container was terminated via
// our signal or terminated on its own.
state = TASK_KILLED;
+ } else if (WSUCCEEDED(status)) {
+ state = TASK_FINISHED;
} else {
state = TASK_FAILED;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/bfadf67a/src/launcher/default_executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/default_executor.cpp b/src/launcher/default_executor.cpp
index c03df7c..e04043a 100644
--- a/src/launcher/default_executor.cpp
+++ b/src/launcher/default_executor.cpp
@@ -650,12 +650,12 @@ protected:
CHECK(WIFEXITED(status) || WIFSIGNALED(status))
<< "Unexpected wait status " << status;
- if (WSUCCEEDED(status)) {
- taskState = TASK_FINISHED;
- } else if (container->killing) {
+ if (container->killing) {
// Send TASK_KILLED if the task was killed as a result of
// `killTask()` or `shutdown()`.
taskState = TASK_KILLED;
+ } else if (WSUCCEEDED(status)) {
+ taskState = TASK_FINISHED;
} else {
taskState = TASK_FAILED;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/bfadf67a/src/launcher/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp
index 2605d82..5b278dd 100644
--- a/src/launcher/executor.cpp
+++ b/src/launcher/executor.cpp
@@ -700,12 +700,12 @@ private:
CHECK(WIFEXITED(status) || WIFSIGNALED(status))
<< "Unexpected wait status " << status;
- if (WSUCCEEDED(status)) {
- taskState = TASK_FINISHED;
- } else if (killed) {
+ if (killed) {
// Send TASK_KILLED if the task was killed as a result of
// kill() or shutdown().
taskState = TASK_KILLED;
+ } else if (WSUCCEEDED(status)) {
+ taskState = TASK_FINISHED;
} else {
taskState = TASK_FAILED;
}