You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gr...@apache.org on 2018/07/02 20:00:24 UTC
[4/5] mesos git commit: Fixed a bug in
`createStrippedScalarQuantity()`.
Fixed a bug in `createStrippedScalarQuantity()`.
This patch fixes `createStrippedScalarQuantity()` by
stripping the revocable field in resources.
Also added a test.
Review: https://reviews.apache.org/r/67510/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/450651bd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/450651bd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/450651bd
Branch: refs/heads/1.4.x
Commit: 450651bd115292edf4d42cab3367ba58017b4354
Parents: 8911db3
Author: Meng Zhu <mz...@mesosphere.io>
Authored: Wed Jun 20 16:59:54 2018 -0700
Committer: Greg Mann <gr...@gmail.com>
Committed: Mon Jul 2 12:41:43 2018 -0700
----------------------------------------------------------------------
src/common/resources.cpp | 1 +
src/tests/resources_tests.cpp | 13 +++++++++++++
src/v1/resources.cpp | 1 +
3 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/450651bd/src/common/resources.cpp
----------------------------------------------------------------------
diff --git a/src/common/resources.cpp b/src/common/resources.cpp
index 499cc29..c597c9e 100644
--- a/src/common/resources.cpp
+++ b/src/common/resources.cpp
@@ -1525,6 +1525,7 @@ Resources Resources::createStrippedScalarQuantity() const
scalar.clear_disk();
scalar.clear_shared();
+ scalar.clear_revocable();
stripped.add(scalar);
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/450651bd/src/tests/resources_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resources_tests.cpp b/src/tests/resources_tests.cpp
index 148183a..2b1deff 100644
--- a/src/tests/resources_tests.cpp
+++ b/src/tests/resources_tests.cpp
@@ -2582,6 +2582,19 @@ TEST(ResourcesOperationTest, StrippedResourcesNonScalar)
}
+TEST(ResourceOperationTest, StrippedResourcesRevocable)
+{
+ Resource plain = Resources::parse("cpus", "1", "*").get();
+
+ Resource revocable = plain;
+ revocable.mutable_revocable();
+
+ Resources stripped = Resources(revocable).createStrippedScalarQuantity();
+
+ EXPECT_EQ(Resources(plain), stripped);
+}
+
+
TEST(ResourcesOperationTest, CreatePersistentVolumeFromMount)
{
Resource::DiskInfo::Source source = createDiskSourceMount("mnt");
http://git-wip-us.apache.org/repos/asf/mesos/blob/450651bd/src/v1/resources.cpp
----------------------------------------------------------------------
diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp
index 781fef6..28889b4 100644
--- a/src/v1/resources.cpp
+++ b/src/v1/resources.cpp
@@ -1553,6 +1553,7 @@ Resources Resources::createStrippedScalarQuantity() const
scalar.clear_disk();
scalar.clear_shared();
+ scalar.clear_revocable();
stripped.add(scalar);
}
}