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/19 10:49:00 UTC
mesos git commit: Add help message for dynamic reservation endpoints.
Repository: mesos
Updated Branches:
refs/heads/master 016b02d7e -> ed7de0410
Add help message for dynamic reservation endpoints.
Review: https://reviews.apache.org/r/38347
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ed7de041
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ed7de041
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ed7de041
Branch: refs/heads/master
Commit: ed7de041075a2cb5d11926b8748684d887a9a5f3
Parents: 016b02d
Author: Guangya Liu <gy...@gmail.com>
Authored: Fri Sep 18 19:49:45 2015 -0400
Committer: Michael Park <mp...@apache.org>
Committed: Sat Sep 19 03:51:36 2015 -0400
----------------------------------------------------------------------
src/master/http.cpp | 18 ++++++++++++++++++
src/master/master.cpp | 4 ++--
src/master/master.hpp | 2 ++
3 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ed7de041/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 7cca8b1..607d8e1 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -670,6 +670,15 @@ Future<Response> Master::Http::redirect(const Request& request) const
}
+const string Master::Http::RESERVE_HELP = HELP(
+ TLDR(
+ "Reserve resources dynamically on a specific slave."),
+ DESCRIPTION(
+ "Returns 200 OK if resource reservation was successful.",
+ "Please provide \"slaveId\" and \"resources\" values designating ",
+ "the resources to be reserved."));
+
+
Future<Response> Master::Http::reserve(const Request& request) const
{
if (request.method != "POST") {
@@ -1774,6 +1783,15 @@ Future<Response> Master::Http::maintenanceStatus(const Request& request) const
}
+const string Master::Http::UNRESERVE_HELP = HELP(
+ TLDR(
+ "Unreserve resources dynamically on a specific slave."),
+ DESCRIPTION(
+ "Returns 200 OK if resource unreservation was successful.",
+ "Please provide \"slaveId\" and \"resources\" values designating ",
+ "the resources to be unreserved."));
+
+
Future<Response> Master::Http::unreserve(const Request& request) const
{
if (request.method != "POST") {
http://git-wip-us.apache.org/repos/asf/mesos/blob/ed7de041/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 64e5fb9..7fb5159 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -773,7 +773,7 @@ void Master::initialize()
return http.redirect(request);
});
route("/reserve",
- None(), // TODO(mpark): Add an Http::RESERVE_HELP,
+ Http::RESERVE_HELP,
[http](const process::http::Request& request) {
Http::log(request);
return http.reserve(request);
@@ -863,7 +863,7 @@ void Master::initialize()
return http.machineUp(request);
});
route("/unreserve",
- None(), // TODO(mpark): Add an Http::UNRESERVE_HELP,
+ Http::UNRESERVE_HELP,
[http](const process::http::Request& request) {
Http::log(request);
return http.unreserve(request);
http://git-wip-us.apache.org/repos/asf/mesos/blob/ed7de041/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index 6805177..0c1e81c 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -925,6 +925,8 @@ private:
const static std::string MAINTENANCE_STATUS_HELP;
const static std::string MACHINE_DOWN_HELP;
const static std::string MACHINE_UP_HELP;
+ const static std::string RESERVE_HELP;
+ const static std::string UNRESERVE_HELP;
private:
// Helper for doing authentication, returns the credential used if