You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/01/06 01:33:34 UTC
mesos git commit: Renamed `tasks` and `updates` to
`unacknowledged_tasks` and `unacknowledged_updates` in executor's Subscribe
proto.
Repository: mesos
Updated Branches:
refs/heads/master 002a2ae5d -> 31a5fb076
Renamed `tasks` and `updates` to `unacknowledged_tasks` and `unacknowledged_updates` in executor's Subscribe proto.
Review: https://reviews.apache.org/r/41954
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/31a5fb07
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/31a5fb07
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/31a5fb07
Branch: refs/heads/master
Commit: 31a5fb076a24427155fc8153301be221644beb32
Parents: 002a2ae
Author: Vinod Kone <vi...@gmail.com>
Authored: Tue Jan 5 16:12:14 2016 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Jan 5 16:33:22 2016 -0800
----------------------------------------------------------------------
include/mesos/executor/executor.proto | 4 ++--
include/mesos/v1/executor/executor.proto | 4 ++--
src/slave/slave.cpp | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/31a5fb07/include/mesos/executor/executor.proto
----------------------------------------------------------------------
diff --git a/include/mesos/executor/executor.proto b/include/mesos/executor/executor.proto
index 8f97ad8..cc6b4f6 100644
--- a/include/mesos/executor/executor.proto
+++ b/include/mesos/executor/executor.proto
@@ -128,8 +128,8 @@ message Event {
// it must include a list of all the tasks and updates which haven't been
// acknowledged by the scheduler.
message Subscribe {
- repeated TaskInfo tasks = 1;
- repeated Update updates = 2;
+ repeated TaskInfo unacknowledged_tasks = 1;
+ repeated Update unacknowledged_updates = 2;
}
// Notifies the scheduler that a task has transitioned from one
http://git-wip-us.apache.org/repos/asf/mesos/blob/31a5fb07/include/mesos/v1/executor/executor.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/executor/executor.proto b/include/mesos/v1/executor/executor.proto
index 7eaa40b..4ecdaa0 100644
--- a/include/mesos/v1/executor/executor.proto
+++ b/include/mesos/v1/executor/executor.proto
@@ -128,8 +128,8 @@ message Event {
// it must include a list of all the tasks and updates which haven't been
// acknowledged by the scheduler.
message Subscribe {
- repeated TaskInfo tasks = 1;
- repeated Update updates = 2;
+ repeated TaskInfo unacknowledged_tasks = 1;
+ repeated Update unacknowledged_updates = 2;
}
// Notifies the scheduler that a task has transitioned from one
http://git-wip-us.apache.org/repos/asf/mesos/blob/31a5fb07/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 9d80c96..90d0fec 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -2491,7 +2491,7 @@ void Slave::subscribe(
// after it checkpointed the update but before it could send the
// ACK to the executor). This is ok because the status update
// manager correctly handles duplicate updates.
- foreach (const Call::Update& update, subscribe.updates()) {
+ foreach (const Call::Update& update, subscribe.unacknowledged_updates()) {
// NOTE: This also updates the executor's resources!
statusUpdate(protobuf::createStatusUpdate(
framework->id(),
@@ -2522,7 +2522,7 @@ void Slave::subscribe(
executor->queuedTasks.values()));
hashmap<TaskID, TaskInfo> unackedTasks;
- foreach (const TaskInfo& task, subscribe.tasks()) {
+ foreach (const TaskInfo& task, subscribe.unacknowledged_tasks()) {
unackedTasks[task.task_id()] = task;
}