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 2015/09/02 00:49:33 UTC
mesos git commit: Renamed slave to agent in the HTTP API user doc.
Repository: mesos
Updated Branches:
refs/heads/master b2879ff48 -> 94adcc02e
Renamed slave to agent in the HTTP API user doc.
Review: https://reviews.apache.org/r/38023
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/94adcc02
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/94adcc02
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/94adcc02
Branch: refs/heads/master
Commit: 94adcc02efff0207147ccfe11cad5de7718bba7d
Parents: b2879ff
Author: Isabel Jimenez <co...@isabeljimenez.com>
Authored: Tue Sep 1 15:48:58 2015 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Sep 1 15:48:58 2015 -0700
----------------------------------------------------------------------
docs/scheduler_http_api.md | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/94adcc02/docs/scheduler_http_api.md
----------------------------------------------------------------------
diff --git a/docs/scheduler_http_api.md b/docs/scheduler_http_api.md
index 11f4d83..cfac510 100644
--- a/docs/scheduler_http_api.md
+++ b/docs/scheduler_http_api.md
@@ -185,7 +185,7 @@ Content-Type: application/json
“type” : “KILL”,
“kill” : {
“task_id” : {“value” : “12220-3440-12532-my-task”},
- “slave_id” : {“value” : “12220-3440-12532-S1233”}
+ “agent_id” : {“value” : “12220-3440-12532-S1233”}
}
}
@@ -195,7 +195,7 @@ HTTP/1.1 202 Accepted
```
### SHUTDOWN
-Sent by the scheduler to shutdown a specific custom executor (NOTE: This is a new call that was not present in the old API). When an executor gets a shutdown event, it is expected to kill all its tasks (and send `TASK_KILLED` updates) and terminate. If an executor doesn’t terminate within a certain timeout (configurable via “--executor_shutdown_grace_period” slave flag), the slave will forcefully destroy the container (executor and its tasks) and transitions its active tasks to `TASK_LOST`.
+Sent by the scheduler to shutdown a specific custom executor (NOTE: This is a new call that was not present in the old API). When an executor gets a shutdown event, it is expected to kill all its tasks (and send `TASK_KILLED` updates) and terminate. If an executor doesn’t terminate within a certain timeout (configurable via “--executor_shutdown_grace_period” agent flag), the agent will forcefully destroy the container (executor and its tasks) and transitions its active tasks to `TASK_LOST`.
```
SHUTDOWN Request (JSON):
@@ -209,7 +209,7 @@ Content-Type: application/json
“type” : “SHUTDOWN”,
“shutdown” : {
“executor_id” : {“value” : “123450-2340-1232-my-executor”},
- “slave_id” : {“value” : “12220-3440-12532-S1233”}
+ “agent_id” : {“value” : “12220-3440-12532-S1233”}
}
}
@@ -232,7 +232,7 @@ Content-Type: application/json
“framework_id” : {“value” : “12220-3440-12532-2345”},
“type” : “ACKNOWLEDGE”,
“acknowledge” : {
- “slave_id” : {“value” : “12220-3440-12532-S1233”},
+ “agent_id” : {“value” : “12220-3440-12532-S1233”},
“task_id” : {“value” : “12220-3440-12532-my-task”},
“uuid” : “jhadf73jhakdlfha723adf”
}
@@ -259,7 +259,7 @@ Content-Type: application/json
“reconcile” : {
“tasks” : [
{ “task_id” : { “value” : “312325” },
- “slave_id” : { “value” : “123535” }
+ “agent_id” : { “value” : “123535” }
}
]
}
@@ -284,7 +284,7 @@ Content-Type: application/json
“framework_id” : {“value” : “12220-3440-12532-2345”},
“type” : “MESSAGE”,
“message” : {
- “slave_id” : {“value” : “12220-3440-12532-S1233”},
+ “agent_id” : {“value” : “12220-3440-12532-S1233”},
“executor_id” : {“value” : “my-framework-executor”},
“data” : “adaf838jahd748jnaldf”
}
@@ -310,7 +310,7 @@ Content-Type: application/json
“type” : “REQUEST”,
“requests” : [
{
- “slave_id” : {“value” : “12220-3440-12532-S1233”},
+ “agent_id” : {“value” : “12220-3440-12532-S1233”},
“resources” : {}
},
]
@@ -332,7 +332,7 @@ The first event sent by the master when the scheduler sends a `SUBSCRIBE` reques
### OFFERS
-Sent by the master whenever there are new resources that can be offered to the framework. Each offer corresponds to a set of resources on a slave. Until the scheduler 'Accept's or 'Decline's an offer the resources are considered allocated to the scheduler, unless the offer is otherwise rescinded, e.g. due to a lost slave or `--offer_timeout`.
+Sent by the master whenever there are new resources that can be offered to the framework. Each offer corresponds to a set of resources on a agent. Until the scheduler 'Accept's or 'Decline's an offer the resources are considered allocated to the scheduler, unless the offer is otherwise rescinded, e.g. due to a lost agent or `--offer_timeout`.
```
OFFERS Event (JSON)
@@ -343,8 +343,8 @@ OFFERS Event (JSON)
{
“offer_id”:{“value”: “12214-23523-O235235”},
“framework_id”:{“value”: “12124-235325-32425”},
- “slave_id”:{“value”: “12325-23523-S23523”},
- “hostname”:“slave.host”,
+ “agent_id”:{“value”: “12325-23523-S23523”},
+ “hostname”:“agent.host”,
“resources”:[...],
“attributes”:[...],
“executor_ids”:[]
@@ -354,7 +354,7 @@ OFFERS Event (JSON)
```
### RESCIND
-Sent by the master when a particular offer is no longer valid (e.g., the slave corresponding to the offer has been removed) and hence needs to be rescinded. Any future calls (`ACCEPT` / `DECLINE`) made by the scheduler regarding this offer will be invalid.
+Sent by the master when a particular offer is no longer valid (e.g., the agent corresponding to the offer has been removed) and hence needs to be rescinded. Any future calls (`ACCEPT` / `DECLINE`) made by the scheduler regarding this offer will be invalid.
```
RESCIND Event (JSON)
@@ -368,7 +368,7 @@ RESCIND Event (JSON)
```
### UPDATE
-Sent by the master whenever there is a status update that is generated by the executor, slave or master. Status updates should be used by executors to reliably communicate the status of the tasks that they manage. It is crucial that a terminal update (e.g., `TASK_FINISHED`, `TASK_KILLED`, `TASK_FAILED`) is sent by the executor as soon as the task terminates, in order for Mesos to release the resources allocated to the task. It is also the responsibility of the scheduler to explicitly acknowledge the receipt of status updates that are reliably retried. See `ACKNOWLEDGE` in the Calls section above for the semantics. Note that `uuid` and `data` are raw bytes encoded in Base64.
+Sent by the master whenever there is a status update that is generated by the executor, agent or master. Status updates should be used by executors to reliably communicate the status of the tasks that they manage. It is crucial that a terminal update (e.g., `TASK_FINISHED`, `TASK_KILLED`, `TASK_FAILED`) is sent by the executor as soon as the task terminates, in order for Mesos to release the resources allocated to the task. It is also the responsibility of the scheduler to explicitly acknowledge the receipt of status updates that are reliably retried. See `ACKNOWLEDGE` in the Calls section above for the semantics. Note that `uuid` and `data` are raw bytes encoded in Base64.
```
@@ -400,7 +400,7 @@ MESSAGE Event (JSON)
{
“type” : “MESSAGE”,
“message” : {
- “slave_id” : { “value” : “12214-23523-S235235”},
+ “agent_id” : { “value” : “12214-23523-S235235”},
“executor_id” : { “value” : “12214-23523-my-executor”},
“data” : “adfadf3t2wa3353dfadf”
}
@@ -409,7 +409,7 @@ MESSAGE Event (JSON)
### FAILURE
-Sent by the master when a slave is removed from the cluster (e.g., failed health checks) or when an executor is terminated. Note that, this event coincides with receipt of terminal `UPDATE` events for any active tasks belonging to the slave or executor and receipt of `RESCIND` events for any outstanding offers belonging to the slave. Note that there is no guaranteed order between the `FAILURE`, `UPDATE` and `RESCIND` events.
+Sent by the master when a agent is removed from the cluster (e.g., failed health checks) or when an executor is terminated. Note that, this event coincides with receipt of terminal `UPDATE` events for any active tasks belonging to the agent or executor and receipt of `RESCIND` events for any outstanding offers belonging to the agent. Note that there is no guaranteed order between the `FAILURE`, `UPDATE` and `RESCIND` events.
```
FAILURE Event (JSON)
@@ -418,7 +418,7 @@ FAILURE Event (JSON)
{
“type” : “FAILURE”,
“failure” : {
- “slave_id” : { “value” : “12214-23523-S235235”},
+ “agent_id” : { “value” : “12214-23523-S235235”},
“executor_id” : { “value” : “12214-23523-my-executor”},
“status” : 1
}