You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2018/03/20 10:53:48 UTC
[1/2] mesos git commit: Displayed resource provider resources in
GET_RESOURCE_PROVIDER response.
Repository: mesos
Updated Branches:
refs/heads/master 4e189dbff -> 90c922ad3
Displayed resource provider resources in GET_RESOURCE_PROVIDER response.
Review: https://reviews.apache.org/r/65832/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/09b92d82
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/09b92d82
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/09b92d82
Branch: refs/heads/master
Commit: 09b92d822658b9563103d86ad45a9a7fdf85f271
Parents: 4e189db
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Tue Mar 20 10:08:09 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Tue Mar 20 10:08:09 2018 +0100
----------------------------------------------------------------------
include/mesos/agent/agent.proto | 1 +
include/mesos/v1/agent/agent.proto | 1 +
src/slave/http.cpp | 3 +++
src/tests/api_tests.cpp | 18 ++++++++++++++----
4 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/09b92d82/include/mesos/agent/agent.proto
----------------------------------------------------------------------
diff --git a/include/mesos/agent/agent.proto b/include/mesos/agent/agent.proto
index 7d92cb8..adaccb3 100644
--- a/include/mesos/agent/agent.proto
+++ b/include/mesos/agent/agent.proto
@@ -547,6 +547,7 @@ message Response {
message GetResourceProviders {
message ResourceProvider {
required ResourceProviderInfo resource_provider_info = 1;
+ repeated Resource total_resources = 2;
}
repeated ResourceProvider resource_providers = 1;
http://git-wip-us.apache.org/repos/asf/mesos/blob/09b92d82/include/mesos/v1/agent/agent.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/agent/agent.proto b/include/mesos/v1/agent/agent.proto
index 59a9fd6..71352a7 100644
--- a/include/mesos/v1/agent/agent.proto
+++ b/include/mesos/v1/agent/agent.proto
@@ -547,6 +547,7 @@ message Response {
message GetResourceProviders {
message ResourceProvider {
required ResourceProviderInfo resource_provider_info = 1;
+ repeated Resource total_resources = 2;
}
repeated ResourceProvider resource_providers = 1;
http://git-wip-us.apache.org/repos/asf/mesos/blob/09b92d82/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index a8ffbd1..65081c9 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -1790,6 +1790,9 @@ Future<Response> Http::getResourceProviders(
provider->mutable_resource_provider_info()
->CopyFrom(resourceProvider->info);
+
+ provider->mutable_total_resources()->CopyFrom(
+ resourceProvider->totalResources);
}
return OK(serialize(acceptType, evolve(response)), stringify(acceptType));
http://git-wip-us.apache.org/repos/asf/mesos/blob/09b92d82/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index e81d6ed..c1fc95d 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -6648,10 +6648,10 @@ TEST_P(AgentAPITest, GetResourceProviders)
info.set_type("org.apache.mesos.rp.test");
info.set_name("test");
- v1::MockResourceProvider resourceProvider(
- info,
- v1::createDiskResource(
- "200", "*", None(), None(), v1::createDiskSourceRaw()));
+ v1::Resource resource = v1::createDiskResource(
+ "200", "*", None(), None(), v1::createDiskSourceRaw());
+
+ v1::MockResourceProvider resourceProvider(info, resource);
// Start and register a resource provider.
Owned<EndpointDetector> endpointDetector(
@@ -6680,6 +6680,16 @@ TEST_P(AgentAPITest, GetResourceProviders)
EXPECT_EQ(info.type(), responseInfo.type());
EXPECT_EQ(info.name(), responseInfo.name());
+
+ ASSERT_TRUE(responseInfo.has_id());
+ resource.mutable_provider_id()->CopyFrom(responseInfo.id());
+
+ const v1::Resources responseResources =
+ v1Response->get_resource_providers()
+ .resource_providers(0)
+ .total_resources();
+
+ EXPECT_EQ(v1::Resources(resource), responseResources);
}
[2/2] mesos git commit: Displayed resource provider resources in
GET_AGENTS response.
Posted by bb...@apache.org.
Displayed resource provider resources in GET_AGENTS response.
Review: https://reviews.apache.org/r/65833/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/90c922ad
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/90c922ad
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/90c922ad
Branch: refs/heads/master
Commit: 90c922ad3b1411ff9c2b20208ad080a1c95b4924
Parents: 09b92d8
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Tue Mar 20 10:29:44 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Tue Mar 20 10:29:44 2018 +0100
----------------------------------------------------------------------
include/mesos/master/master.proto | 1 +
include/mesos/v1/master/master.proto | 1 +
src/common/protobuf_utils.cpp | 2 ++
src/tests/api_tests.cpp | 19 +++++++++++++++----
4 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/90c922ad/include/mesos/master/master.proto
----------------------------------------------------------------------
diff --git a/include/mesos/master/master.proto b/include/mesos/master/master.proto
index 6622e1b..aa63904 100644
--- a/include/mesos/master/master.proto
+++ b/include/mesos/master/master.proto
@@ -344,6 +344,7 @@ message Response {
message ResourceProvider {
required ResourceProviderInfo resource_provider_info = 1;
+ repeated Resource total_resources = 2;
}
repeated ResourceProvider resource_providers = 11;
http://git-wip-us.apache.org/repos/asf/mesos/blob/90c922ad/include/mesos/v1/master/master.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/master/master.proto b/include/mesos/v1/master/master.proto
index 6034bd5..ddb28f9 100644
--- a/include/mesos/v1/master/master.proto
+++ b/include/mesos/v1/master/master.proto
@@ -342,6 +342,7 @@ message Response {
message ResourceProvider {
required ResourceProviderInfo resource_provider_info = 1;
+ repeated Resource total_resources = 2;
}
repeated ResourceProvider resource_providers = 11;
http://git-wip-us.apache.org/repos/asf/mesos/blob/90c922ad/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index e0609b6..87c9b88 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -1280,6 +1280,8 @@ mesos::master::Response::GetAgents::Agent createAgentResponse(
agent.add_resource_providers();
provider->mutable_resource_provider_info()->CopyFrom(resourceProvider.info);
+ provider->mutable_total_resources()->CopyFrom(
+ resourceProvider.totalResources);
}
return agent;
http://git-wip-us.apache.org/repos/asf/mesos/blob/90c922ad/src/tests/api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp
index c1fc95d..7e9233e 100644
--- a/src/tests/api_tests.cpp
+++ b/src/tests/api_tests.cpp
@@ -226,10 +226,10 @@ TEST_P(MasterAPITest, GetAgents)
info.set_type("org.apache.mesos.rp.test");
info.set_name("test");
- v1::MockResourceProvider resourceProvider(
- info,
- v1::createDiskResource(
- "200", "*", None(), None(), v1::createDiskSourceRaw()));
+ v1::Resource resource = v1::createDiskResource(
+ "200", "*", None(), None(), v1::createDiskSourceRaw());
+
+ v1::MockResourceProvider resourceProvider(info, resource);
// Start and register a resource provider.
Owned<EndpointDetector> endpointDetector(
@@ -260,6 +260,17 @@ TEST_P(MasterAPITest, GetAgents)
EXPECT_EQ(info.type(), responseInfo.type());
EXPECT_EQ(info.name(), responseInfo.name());
+
+ ASSERT_TRUE(responseInfo.has_id());
+ resource.mutable_provider_id()->CopyFrom(responseInfo.id());
+
+ const v1::Resources responseResources =
+ v1Response->get_agents()
+ .agents(0)
+ .resource_providers(0)
+ .total_resources();
+
+ EXPECT_EQ(v1::Resources(resource), responseResources);
}