You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2016/06/29 16:22:19 UTC
[3/3] mesos git commit: Moved the agent exists check to
`_reserve/_unreserve`.
Moved the agent exists check to `_reserve/_unreserve`.
This change moved the agent exists check that is common to
both `/reserve` and the new API to `_reserve`. This is
consistent to how the `/create-volumes` already does it.
Review: https://reviews.apache.org/r/49335/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d09491e6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d09491e6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d09491e6
Branch: refs/heads/master
Commit: d09491e6332a5e6340c7c6ba19185ebd5f75191c
Parents: 1bb89ea
Author: Anand Mazumdar <an...@apache.org>
Authored: Wed Jun 29 09:21:25 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Wed Jun 29 09:21:53 2016 -0700
----------------------------------------------------------------------
src/master/http.cpp | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d09491e6/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index e891383..7b7e270 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -1635,12 +1635,6 @@ Future<Response> Master::Http::reserveResources(
CHECK_EQ(mesos::master::Call::RESERVE_RESOURCES, call.type());
const SlaveID& slaveId = call.reserve_resources().agent_id();
-
- Slave* slave = master->slaves.registered.get(slaveId);
- if (slave == nullptr) {
- return BadRequest("No agent found with specified ID");
- }
-
const Resources& resources = call.reserve_resources().resources();
return _reserve(slaveId, resources, principal);
@@ -1655,12 +1649,6 @@ Future<Response> Master::Http::unreserveResources(
CHECK_EQ(mesos::master::Call::UNRESERVE_RESOURCES, call.type());
const SlaveID& slaveId = call.unreserve_resources().agent_id();
-
- Slave* slave = master->slaves.registered.get(slaveId);
- if (slave == nullptr) {
- return BadRequest("No agent found with specified ID");
- }
-
const Resources& resources = call.unreserve_resources().resources();
return _unreserve(slaveId, resources, principal);
@@ -1787,11 +1775,6 @@ Future<Response> Master::Http::reserve(
SlaveID slaveId;
slaveId.set_value(value.get());
- Slave* slave = master->slaves.registered.get(slaveId);
- if (slave == nullptr) {
- return BadRequest("No agent found with specified ID");
- }
-
value = values.get("resources");
if (value.isNone()) {
return BadRequest("Missing 'resources' query parameter");
@@ -1832,6 +1815,11 @@ Future<Response> Master::Http::_reserve(
const Resources& resources,
const Option<string>& principal) const
{
+ Slave* slave = master->slaves.registered.get(slaveId);
+ if (slave == nullptr) {
+ return BadRequest("No agent found with specified ID");
+ }
+
// Create an offer operation.
Offer::Operation operation;
operation.set_type(Offer::Operation::RESERVE);
@@ -3836,11 +3824,6 @@ Future<Response> Master::Http::unreserve(
SlaveID slaveId;
slaveId.set_value(value.get());
- Slave* slave = master->slaves.registered.get(slaveId);
- if (slave == nullptr) {
- return BadRequest("No agent found with specified ID");
- }
-
value = values.get("resources");
if (value.isNone()) {
return BadRequest("Missing 'resources' query parameter");
@@ -3881,6 +3864,11 @@ Future<Response> Master::Http::_unreserve(
const Resources& resources,
const Option<string>& principal) const
{
+ Slave* slave = master->slaves.registered.get(slaveId);
+ if (slave == nullptr) {
+ return BadRequest("No agent found with specified ID");
+ }
+
// Create an offer operation.
Offer::Operation operation;
operation.set_type(Offer::Operation::UNRESERVE);