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 2016/03/31 23:31:48 UTC
mesos git commit: Minor cleanups in validation logic for operator
endpoints.
Repository: mesos
Updated Branches:
refs/heads/master d789878bf -> ba3ed357c
Minor cleanups in validation logic for operator endpoints.
This trivial patch cleans up the following things:
- Style in-consistencies where we used to take the hashmap
as constant reference in other places but not in `teardown`
call handler.
- Avoid lookups twice in the hash map but save it in an
`Option` variable. This is more consistent with the code
at other places.
Review: https://reviews.apache.org/r/45553/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ba3ed357
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ba3ed357
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ba3ed357
Branch: refs/heads/master
Commit: ba3ed357c941cda4c05bc9a3bebf61c092f738e8
Parents: d789878
Author: Anand Mazumdar <ma...@gmail.com>
Authored: Thu Mar 31 14:30:05 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Mar 31 14:30:05 2016 -0700
----------------------------------------------------------------------
src/master/http.cpp | 55 +++++++++++++++++++++++++++++++-----------------
1 file changed, 36 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ba3ed357/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 03d4eba..f781fd0 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -580,24 +580,28 @@ Future<Response> Master::Http::createVolumes(
const hashmap<string, string>& values = decode.get();
- if (values.get("slaveId").isNone()) {
+ Option<string> value;
+
+ value = values.get("slaveId");
+ if (value.isNone()) {
return BadRequest("Missing 'slaveId' query parameter");
}
SlaveID slaveId;
- slaveId.set_value(values.get("slaveId").get());
+ slaveId.set_value(value.get());
Slave* slave = master->slaves.registered.get(slaveId);
if (slave == NULL) {
return BadRequest("No slave found with specified ID");
}
- if (values.get("volumes").isNone()) {
+ value = values.get("volumes");
+ if (value.isNone()) {
return BadRequest("Missing 'volumes' query parameter");
}
Try<JSON::Array> parse =
- JSON::parse<JSON::Array>(values.get("volumes").get());
+ JSON::parse<JSON::Array>(value.get());
if (parse.isError()) {
return BadRequest(
@@ -675,24 +679,28 @@ Future<Response> Master::Http::destroyVolumes(
const hashmap<string, string>& values = decode.get();
- if (values.get("slaveId").isNone()) {
+ Option<string> value;
+
+ value = values.get("slaveId");
+ if (value.isNone()) {
return BadRequest("Missing 'slaveId' query parameter");
}
SlaveID slaveId;
- slaveId.set_value(values.get("slaveId").get());
+ slaveId.set_value(value.get());
Slave* slave = master->slaves.registered.get(slaveId);
if (slave == NULL) {
return BadRequest("No slave found with specified ID");
}
- if (values.get("volumes").isNone()) {
+ value = values.get("volumes");
+ if (value.isNone()) {
return BadRequest("Missing 'volumes' query parameter");
}
Try<JSON::Array> parse =
- JSON::parse<JSON::Array>(values.get("volumes").get());
+ JSON::parse<JSON::Array>(value.get());
if (parse.isError()) {
return BadRequest(
@@ -1007,24 +1015,28 @@ Future<Response> Master::Http::reserve(
const hashmap<string, string>& values = decode.get();
- if (values.get("slaveId").isNone()) {
+ Option<string> value;
+
+ value = values.get("slaveId");
+ if (value.isNone()) {
return BadRequest("Missing 'slaveId' query parameter");
}
SlaveID slaveId;
- slaveId.set_value(values.get("slaveId").get());
+ slaveId.set_value(value.get());
Slave* slave = master->slaves.registered.get(slaveId);
if (slave == NULL) {
return BadRequest("No slave found with specified ID");
}
- if (values.get("resources").isNone()) {
+ value = values.get("resources");
+ if (value.isNone()) {
return BadRequest("Missing 'resources' query parameter");
}
Try<JSON::Array> parse =
- JSON::parse<JSON::Array>(values.get("resources").get());
+ JSON::parse<JSON::Array>(value.get());
if (parse.isError()) {
return BadRequest(
@@ -1819,14 +1831,15 @@ Future<Response> Master::Http::teardown(
return BadRequest("Unable to decode query string: " + decode.error());
}
- hashmap<string, string> values = decode.get();
+ const hashmap<string, string>& values = decode.get();
- if (values.get("frameworkId").isNone()) {
+ Option<string> value = values.get("frameworkId");
+ if (value.isNone()) {
return BadRequest("Missing 'frameworkId' query parameter");
}
FrameworkID id;
- id.set_value(values.get("frameworkId").get());
+ id.set_value(value.get());
Framework* framework = master->getFramework(id);
@@ -2463,24 +2476,28 @@ Future<Response> Master::Http::unreserve(
const hashmap<string, string>& values = decode.get();
- if (values.get("slaveId").isNone()) {
+ Option<string> value;
+
+ value = values.get("slaveId");
+ if (value.isNone()) {
return BadRequest("Missing 'slaveId' query parameter");
}
SlaveID slaveId;
- slaveId.set_value(values.get("slaveId").get());
+ slaveId.set_value(value.get());
Slave* slave = master->slaves.registered.get(slaveId);
if (slave == NULL) {
return BadRequest("No slave found with specified ID");
}
- if (values.get("resources").isNone()) {
+ value = values.get("resources");
+ if (value.isNone()) {
return BadRequest("Missing 'resources' query parameter");
}
Try<JSON::Array> parse =
- JSON::parse<JSON::Array>(values.get("resources").get());
+ JSON::parse<JSON::Array>(value.get());
if (parse.isError()) {
return BadRequest(