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:17 UTC
[1/3] mesos git commit: Moved code to group old/v1 operator API
implementations together.
Repository: mesos
Updated Branches:
refs/heads/master 1bb89eaa5 -> 0cde970af
Moved code to group old/v1 operator API implementations together.
This change moves the create/destroy volumes, reserve/unreserve
for the v1 API to be closer to the corresponding implementations
for the old API.
Review: https://reviews.apache.org/r/49337/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0cde970a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0cde970a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0cde970a
Branch: refs/heads/master
Commit: 0cde970aff8da9c2bf0aa594a390cac4be90f715
Parents: bb4f294
Author: Anand Mazumdar <an...@apache.org>
Authored: Wed Jun 29 09:21:38 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Wed Jun 29 09:21:53 2016 -0700
----------------------------------------------------------------------
src/master/http.cpp | 224 +++++++++++++++++++++++------------------------
1 file changed, 112 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0cde970a/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 5d763d6..e5acdb8 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -879,42 +879,6 @@ string Master::Http::CREATE_VOLUMES_HELP()
}
-Future<Response> Master::Http::_createVolumes(
- const SlaveID& slaveId,
- const RepeatedPtrField<Resource>& volumes,
- 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::CREATE);
- operation.mutable_create()->mutable_volumes()->CopyFrom(volumes);
-
- Option<Error> validate = validation::operation::validate(
- operation.create(), slave->checkpointedResources, principal);
-
- if (validate.isSome()) {
- return BadRequest("Invalid CREATE operation: " + validate.get().message);
- }
-
- return master->authorizeCreateVolume(operation.create(), principal)
- .then(defer(master->self(), [=](bool authorized) -> Future<Response> {
- if (!authorized) {
- return Forbidden();
- }
-
- // The resources required for this operation are equivalent to the
- // volumes specified by the user minus any DiskInfo (DiskInfo will
- // be created when this operation is applied).
- return _operation(slaveId, removeDiskInfos(volumes), operation);
- }));
-}
-
-
Future<Response> Master::Http::createVolumes(
const Request& request,
const Option<string>& principal) const
@@ -983,6 +947,42 @@ Future<Response> Master::Http::createVolumes(
}
+Future<Response> Master::Http::_createVolumes(
+ const SlaveID& slaveId,
+ const RepeatedPtrField<Resource>& volumes,
+ 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::CREATE);
+ operation.mutable_create()->mutable_volumes()->CopyFrom(volumes);
+
+ Option<Error> validate = validation::operation::validate(
+ operation.create(), slave->checkpointedResources, principal);
+
+ if (validate.isSome()) {
+ return BadRequest("Invalid CREATE operation: " + validate.get().message);
+ }
+
+ return master->authorizeCreateVolume(operation.create(), principal)
+ .then(defer(master->self(), [=](bool authorized) -> Future<Response> {
+ if (!authorized) {
+ return Forbidden();
+ }
+
+ // The resources required for this operation are equivalent to the
+ // volumes specified by the user minus any DiskInfo (DiskInfo will
+ // be created when this operation is applied).
+ return _operation(slaveId, removeDiskInfos(volumes), operation);
+ }));
+}
+
+
Future<Response> Master::Http::createVolumes(
const mesos::master::Call& call,
const Option<string>& principal,
@@ -1021,54 +1021,6 @@ string Master::Http::DESTROY_VOLUMES_HELP()
}
-Future<Response> Master::Http::_destroyVolumes(
- const SlaveID& slaveId,
- const RepeatedPtrField<Resource>& volumes,
- 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::DESTROY);
- operation.mutable_destroy()->mutable_volumes()->CopyFrom(volumes);
-
- Option<Error> validate = validation::operation::validate(
- operation.destroy(), slave->checkpointedResources);
-
- if (validate.isSome()) {
- return BadRequest("Invalid DESTROY operation: " + validate.get().message);
- }
-
- return master->authorizeDestroyVolume(operation.destroy(), principal)
- .then(defer(master->self(), [=](bool authorized) -> Future<Response> {
- if (!authorized) {
- return Forbidden();
- }
-
- return _operation(slaveId, volumes, operation);
- }));
-}
-
-
-Future<Response> Master::Http::destroyVolumes(
- const mesos::master::Call& call,
- const Option<string>& principal,
- ContentType /*contentType*/) const
-{
- CHECK_EQ(mesos::master::Call::DESTROY_VOLUMES, call.type());
- CHECK(call.has_destroy_volumes());
-
- const SlaveID& slaveId = call.destroy_volumes().slave_id();
- const RepeatedPtrField<Resource>& volumes = call.destroy_volumes().volumes();
-
- return _destroyVolumes(slaveId, volumes, principal);
-}
-
-
Future<Response> Master::Http::destroyVolumes(
const Request& request,
const Option<string>& principal) const
@@ -1137,6 +1089,54 @@ Future<Response> Master::Http::destroyVolumes(
}
+Future<Response> Master::Http::_destroyVolumes(
+ const SlaveID& slaveId,
+ const RepeatedPtrField<Resource>& volumes,
+ 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::DESTROY);
+ operation.mutable_destroy()->mutable_volumes()->CopyFrom(volumes);
+
+ Option<Error> validate = validation::operation::validate(
+ operation.destroy(), slave->checkpointedResources);
+
+ if (validate.isSome()) {
+ return BadRequest("Invalid DESTROY operation: " + validate.get().message);
+ }
+
+ return master->authorizeDestroyVolume(operation.destroy(), principal)
+ .then(defer(master->self(), [=](bool authorized) -> Future<Response> {
+ if (!authorized) {
+ return Forbidden();
+ }
+
+ return _operation(slaveId, volumes, operation);
+ }));
+}
+
+
+Future<Response> Master::Http::destroyVolumes(
+ const mesos::master::Call& call,
+ const Option<string>& principal,
+ ContentType /*contentType*/) const
+{
+ CHECK_EQ(mesos::master::Call::DESTROY_VOLUMES, call.type());
+ CHECK(call.has_destroy_volumes());
+
+ const SlaveID& slaveId = call.destroy_volumes().slave_id();
+ const RepeatedPtrField<Resource>& volumes = call.destroy_volumes().volumes();
+
+ return _destroyVolumes(slaveId, volumes, principal);
+}
+
+
string Master::Http::FRAMEWORKS_HELP()
{
return HELP(
@@ -1627,34 +1627,6 @@ Future<Response> Master::Http::getLeadingMaster(
}
-Future<Response> Master::Http::reserveResources(
- const mesos::master::Call& call,
- const Option<string>& principal,
- ContentType contentType) const
-{
- CHECK_EQ(mesos::master::Call::RESERVE_RESOURCES, call.type());
-
- const SlaveID& slaveId = call.reserve_resources().slave_id();
- const Resources& resources = call.reserve_resources().resources();
-
- return _reserve(slaveId, resources, principal);
-}
-
-
-Future<Response> Master::Http::unreserveResources(
- const mesos::master::Call& call,
- const Option<string>& principal,
- ContentType contentType) const
-{
- CHECK_EQ(mesos::master::Call::UNRESERVE_RESOURCES, call.type());
-
- const SlaveID& slaveId = call.unreserve_resources().slave_id();
- const Resources& resources = call.unreserve_resources().resources();
-
- return _unreserve(slaveId, resources, principal);
-}
-
-
string Master::Http::REDIRECT_HELP()
{
return HELP(
@@ -1847,6 +1819,20 @@ Future<Response> Master::Http::_reserve(
}
+Future<Response> Master::Http::reserveResources(
+ const mesos::master::Call& call,
+ const Option<string>& principal,
+ ContentType contentType) const
+{
+ CHECK_EQ(mesos::master::Call::RESERVE_RESOURCES, call.type());
+
+ const SlaveID& slaveId = call.reserve_resources().slave_id();
+ const Resources& resources = call.reserve_resources().resources();
+
+ return _reserve(slaveId, resources, principal);
+}
+
+
string Master::Http::SLAVES_HELP()
{
return HELP(
@@ -3948,6 +3934,20 @@ Future<Response> Master::Http::_operation(
});
}
+
+Future<Response> Master::Http::unreserveResources(
+ const mesos::master::Call& call,
+ const Option<string>& principal,
+ ContentType contentType) const
+{
+ CHECK_EQ(mesos::master::Call::UNRESERVE_RESOURCES, call.type());
+
+ const SlaveID& slaveId = call.unreserve_resources().slave_id();
+ const Resources& resources = call.unreserve_resources().resources();
+
+ return _unreserve(slaveId, resources, principal);
+}
+
} // namespace master {
} // namespace internal {
} // namespace mesos {
[2/3] mesos git commit: Renamed `agent_id` fields to `slave_id` for
unversioned master.proto.
Posted by an...@apache.org.
Renamed `agent_id` fields to `slave_id` for unversioned master.proto.
This change renames the `agent_id` to `slave_id` for the
unversioned protos to keep it consistent to other unversioned
protobuf files. Also, fixed a couple of minor issues of not
capturing aliases by const references for consistency.
Review: https://reviews.apache.org/r/49336/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bb4f294d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bb4f294d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bb4f294d
Branch: refs/heads/master
Commit: bb4f294d37a238b013cc6b50b40b7e2badfc3535
Parents: d09491e
Author: Anand Mazumdar <an...@apache.org>
Authored: Wed Jun 29 09:21:31 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Wed Jun 29 09:21:53 2016 -0700
----------------------------------------------------------------------
include/mesos/master/master.proto | 8 ++++----
src/master/http.cpp | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bb4f294d/include/mesos/master/master.proto
----------------------------------------------------------------------
diff --git a/include/mesos/master/master.proto b/include/mesos/master/master.proto
index 798b536..2e5d6ee 100644
--- a/include/mesos/master/master.proto
+++ b/include/mesos/master/master.proto
@@ -133,13 +133,13 @@ message Call {
// Reserve resources dynamically on a specific agent.
message ReserveResources {
- required SlaveID agent_id = 1;
+ required SlaveID slave_id = 1;
repeated Resource resources = 2;
}
// Unreserve resources dynamically on a specific agent.
message UnreserveResources {
- required SlaveID agent_id = 1;
+ required SlaveID slave_id = 1;
repeated Resource resources = 2;
}
@@ -149,7 +149,7 @@ message Call {
// the agent might fail. Volume creation can be verified by sending a
// `GET_VOLUMES` call.
message CreateVolumes {
- required SlaveID agent_id = 1;
+ required SlaveID slave_id = 1;
repeated Resource volumes = 2;
}
@@ -158,7 +158,7 @@ message Call {
// message may not be delivered or destroying the volumes at the agent might
// fail. Volume deletion can be verified by sending a `GET_VOLUMES` call.
message DestroyVolumes {
- required SlaveID agent_id = 1;
+ required SlaveID slave_id = 1;
repeated Resource volumes = 2;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/bb4f294d/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 7b7e270..5d763d6 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -991,8 +991,8 @@ Future<Response> Master::Http::createVolumes(
CHECK_EQ(mesos::master::Call::CREATE_VOLUMES, call.type());
CHECK(call.has_create_volumes());
- SlaveID slaveId = call.create_volumes().agent_id();
- RepeatedPtrField<Resource> volumes = call.create_volumes().volumes();
+ const SlaveID& slaveId = call.create_volumes().slave_id();
+ const RepeatedPtrField<Resource>& volumes = call.create_volumes().volumes();
return _createVolumes(slaveId, volumes, principal);
}
@@ -1062,8 +1062,8 @@ Future<Response> Master::Http::destroyVolumes(
CHECK_EQ(mesos::master::Call::DESTROY_VOLUMES, call.type());
CHECK(call.has_destroy_volumes());
- SlaveID slaveId = call.destroy_volumes().agent_id();
- RepeatedPtrField<Resource> volumes = call.destroy_volumes().volumes();
+ const SlaveID& slaveId = call.destroy_volumes().slave_id();
+ const RepeatedPtrField<Resource>& volumes = call.destroy_volumes().volumes();
return _destroyVolumes(slaveId, volumes, principal);
}
@@ -1634,7 +1634,7 @@ Future<Response> Master::Http::reserveResources(
{
CHECK_EQ(mesos::master::Call::RESERVE_RESOURCES, call.type());
- const SlaveID& slaveId = call.reserve_resources().agent_id();
+ const SlaveID& slaveId = call.reserve_resources().slave_id();
const Resources& resources = call.reserve_resources().resources();
return _reserve(slaveId, resources, principal);
@@ -1648,7 +1648,7 @@ Future<Response> Master::Http::unreserveResources(
{
CHECK_EQ(mesos::master::Call::UNRESERVE_RESOURCES, call.type());
- const SlaveID& slaveId = call.unreserve_resources().agent_id();
+ const SlaveID& slaveId = call.unreserve_resources().slave_id();
const Resources& resources = call.unreserve_resources().resources();
return _unreserve(slaveId, resources, principal);
[3/3] mesos git commit: Moved the agent exists check to
`_reserve/_unreserve`.
Posted by an...@apache.org.
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);