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/07/20 01:09:00 UTC
[1/3] mesos git commit: Renamed GET_LEADING_MASTER to GET_MASTER in
v1 operator API.
Repository: mesos
Updated Branches:
refs/heads/master dc4a4ae9b -> db305bb35
Renamed GET_LEADING_MASTER to GET_MASTER in v1 operator API.
Review: https://reviews.apache.org/r/50211
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/107a4c09
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/107a4c09
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/107a4c09
Branch: refs/heads/master
Commit: 107a4c099d5e3bc9182173d0942de3877d6f3d92
Parents: dc4a4ae
Author: Vinod Kone <vi...@gmail.com>
Authored: Tue Jul 19 17:24:17 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Jul 19 17:46:26 2016 -0700
----------------------------------------------------------------------
include/mesos/master/master.proto | 13 +++++--------
include/mesos/v1/master/master.proto | 13 +++++--------
src/master/http.cpp | 14 +++++++-------
src/master/master.hpp | 2 +-
src/master/validation.cpp | 2 +-
src/tests/api_tests.cpp | 8 ++++----
6 files changed, 23 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/107a4c09/include/mesos/master/master.proto
----------------------------------------------------------------------
diff --git a/include/mesos/master/master.proto b/include/mesos/master/master.proto
index 7fb7153..72487f0 100644
--- a/include/mesos/master/master.proto
+++ b/include/mesos/master/master.proto
@@ -65,7 +65,7 @@ message Call {
GET_WEIGHTS = 16; // Retrieves the information about role weights.
UPDATE_WEIGHTS = 17;
- GET_LEADING_MASTER = 18; // Retrieves the leading master information.
+ GET_MASTER = 18; // Retrieves the master's information.
SUBSCRIBE = 19; // Subscribes the master to receive events.
@@ -235,7 +235,7 @@ message Response {
GET_WEIGHTS = 15; // See 'GetWeights' below.
- GET_LEADING_MASTER = 16; // See 'GetLeadingMaster' below.
+ GET_MASTER = 16; // See 'GetMaster' below.
GET_MAINTENANCE_STATUS = 17; // See 'GetMaintenanceStatus' below.
GET_MAINTENANCE_SCHEDULE = 18; // See 'GetMaintenanceSchedule' below.
@@ -395,11 +395,8 @@ message Response {
repeated WeightInfo weight_infos = 1;
}
- // Contains the leading master information.
- // NOTE: This is broken currently "on the cloud" (e.g. EC2) as it stores the
- // private IP address, unless advertise_ip points to an externally accessible
- // IP.
- message GetLeadingMaster {
+ // Contains the master's information.
+ message GetMaster {
optional MasterInfo master_info = 1;
}
@@ -435,7 +432,7 @@ message Response {
optional GetTasks get_tasks = 14;
optional GetRoles get_roles = 15;
optional GetWeights get_weights = 16;
- optional GetLeadingMaster get_leading_master = 17;
+ optional GetMaster get_master = 17;
optional GetMaintenanceStatus get_maintenance_status = 18;
optional GetMaintenanceSchedule get_maintenance_schedule = 19;
optional GetQuota get_quota = 20;
http://git-wip-us.apache.org/repos/asf/mesos/blob/107a4c09/include/mesos/v1/master/master.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/master/master.proto b/include/mesos/v1/master/master.proto
index c9e4359..f21efb7 100644
--- a/include/mesos/v1/master/master.proto
+++ b/include/mesos/v1/master/master.proto
@@ -65,7 +65,7 @@ message Call {
GET_WEIGHTS = 16; // Retrieves the information about role weights.
UPDATE_WEIGHTS = 17;
- GET_LEADING_MASTER = 18; // Retrieves the leading master information.
+ GET_MASTER = 18; // Retrieves the master's information.
SUBSCRIBE = 19; // Subscribes the master to receive events.
@@ -236,7 +236,7 @@ message Response {
GET_WEIGHTS = 15; // See 'GetWeights' below.
- GET_LEADING_MASTER = 16; // See 'GetLeadingMaster' below.
+ GET_MASTER = 16; // See 'GetMaster' below.
GET_MAINTENANCE_STATUS = 17; // See 'GetMaintenanceStatus' below.
GET_MAINTENANCE_SCHEDULE = 18; // See 'GetMaintenanceSchedule' below.
@@ -396,11 +396,8 @@ message Response {
repeated WeightInfo weight_infos = 1;
}
- // Contains the leading master information.
- // NOTE: This is broken currently "on the cloud" (e.g. EC2) as it stores the
- // private IP address, unless advertise_ip points to an externally accessible
- // IP.
- message GetLeadingMaster {
+ // Contains the master's information.
+ message GetMaster {
optional MasterInfo master_info = 1;
}
@@ -436,7 +433,7 @@ message Response {
optional GetTasks get_tasks = 14;
optional GetRoles get_roles = 15;
optional GetWeights get_weights = 16;
- optional GetLeadingMaster get_leading_master = 17;
+ optional GetMaster get_master = 17;
optional GetMaintenanceStatus get_maintenance_status = 18;
optional GetMaintenanceSchedule get_maintenance_schedule = 19;
optional GetQuota get_quota = 20;
http://git-wip-us.apache.org/repos/asf/mesos/blob/107a4c09/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 0293e49..cd893df 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -549,8 +549,8 @@ Future<Response> Master::Http::api(
case mesos::master::Call::UPDATE_WEIGHTS:
return weightsHandler.update(call, principal, acceptType);
- case mesos::master::Call::GET_LEADING_MASTER:
- return getLeadingMaster(call, principal, acceptType);
+ case mesos::master::Call::GET_MASTER:
+ return getMaster(call, principal, acceptType);
case mesos::master::Call::RESERVE_RESOURCES:
return reserveResources(call, principal, acceptType);
@@ -1958,21 +1958,21 @@ Future<Response> Master::Http::setLoggingLevel(
}
-Future<Response> Master::Http::getLeadingMaster(
+Future<Response> Master::Http::getMaster(
const mesos::master::Call& call,
const Option<string>& principal,
ContentType contentType) const
{
- CHECK_EQ(mesos::master::Call::GET_LEADING_MASTER, call.type());
+ CHECK_EQ(mesos::master::Call::GET_MASTER, call.type());
mesos::master::Response response;
- response.set_type(mesos::master::Response::GET_LEADING_MASTER);
+ response.set_type(mesos::master::Response::GET_MASTER);
// It is guaranteed that this master has been elected as the leader.
CHECK(master->elected());
- response.mutable_get_leading_master()->mutable_master_info()->CopyFrom(
- master->info());
+ response.mutable_get_master()->mutable_master_info()->CopyFrom(
+ master->info());
return OK(serialize(contentType, evolve(response)),
stringify(contentType));
http://git-wip-us.apache.org/repos/asf/mesos/blob/107a4c09/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index bade8af..6decff6 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -1430,7 +1430,7 @@ private:
const Option<std::string>& principal,
ContentType contentType) const;
- process::Future<process::http::Response> getLeadingMaster(
+ process::Future<process::http::Response> getMaster(
const mesos::master::Call& call,
const Option<std::string>& principal,
ContentType contentType) const;
http://git-wip-us.apache.org/repos/asf/mesos/blob/107a4c09/src/master/validation.cpp
----------------------------------------------------------------------
diff --git a/src/master/validation.cpp b/src/master/validation.cpp
index 50ba372..0c63c94 100644
--- a/src/master/validation.cpp
+++ b/src/master/validation.cpp
@@ -135,7 +135,7 @@ Option<Error> validate(
}
return None();
- case mesos::master::Call::GET_LEADING_MASTER:
+ case mesos::master::Call::GET_MASTER:
return None();
case mesos::master::Call::RESERVE_RESOURCES: {
http://git-wip-us.apache.org/repos/asf/mesos/blob/107a4c09/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index d20b999..e8e4f57 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -908,13 +908,13 @@ TEST_P(MasterAPITest, GetRoles)
}
-TEST_P(MasterAPITest, GetLeadingMaster)
+TEST_P(MasterAPITest, GetMaster)
{
Try<Owned<cluster::Master>> master = this->StartMaster();
ASSERT_SOME(master);
v1::master::Call v1Call;
- v1Call.set_type(v1::master::Call::GET_LEADING_MASTER);
+ v1Call.set_type(v1::master::Call::GET_MASTER);
ContentType contentType = GetParam();
@@ -923,9 +923,9 @@ TEST_P(MasterAPITest, GetLeadingMaster)
AWAIT_READY(v1Response);
ASSERT_TRUE(v1Response->IsInitialized());
- ASSERT_EQ(v1::master::Response::GET_LEADING_MASTER, v1Response->type());
+ ASSERT_EQ(v1::master::Response::GET_MASTER, v1Response->type());
ASSERT_EQ(master.get()->getMasterInfo().ip(),
- v1Response->get_leading_master().master_info().ip());
+ v1Response->get_master().master_info().ip());
}
[3/3] mesos git commit: Made build* fields optional in VersionInfo
protobuf.
Posted by vi...@apache.org.
Made build* fields optional in VersionInfo protobuf.
This will enable us to use the VersionInfo for other components
that do not necessarily have a build_user etc.
Review: https://reviews.apache.org/r/50213
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/db305bb3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/db305bb3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/db305bb3
Branch: refs/heads/master
Commit: db305bb3502cc90412bd3548cc6481fd829a5ee5
Parents: dc80184
Author: Vinod Kone <vi...@gmail.com>
Authored: Tue Jul 19 17:45:30 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Jul 19 17:48:40 2016 -0700
----------------------------------------------------------------------
include/mesos/mesos.proto | 6 +++---
include/mesos/v1/mesos.proto | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/db305bb3/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 3f99641..67f0973 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -2072,9 +2072,9 @@ message WeightInfo {
*/
message VersionInfo {
required string version = 1;
- required string build_date = 2;
- required double build_time = 3;
- required string build_user = 4;
+ optional string build_date = 2;
+ optional double build_time = 3;
+ optional string build_user = 4;
optional string git_sha = 5;
optional string git_branch = 6;
optional string git_tag = 7;
http://git-wip-us.apache.org/repos/asf/mesos/blob/db305bb3/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index cbc1d01..a2b377c 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -2071,9 +2071,9 @@ message WeightInfo {
*/
message VersionInfo {
required string version = 1;
- required string build_date = 2;
- required double build_time = 3;
- required string build_user = 4;
+ optional string build_date = 2;
+ optional double build_time = 3;
+ optional string build_user = 4;
optional string git_sha = 5;
optional string git_branch = 6;
optional string git_tag = 7;
[2/3] mesos git commit: Removed GET_STATE_SUMMARY from v1 operator
API.
Posted by vi...@apache.org.
Removed GET_STATE_SUMMARY from v1 operator API.
It is not clear if we would need this in v1 API.
Review: https://reviews.apache.org/r/50212
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dc801841
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dc801841
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dc801841
Branch: refs/heads/master
Commit: dc80184133f6835f34af47cbd909b8114926fa89
Parents: 107a4c0
Author: Vinod Kone <vi...@gmail.com>
Authored: Tue Jul 19 17:35:57 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Jul 19 17:47:41 2016 -0700
----------------------------------------------------------------------
include/mesos/master/master.proto | 89 ++++++++++++++-----------------
include/mesos/v1/master/master.proto | 89 ++++++++++++++-----------------
src/master/http.cpp | 3 --
src/master/validation.cpp | 3 --
4 files changed, 82 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc801841/include/mesos/master/master.proto
----------------------------------------------------------------------
diff --git a/include/mesos/master/master.proto b/include/mesos/master/master.proto
index 72487f0..1ea79fd 100644
--- a/include/mesos/master/master.proto
+++ b/include/mesos/master/master.proto
@@ -54,38 +54,37 @@ message Call {
READ_FILE = 8; // See 'ReadFile' below.
GET_STATE = 9;
- GET_STATE_SUMMARY = 10;
- GET_AGENTS = 11;
- GET_FRAMEWORKS = 12;
- GET_EXECUTORS = 13; // Retrieves the information about all executors.
- GET_TASKS = 14; // Retrieves the information about all known tasks.
- GET_ROLES = 15; // Retrieves the information about roles.
+ GET_AGENTS = 10;
+ GET_FRAMEWORKS = 11;
+ GET_EXECUTORS = 12; // Retrieves the information about all executors.
+ GET_TASKS = 13; // Retrieves the information about all known tasks.
+ GET_ROLES = 14; // Retrieves the information about roles.
- GET_WEIGHTS = 16; // Retrieves the information about role weights.
- UPDATE_WEIGHTS = 17;
+ GET_WEIGHTS = 15; // Retrieves the information about role weights.
+ UPDATE_WEIGHTS = 16;
- GET_MASTER = 18; // Retrieves the master's information.
+ GET_MASTER = 17; // Retrieves the master's information.
- SUBSCRIBE = 19; // Subscribes the master to receive events.
+ SUBSCRIBE = 18; // Subscribes the master to receive events.
- RESERVE_RESOURCES = 20;
- UNRESERVE_RESOURCES = 21;
+ RESERVE_RESOURCES = 19;
+ UNRESERVE_RESOURCES = 20;
- CREATE_VOLUMES = 22; // See 'CreateVolumes' below.
- DESTROY_VOLUMES = 23; // See 'DestroyVolumes' below.
+ CREATE_VOLUMES = 21; // See 'CreateVolumes' below.
+ DESTROY_VOLUMES = 22; // See 'DestroyVolumes' below.
// Retrieves the cluster's maintenance status.
- GET_MAINTENANCE_STATUS = 24;
+ GET_MAINTENANCE_STATUS = 23;
// Retrieves the cluster's maintenance schedule.
- GET_MAINTENANCE_SCHEDULE = 25;
- UPDATE_MAINTENANCE_SCHEDULE = 26; // See 'UpdateMaintenanceSchedule' below.
- START_MAINTENANCE = 27; // See 'StartMaintenance' below.
- STOP_MAINTENANCE = 28; // See 'StopMaintenance' below.
+ GET_MAINTENANCE_SCHEDULE = 24;
+ UPDATE_MAINTENANCE_SCHEDULE = 25; // See 'UpdateMaintenanceSchedule' below.
+ START_MAINTENANCE = 26; // See 'StartMaintenance' below.
+ STOP_MAINTENANCE = 27; // See 'StopMaintenance' below.
- GET_QUOTA = 29;
- SET_QUOTA = 30; // See 'SetQuota' below.
- REMOVE_QUOTA = 31;
+ GET_QUOTA = 28;
+ SET_QUOTA = 29; // See 'SetQuota' below.
+ REMOVE_QUOTA = 30;
}
// Provides a snapshot of the current metrics tracked by the master.
@@ -225,22 +224,21 @@ message Response {
READ_FILE = 7; // See 'ReadFile' below.
GET_STATE = 8;
- GET_STATE_SUMMARY = 9;
- GET_AGENTS = 10;
- GET_FRAMEWORKS = 11;
- GET_EXECUTORS = 12; // See 'GetExecutors' below.
- GET_TASKS = 13; // See 'GetTasks' below.
- GET_ROLES = 14; // See 'GetRoles' below.
+ GET_AGENTS = 9;
+ GET_FRAMEWORKS = 10;
+ GET_EXECUTORS = 11; // See 'GetExecutors' below.
+ GET_TASKS = 12; // See 'GetTasks' below.
+ GET_ROLES = 13; // See 'GetRoles' below.
- GET_WEIGHTS = 15; // See 'GetWeights' below.
+ GET_WEIGHTS = 14; // See 'GetWeights' below.
- GET_MASTER = 16; // See 'GetMaster' below.
+ GET_MASTER = 15; // See 'GetMaster' below.
- GET_MAINTENANCE_STATUS = 17; // See 'GetMaintenanceStatus' below.
- GET_MAINTENANCE_SCHEDULE = 18; // See 'GetMaintenanceSchedule' below.
+ GET_MAINTENANCE_STATUS = 16; // See 'GetMaintenanceStatus' below.
+ GET_MAINTENANCE_SCHEDULE = 17; // See 'GetMaintenanceSchedule' below.
- GET_QUOTA = 19;
+ GET_QUOTA = 18;
}
// `healthy` would be true if the master is healthy. Delayed responses are
@@ -291,10 +289,6 @@ message Response {
optional GetAgents get_agents = 4;
}
- message GetStateSummary {
- // TODO(vinod): Fill in the fields.
- }
-
message GetAgents {
message Agent {
required SlaveInfo agent_info = 1;
@@ -425,17 +419,16 @@ message Response {
optional ListFiles list_files = 7;
optional ReadFile read_file = 8;
optional GetState get_state = 9;
- optional GetStateSummary get_state_summary = 10;
- optional GetAgents get_agents = 11;
- optional GetFrameworks get_frameworks = 12;
- optional GetExecutors get_executors = 13;
- optional GetTasks get_tasks = 14;
- optional GetRoles get_roles = 15;
- optional GetWeights get_weights = 16;
- optional GetMaster get_master = 17;
- optional GetMaintenanceStatus get_maintenance_status = 18;
- optional GetMaintenanceSchedule get_maintenance_schedule = 19;
- optional GetQuota get_quota = 20;
+ optional GetAgents get_agents = 10;
+ optional GetFrameworks get_frameworks = 11;
+ optional GetExecutors get_executors = 12;
+ optional GetTasks get_tasks = 13;
+ optional GetRoles get_roles = 14;
+ optional GetWeights get_weights = 15;
+ optional GetMaster get_master = 16;
+ optional GetMaintenanceStatus get_maintenance_status = 17;
+ optional GetMaintenanceSchedule get_maintenance_schedule = 18;
+ optional GetQuota get_quota = 19;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc801841/include/mesos/v1/master/master.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/master/master.proto b/include/mesos/v1/master/master.proto
index f21efb7..58dc650 100644
--- a/include/mesos/v1/master/master.proto
+++ b/include/mesos/v1/master/master.proto
@@ -54,38 +54,37 @@ message Call {
READ_FILE = 8; // See 'ReadFile' below.
GET_STATE = 9;
- GET_STATE_SUMMARY = 10;
- GET_AGENTS = 11;
- GET_FRAMEWORKS = 12;
- GET_EXECUTORS = 13; // Retrieves the information about all executors.
- GET_TASKS = 14; // Retrieves the information about all known tasks.
- GET_ROLES = 15; // Retrieves the information about roles.
+ GET_AGENTS = 10;
+ GET_FRAMEWORKS = 11;
+ GET_EXECUTORS = 12; // Retrieves the information about all executors.
+ GET_TASKS = 13; // Retrieves the information about all known tasks.
+ GET_ROLES = 14; // Retrieves the information about roles.
- GET_WEIGHTS = 16; // Retrieves the information about role weights.
- UPDATE_WEIGHTS = 17;
+ GET_WEIGHTS = 15; // Retrieves the information about role weights.
+ UPDATE_WEIGHTS = 16;
- GET_MASTER = 18; // Retrieves the master's information.
+ GET_MASTER = 17; // Retrieves the master's information.
- SUBSCRIBE = 19; // Subscribes the master to receive events.
+ SUBSCRIBE = 18; // Subscribes the master to receive events.
- RESERVE_RESOURCES = 20;
- UNRESERVE_RESOURCES = 21;
+ RESERVE_RESOURCES = 19;
+ UNRESERVE_RESOURCES = 20;
- CREATE_VOLUMES = 22; // See 'CreateVolumes' below.
- DESTROY_VOLUMES = 23; // See 'DestroyVolumes' below.
+ CREATE_VOLUMES = 21; // See 'CreateVolumes' below.
+ DESTROY_VOLUMES = 22; // See 'DestroyVolumes' below.
// Retrieves the cluster's maintenance status.
- GET_MAINTENANCE_STATUS = 24;
+ GET_MAINTENANCE_STATUS = 23;
// Retrieves the cluster's maintenance schedule.
- GET_MAINTENANCE_SCHEDULE = 25;
- UPDATE_MAINTENANCE_SCHEDULE = 26; // See 'UpdateMaintenanceSchedule' below.
- START_MAINTENANCE = 27; // See 'StartMaintenance' below.
- STOP_MAINTENANCE = 28; // See 'StopMaintenance' below.
+ GET_MAINTENANCE_SCHEDULE = 24;
+ UPDATE_MAINTENANCE_SCHEDULE = 25; // See 'UpdateMaintenanceSchedule' below.
+ START_MAINTENANCE = 26; // See 'StartMaintenance' below.
+ STOP_MAINTENANCE = 27; // See 'StopMaintenance' below.
- GET_QUOTA = 29;
- SET_QUOTA = 30; // See 'SetQuota' below.
- REMOVE_QUOTA = 31;
+ GET_QUOTA = 28;
+ SET_QUOTA = 29; // See 'SetQuota' below.
+ REMOVE_QUOTA = 30;
}
// Provides a snapshot of the current metrics tracked by the master.
@@ -226,22 +225,21 @@ message Response {
READ_FILE = 7; // See 'ReadFile' below.
GET_STATE = 8;
- GET_STATE_SUMMARY = 9;
- GET_AGENTS = 10;
- GET_FRAMEWORKS = 11;
- GET_EXECUTORS = 12; // See 'GetExecutors' below.
- GET_TASKS = 13; // See 'GetTasks' below.
- GET_ROLES = 14; // See 'GetRoles' below.
+ GET_AGENTS = 9;
+ GET_FRAMEWORKS = 10;
+ GET_EXECUTORS = 11; // See 'GetExecutors' below.
+ GET_TASKS = 12; // See 'GetTasks' below.
+ GET_ROLES = 13; // See 'GetRoles' below.
- GET_WEIGHTS = 15; // See 'GetWeights' below.
+ GET_WEIGHTS = 14; // See 'GetWeights' below.
- GET_MASTER = 16; // See 'GetMaster' below.
+ GET_MASTER = 15; // See 'GetMaster' below.
- GET_MAINTENANCE_STATUS = 17; // See 'GetMaintenanceStatus' below.
- GET_MAINTENANCE_SCHEDULE = 18; // See 'GetMaintenanceSchedule' below.
+ GET_MAINTENANCE_STATUS = 16; // See 'GetMaintenanceStatus' below.
+ GET_MAINTENANCE_SCHEDULE = 17; // See 'GetMaintenanceSchedule' below.
- GET_QUOTA = 19;
+ GET_QUOTA = 18;
}
// `healthy` would be true if the master is healthy. Delayed responses are
@@ -292,10 +290,6 @@ message Response {
optional GetAgents get_agents = 4;
}
- message GetStateSummary {
- // TODO(vinod): Fill in the fields.
- }
-
message GetAgents {
message Agent {
required AgentInfo agent_info = 1;
@@ -426,17 +420,16 @@ message Response {
optional ListFiles list_files = 7;
optional ReadFile read_file = 8;
optional GetState get_state = 9;
- optional GetStateSummary get_state_summary = 10;
- optional GetAgents get_agents = 11;
- optional GetFrameworks get_frameworks = 12;
- optional GetExecutors get_executors = 13;
- optional GetTasks get_tasks = 14;
- optional GetRoles get_roles = 15;
- optional GetWeights get_weights = 16;
- optional GetMaster get_master = 17;
- optional GetMaintenanceStatus get_maintenance_status = 18;
- optional GetMaintenanceSchedule get_maintenance_schedule = 19;
- optional GetQuota get_quota = 20;
+ optional GetAgents get_agents = 10;
+ optional GetFrameworks get_frameworks = 11;
+ optional GetExecutors get_executors = 12;
+ optional GetTasks get_tasks = 13;
+ optional GetRoles get_roles = 14;
+ optional GetWeights get_weights = 15;
+ optional GetMaster get_master = 16;
+ optional GetMaintenanceStatus get_maintenance_status = 17;
+ optional GetMaintenanceSchedule get_maintenance_schedule = 18;
+ optional GetQuota get_quota = 19;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc801841/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index cd893df..1cbec97 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -525,9 +525,6 @@ Future<Response> Master::Http::api(
case mesos::master::Call::GET_STATE:
return getState(call, principal, acceptType);
- case mesos::master::Call::GET_STATE_SUMMARY:
- return NotImplemented();
-
case mesos::master::Call::GET_AGENTS:
return getAgents(call, principal, acceptType);
http://git-wip-us.apache.org/repos/asf/mesos/blob/dc801841/src/master/validation.cpp
----------------------------------------------------------------------
diff --git a/src/master/validation.cpp b/src/master/validation.cpp
index 0c63c94..52002be 100644
--- a/src/master/validation.cpp
+++ b/src/master/validation.cpp
@@ -108,9 +108,6 @@ Option<Error> validate(
case mesos::master::Call::GET_STATE:
return None();
- case mesos::master::Call::GET_STATE_SUMMARY:
- return None();
-
case mesos::master::Call::GET_AGENTS:
return None();