Repository: mesos Updated Branches: refs/heads/master 9e612c21e -> 5263a6211
Fixed endpoint generation script. Also updated the docs as a side-effect of running the script. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5263a621 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5263a621 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5263a621 Branch: refs/heads/master Commit: 5263a62118b22df63f3d5364140dfc14ecc97dd7 Parents: 9e612c2 Author: Vinod Kone <vinodk...@gmail.com> Authored: Wed Jun 1 00:12:33 2016 -0600 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Wed Jun 1 00:13:17 2016 -0600 ---------------------------------------------------------------------- docs/endpoints/index.md | 4 +++- docs/endpoints/master/api/v1.md | 24 ++++++++++++++++++++++++ docs/endpoints/master/weights.md | 2 +- docs/endpoints/slave/api/v1.md | 19 +++++++++++++++++++ support/generate-endpoint-help.py | 6 ++++-- 5 files changed, 51 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/5263a621/docs/endpoints/index.md ---------------------------------------------------------------------- diff --git a/docs/endpoints/index.md b/docs/endpoints/index.md index d22a560..e9f8b52 100644 --- a/docs/endpoints/index.md +++ b/docs/endpoints/index.md @@ -38,6 +38,7 @@ For example, http://master.com:5050/files/browse * [/logging/toggle](logging/toggle.md) ### master ### +* [/api/v1](master/api/v1.md) * [/api/v1/scheduler](master/api/v1/scheduler.md) * [/create-volumes](master/create-volumes.md) * [/destroy-volumes](master/destroy-volumes.md) @@ -107,6 +108,7 @@ For example, http://agent.com:5051/files/browse * [/profiler/stop](profiler/stop.md) ### slave(id) ### +* [/api/v1](slave/api/v1.md) * [/api/v1/executor](slave/api/v1/executor.md) * [/containers](slave/containers.md) * [/flags](slave/flags.md) @@ -120,4 +122,4 @@ For example, http://agent.com:5051/files/browse * [/system/stats.json](system/stats.json.md) ### version ### -* [/version](version.md) +* [/version](version.md) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mesos/blob/5263a621/docs/endpoints/master/api/v1.md ---------------------------------------------------------------------- diff --git a/docs/endpoints/master/api/v1.md b/docs/endpoints/master/api/v1.md new file mode 100644 index 0000000..19c6142 --- /dev/null +++ b/docs/endpoints/master/api/v1.md @@ -0,0 +1,24 @@ +--- +title: Apache Mesos - HTTP Endpoints - /api/v1 +layout: documentation +--- +<!--- This is an automatically generated file. DO NOT EDIT! ---> + +### USAGE ### +> /api/v1 +> /master/api/v1 + +### TL;DR; ### +Endpoint for API calls against the master. + +### DESCRIPTION ### +Returns 200 OK when the request was processed sucessfully. +Returns 307 TEMPORARY_REDIRECT redirect to the leading master when +current master is not the leader. +Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be +found. + + +### AUTHENTICATION ### +This endpoint requires authentication iff HTTP authentication is +enabled. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mesos/blob/5263a621/docs/endpoints/master/weights.md ---------------------------------------------------------------------- diff --git a/docs/endpoints/master/weights.md b/docs/endpoints/master/weights.md index 5697c78..709b641 100644 --- a/docs/endpoints/master/weights.md +++ b/docs/endpoints/master/weights.md @@ -29,4 +29,4 @@ enabled. Getting weight information for a certain role requires that the current principal is authorized to get weights for the target role, otherwise the entry for the target role could be silently filtered. -See the authorization documentation for details. +See the authorization documentation for details. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mesos/blob/5263a621/docs/endpoints/slave/api/v1.md ---------------------------------------------------------------------- diff --git a/docs/endpoints/slave/api/v1.md b/docs/endpoints/slave/api/v1.md new file mode 100644 index 0000000..c867d79 --- /dev/null +++ b/docs/endpoints/slave/api/v1.md @@ -0,0 +1,19 @@ +--- +title: Apache Mesos - HTTP Endpoints - /api/v1 +layout: documentation +--- +<!--- This is an automatically generated file. DO NOT EDIT! ---> + +### USAGE ### +> /api/v1 +> /slave(1)/api/v1 + +### TL;DR; ### +Endpoint for API calls against the agent. + +### DESCRIPTION ### +Returns 200 OK if the call is successful + + +### AUTHENTICATION ### +This endpoint does not require authentication. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mesos/blob/5263a621/support/generate-endpoint-help.py ---------------------------------------------------------------------- diff --git a/support/generate-endpoint-help.py b/support/generate-endpoint-help.py index 70221fe..90431a7 100755 --- a/support/generate-endpoint-help.py +++ b/support/generate-endpoint-help.py @@ -34,12 +34,14 @@ AGENT_PORT = 5051 MASTER_COMMAND = [ 'mesos-master.sh', '--ip=%s' % (HOST_IP), - '--registry=in_memory' + '--registry=in_memory', + '--work_dir=/tmp/mesos' ] AGENT_COMMAND = [ 'mesos-agent.sh', - '--master=%s:%s' % (HOST_IP, MASTER_PORT) + '--master=%s:%s' % (HOST_IP, MASTER_PORT), + '--work_dir=/tmp/mesos' ]
