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:18 UTC

[2/3] mesos git commit: Renamed `agent_id` fields to `slave_id` for unversioned master.proto.

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);