You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2017/07/24 16:39:46 UTC
[1/2] mesos git commit: Removed tracking ResourceProvider total
resources in its info.
Repository: mesos
Updated Branches:
refs/heads/master 09fa758b8 -> 9a45267c5
Removed tracking ResourceProvider total resources in its info.
Review: https://reviews.apache.org/r/61082/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9a45267c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9a45267c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9a45267c
Branch: refs/heads/master
Commit: 9a45267c51d7fbc68947d6721623b8004b912ddc
Parents: b406780
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Mon Jul 24 09:38:58 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Jul 24 09:39:10 2017 -0700
----------------------------------------------------------------------
include/mesos/mesos.proto | 5 ++---
include/mesos/v1/mesos.proto | 5 ++---
src/common/type_utils.cpp | 4 ----
src/v1/mesos.cpp | 4 ----
4 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a45267c/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 8f8079b..41e42b4 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -970,7 +970,6 @@ message SlaveInfo {
message ResourceProviderInfo {
optional ResourceProviderID id = 1;
repeated Attribute attributes = 2;
- repeated Resource resources = 3;
// The type of the resource provider. This uniquely identifies a
// resource provider implementation. For instance:
@@ -979,12 +978,12 @@ message ResourceProviderInfo {
// Please follow to Java package naming convention
// (https://en.wikipedia.org/wiki/Java_package#Package_naming_conventions)
// to avoid conflicts on type names.
- required string type = 4;
+ required string type = 3;
// The name of the resource provider. There could be multiple
// instances of a type of resource provider. The name field is used
// to distinguish these instances.
- required string name = 5;
+ required string name = 4;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a45267c/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 720f307..9de282f 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -964,7 +964,6 @@ message AgentInfo {
message ResourceProviderInfo {
optional ResourceProviderID id = 1;
repeated Attribute attributes = 2;
- repeated Resource resources = 3;
// The type of the resource provider. This uniquely identifies a
// resource provider implementation. For instance:
@@ -973,12 +972,12 @@ message ResourceProviderInfo {
// Please follow to Java package naming convention
// (https://en.wikipedia.org/wiki/Java_package#Package_naming_conventions)
// to avoid conflicts on type names.
- required string type = 4;
+ required string type = 3;
// The name of the resource provider. There could be multiple
// instances of a type of resource provider. The name field is used
// to distinguish these instances.
- required string name = 5;
+ required string name = 4;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a45267c/src/common/type_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/type_utils.cpp b/src/common/type_utils.cpp
index 5c92a7c..e40d87c 100644
--- a/src/common/type_utils.cpp
+++ b/src/common/type_utils.cpp
@@ -362,10 +362,6 @@ bool operator==(
return false;
}
- if (Resources(left.resources()) != Resources(right.resources())) {
- return false;
- }
-
if (left.type() != right.type()) {
return false;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/9a45267c/src/v1/mesos.cpp
----------------------------------------------------------------------
diff --git a/src/v1/mesos.cpp b/src/v1/mesos.cpp
index 9c6cb9e..306f7e4 100644
--- a/src/v1/mesos.cpp
+++ b/src/v1/mesos.cpp
@@ -356,10 +356,6 @@ bool operator==(
return false;
}
- if (Resources(left.resources()) != Resources(right.resources())) {
- return false;
- }
-
if (left.type() != right.type()) {
return false;
}
[2/2] mesos git commit: Considered ResourceProvider 'name' and 'type'
in equality checks.
Posted by ji...@apache.org.
Considered ResourceProvider 'name' and 'type' in equality checks.
Review: https://reviews.apache.org/r/61081/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b406780f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b406780f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b406780f
Branch: refs/heads/master
Commit: b406780fc60f523d175467729c5b81b7529b652c
Parents: 09fa758
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Mon Jul 24 09:38:54 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Jul 24 09:39:10 2017 -0700
----------------------------------------------------------------------
src/common/type_utils.cpp | 8 ++++++++
src/v1/mesos.cpp | 8 ++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b406780f/src/common/type_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/type_utils.cpp b/src/common/type_utils.cpp
index 031344c..5c92a7c 100644
--- a/src/common/type_utils.cpp
+++ b/src/common/type_utils.cpp
@@ -366,6 +366,14 @@ bool operator==(
return false;
}
+ if (left.type() != right.type()) {
+ return false;
+ }
+
+ if (left.name() != right.name()) {
+ return false;
+ }
+
return true;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/b406780f/src/v1/mesos.cpp
----------------------------------------------------------------------
diff --git a/src/v1/mesos.cpp b/src/v1/mesos.cpp
index e5143e1..9c6cb9e 100644
--- a/src/v1/mesos.cpp
+++ b/src/v1/mesos.cpp
@@ -360,6 +360,14 @@ bool operator==(
return false;
}
+ if (left.type() != right.type()) {
+ return false;
+ }
+
+ if (left.name() != right.name()) {
+ return false;
+ }
+
return true;
}