You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2015/09/10 11:27:45 UTC
[2/2] mesos git commit: Removed unnecessary usage information.
Removed unnecessary usage information.
Review: https://reviews.apache.org/r/37589
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0bbeab25
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0bbeab25
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0bbeab25
Branch: refs/heads/master
Commit: 0bbeab2580d671fefa8d3705e15392da069e9d00
Parents: ed1df95
Author: haosdent huang <ha...@gmail.com>
Authored: Thu Sep 10 01:22:01 2015 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Thu Sep 10 02:21:18 2015 -0700
----------------------------------------------------------------------
src/files/files.cpp | 8 --------
src/master/http.cpp | 29 -----------------------------
src/master/registrar.cpp | 2 --
src/slave/http.cpp | 4 ----
src/slave/monitor.cpp | 2 --
5 files changed, 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0bbeab25/src/files/files.cpp
----------------------------------------------------------------------
diff --git a/src/files/files.cpp b/src/files/files.cpp
index b2134aa..a8807b6 100644
--- a/src/files/files.cpp
+++ b/src/files/files.cpp
@@ -188,8 +188,6 @@ void FilesProcess::detach(const string& name)
const string FilesProcess::BROWSE_HELP = HELP(
TLDR(
"Returns a file listing for a directory."),
- USAGE(
- "/files/browse.json"),
DESCRIPTION(
"Lists files and directories contained in the path as",
"a JSON object.",
@@ -262,8 +260,6 @@ Future<Response> _read(int fd,
const string FilesProcess::READ_HELP = HELP(
TLDR(
"Reads data from a file."),
- USAGE(
- "/files/read.json"),
DESCRIPTION(
"This endpoint reads data from a file at a given offset and for",
"a given length."
@@ -392,8 +388,6 @@ Future<Response> FilesProcess::read(const Request& request)
const string FilesProcess::DOWNLOAD_HELP = HELP(
TLDR(
"Returns the raw file contents for a given path."),
- USAGE(
- "/files/download.json"),
DESCRIPTION(
"This endpoint will return the raw file contents for the",
"given path.",
@@ -449,8 +443,6 @@ Future<Response> FilesProcess::download(const Request& request)
const string FilesProcess::DEBUG_HELP = HELP(
TLDR(
"Returns the internal virtual path mapping."),
- USAGE(
- "/files/debug.json"),
DESCRIPTION(
"This endpoint shows the internal virtual path map as a",
"JSON object."));
http://git-wip-us.apache.org/repos/asf/mesos/blob/0bbeab25/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index a052e55..73e8857 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -74,7 +74,6 @@ using process::DESCRIPTION;
using process::Future;
using process::HELP;
using process::TLDR;
-using process::USAGE;
using process::http::Accepted;
using process::http::BadRequest;
@@ -347,8 +346,6 @@ void Master::Http::log(const Request& request)
const string Master::Http::SCHEDULER_HELP = HELP(
TLDR(
"Endpoint for schedulers to make Calls against the master."),
- USAGE(
- "/api/v1/scheduler"),
DESCRIPTION(
"Returns 202 Accepted iff the request is accepted."));
@@ -519,8 +516,6 @@ Future<Response> Master::Http::scheduler(const Request& request) const
const string Master::Http::HEALTH_HELP = HELP(
TLDR(
"Health check of the Master."),
- USAGE(
- "/master/health"),
DESCRIPTION(
"Returns 200 OK iff the Master is healthy.",
"Delayed responses are also indicative of poor health."));
@@ -538,8 +533,6 @@ const static string MONITOR_KEY = "monitor";
const string Master::Http::OBSERVE_HELP = HELP(
TLDR(
"Observe a monitor health state for host(s)."),
- USAGE(
- "/master/observe"),
DESCRIPTION(
"This endpoint receives information indicating host(s) ",
"health."
@@ -630,8 +623,6 @@ Future<Response> Master::Http::observe(const Request& request) const
const string Master::Http::REDIRECT_HELP = HELP(
TLDR(
"Redirects to the leading Master."),
- USAGE(
- "/master/redirect"),
DESCRIPTION(
"This returns a 307 Temporary Redirect to the leading Master.",
"If no Master is leading (according to this Master), then the",
@@ -752,8 +743,6 @@ Future<Response> Master::Http::reserve(const Request& request) const
const string Master::Http::SLAVES_HELP = HELP(
TLDR(
"Information about registered slaves."),
- USAGE(
- "/master/slaves"),
DESCRIPTION(
"This endpoint shows information about the slaves registered in",
"this master formatted as a JSON object."));
@@ -782,8 +771,6 @@ Future<Response> Master::Http::slaves(const Request& request) const
const string Master::Http::STATE_HELP = HELP(
TLDR(
"Information about state of master."),
- USAGE(
- "/master/state.json"),
DESCRIPTION(
"This endpoint shows information about the frameworks, tasks,",
"executors and slaves running in the cluster as a JSON object."));
@@ -1076,8 +1063,6 @@ private:
const string Master::Http::STATESUMMARY_HELP = HELP(
TLDR(
"Summary of state of all tasks and registered frameworks in cluster."),
- USAGE(
- "/master/state-summary"),
DESCRIPTION(
"This endpoint gives a summary of the state of all tasks and",
"registered frameworks in the cluster as a JSON object."));
@@ -1194,8 +1179,6 @@ Future<Response> Master::Http::stateSummary(const Request& request) const
const string Master::Http::ROLES_HELP = HELP(
TLDR(
"Information about roles that the master is configured with."),
- USAGE(
- "/master/roles.json"),
DESCRIPTION(
"This endpoint gives information about the roles that are assigned",
"to frameworks and resources as a JSON object."));
@@ -1223,8 +1206,6 @@ const string Master::Http::TEARDOWN_HELP = HELP(
TLDR(
"Tears down a running framework by shutting down all tasks/executors "
"and removing the framework."),
- USAGE(
- "/master/teardown"),
DESCRIPTION(
"Please provide a \"frameworkId\" value designating the running "
"framework to tear down.",
@@ -1319,8 +1300,6 @@ Future<Response> Master::Http::_teardown(
const string Master::Http::TASKS_HELP = HELP(
TLDR(
"Lists tasks from all active frameworks."),
- USAGE(
- "/master/tasks.json"),
DESCRIPTION(
"Lists known tasks.",
"",
@@ -1442,8 +1421,6 @@ Future<Response> Master::Http::tasks(const Request& request) const
const string Master::Http::MAINTENANCE_SCHEDULE_HELP = HELP(
TLDR(
"Returns or updates the cluster's maintenance schedule."),
- USAGE(
- "/master/maintenance/schedule"),
DESCRIPTION(
"GET: Returns the current maintenance schedule as JSON.",
"POST: Validates the request body as JSON",
@@ -1557,8 +1534,6 @@ Future<Response> Master::Http::maintenanceSchedule(const Request& request) const
const string Master::Http::MACHINE_DOWN_HELP = HELP(
TLDR(
"Brings a set of machines down."),
- USAGE(
- "/master/machine/down"),
DESCRIPTION(
"POST: Validates the request body as JSON and transitions",
" the list of machines into DOWN mode. Currently, only",
@@ -1630,8 +1605,6 @@ Future<Response> Master::Http::machineDown(const Request& request) const
const string Master::Http::MACHINE_UP_HELP = HELP(
TLDR(
"Brings a set of machines back up."),
- USAGE(
- "/master/machine/up"),
DESCRIPTION(
"POST: Validates the request body as JSON and transitions",
" the list of machines into UP mode. This also removes",
@@ -1732,8 +1705,6 @@ Future<Response> Master::Http::machineUp(const Request& request) const
const string Master::Http::MAINTENANCE_STATUS_HELP = HELP(
TLDR(
"Retrieves the maintenance status of the cluster."),
- USAGE(
- "/master/maintenance/status"),
DESCRIPTION(
"Returns an object with one list of machines per machine mode."));
http://git-wip-us.apache.org/repos/asf/mesos/blob/0bbeab25/src/master/registrar.cpp
----------------------------------------------------------------------
diff --git a/src/master/registrar.cpp b/src/master/registrar.cpp
index ca8efb4..d81560a 100644
--- a/src/master/registrar.cpp
+++ b/src/master/registrar.cpp
@@ -254,8 +254,6 @@ string RegistrarProcess::registryHelp()
return HELP(
TLDR(
"Returns the current contents of the Registry in JSON."),
- USAGE(
- "/registrar(1)/registry"),
DESCRIPTION(
"Example:"
"",
http://git-wip-us.apache.org/repos/asf/mesos/blob/0bbeab25/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index b0fe5f5..101aa06 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -185,8 +185,6 @@ void Slave::Http::log(const Request& request)
const string Slave::Http::HEALTH_HELP = HELP(
TLDR(
"Health check of the Slave."),
- USAGE(
- "/health"),
DESCRIPTION(
"Returns 200 OK iff the Slave is healthy.",
"Delayed responses are also indicative of poor health."));
@@ -201,8 +199,6 @@ Future<Response> Slave::Http::health(const Request& request) const
const string Slave::Http::STATE_HELP = HELP(
TLDR(
"Information about state of the Slave."),
- USAGE(
- "/state.json"),
DESCRIPTION(
"This endpoint shows information about the frameworks, executors",
"and the slave's master as a JSON object."));
http://git-wip-us.apache.org/repos/asf/mesos/blob/0bbeab25/src/slave/monitor.cpp
----------------------------------------------------------------------
diff --git a/src/slave/monitor.cpp b/src/slave/monitor.cpp
index 82aa659..93ba279 100644
--- a/src/slave/monitor.cpp
+++ b/src/slave/monitor.cpp
@@ -47,8 +47,6 @@ static const string STATISTICS_HELP()
return HELP(
TLDR(
"Retrieve resource monitoring information."),
- USAGE(
- "/statistics.json"),
DESCRIPTION(
"Returns the current resource consumption data for containers",
"running under this slave.",