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/06/21 17:14:54 UTC
[2/2] mesos git commit: Modified `createStrippedScalarQuantity()` to
clear all metadata fields.
Modified `createStrippedScalarQuantity()` to clear all metadata fields.
Currently `createStrippedScalarQuantity()` strips resource meta-data
and transforms dynamic reservations into a static reservation.
However, no current code depends on the reservations in resources
returned by this helper function. This leads to boilerplate code
around call sites and performance overhead.
This patch updates the function to clear all reservation information.
Review: https://reviews.apache.org/r/67615/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f0284a51
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f0284a51
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f0284a51
Branch: refs/heads/master
Commit: f0284a51d188d32522c460c7e276ea80316eabd9
Parents: f19b6d8
Author: Meng Zhu <mz...@mesosphere.io>
Authored: Thu Jun 21 09:09:39 2018 -0700
Committer: Greg Mann <gr...@gmail.com>
Committed: Thu Jun 21 09:31:27 2018 -0700
----------------------------------------------------------------------
include/mesos/resources.hpp | 8 ++---
include/mesos/v1/resources.hpp | 8 ++---
src/common/resources.cpp | 22 +++----------
src/master/allocator/mesos/hierarchical.cpp | 41 ++++++------------------
src/tests/resources_tests.cpp | 13 ++------
src/tests/sorter_tests.cpp | 2 +-
src/v1/resources.cpp | 22 +++----------
7 files changed, 29 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f0284a51/include/mesos/resources.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/resources.hpp b/include/mesos/resources.hpp
index bd6d6d6..175833c 100644
--- a/include/mesos/resources.hpp
+++ b/include/mesos/resources.hpp
@@ -467,11 +467,9 @@ public:
Resources toUnreserved() const;
// Returns a Resources object that contains all the scalar resources
- // in this object, but with their AllocationInfo, ReservationInfo,
- // DiskInfo, and SharedInfo omitted. The `role` and RevocableInfo,
- // if any, are preserved. Because we clear ReservationInfo but
- // preserve `role`, this means that stripping a dynamically reserved
- // resource makes it effectively statically reserved.
+ // but with all the meta-data fields, such as AllocationInfo,
+ // ReservationInfo and etc. cleared. Only scalar resources' name,
+ // type (SCALAR) and value are preserved.
//
// This is intended for code that would like to aggregate together
// Resource values without regard for metadata like whether the
http://git-wip-us.apache.org/repos/asf/mesos/blob/f0284a51/include/mesos/v1/resources.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/v1/resources.hpp b/include/mesos/v1/resources.hpp
index c065dd1..b607b68 100644
--- a/include/mesos/v1/resources.hpp
+++ b/include/mesos/v1/resources.hpp
@@ -467,11 +467,9 @@ public:
Resources toUnreserved() const;
// Returns a Resources object that contains all the scalar resources
- // in this object, but with their AllocationInfo, ReservationInfo,
- // DiskInfo, and SharedInfo omitted. The `role` and RevocableInfo,
- // if any, are preserved. Because we clear ReservationInfo but
- // preserve `role`, this means that stripping a dynamically reserved
- // resource makes it effectively statically reserved.
+ // but with all the meta-data fields, such as AllocationInfo,
+ // ReservationInfo and etc. cleared. Only scalar resources' name,
+ // type (SCALAR) and value are preserved.
//
// This is intended for code that would like to aggregate together
// Resource values without regard for metadata like whether the
http://git-wip-us.apache.org/repos/asf/mesos/blob/f0284a51/src/common/resources.cpp
----------------------------------------------------------------------
diff --git a/src/common/resources.cpp b/src/common/resources.cpp
index b9f1c2d..253b8bc 100644
--- a/src/common/resources.cpp
+++ b/src/common/resources.cpp
@@ -1640,24 +1640,12 @@ Resources Resources::createStrippedScalarQuantity() const
foreach (const Resource& resource, resources) {
if (resource.type() == Value::SCALAR) {
- Resource scalar = resource;
- scalar.clear_provider_id();
- scalar.clear_allocation_info();
-
- // We collapse the stack of reservations here to a single `STATIC`
- // reservation in order to maintain existing behavior of ignoring
- // the reservation type, and keeping the reservation role.
- if (Resources::isReserved(scalar)) {
- Resource::ReservationInfo collapsedReservation;
- collapsedReservation.set_type(Resource::ReservationInfo::STATIC);
- collapsedReservation.set_role(Resources::reservationRole(scalar));
- scalar.clear_reservations();
- scalar.add_reservations()->CopyFrom(collapsedReservation);
- }
+ Resource scalar;
+
+ scalar.set_name(resource.name());
+ scalar.set_type(resource.type());
+ scalar.mutable_scalar()->CopyFrom(resource.scalar());
- scalar.clear_disk();
- scalar.clear_shared();
- scalar.clear_revocable();
stripped.add(scalar);
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/f0284a51/src/master/allocator/mesos/hierarchical.cpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/mesos/hierarchical.cpp b/src/master/allocator/mesos/hierarchical.cpp
index 60d8b5d..cbdfb2b 100644
--- a/src/master/allocator/mesos/hierarchical.cpp
+++ b/src/master/allocator/mesos/hierarchical.cpp
@@ -1572,11 +1572,7 @@ void HierarchicalAllocatorProcess::__allocate()
// NOTE: Revocable resources are excluded in `quotaRoleSorter`.
auto getQuotaRoleAllocatedScalarQuantities = [this](const string& role) {
CHECK(quotas.contains(role));
-
- // NOTE: `allocationScalarQuantities` omits dynamic reservation,
- // persistent volume info, and allocation info. We additionally
- // remove the static reservations here via `toUnreserved()`.
- return quotaRoleSorter->allocationScalarQuantities(role).toUnreserved();
+ return quotaRoleSorter->allocationScalarQuantities(role);
};
// Returns the result of shrinking the provided resources down to the
@@ -1664,10 +1660,8 @@ void HierarchicalAllocatorProcess::__allocate()
quotaRoleSorter->allocation(role);
foreachvalue (const Resources& resources, allocations) {
- // We need to remove the static reservation metadata here via
- // `toUnreserved()`.
rolesConsumedQuotaScalarQuantites[role] -=
- resources.reserved().createStrippedScalarQuantity().toUnreserved();
+ resources.reserved().createStrippedScalarQuantity();
}
}
@@ -1702,20 +1696,11 @@ void HierarchicalAllocatorProcess::__allocate()
// allocated resources -
// unallocated reservations -
// unallocated revocable resources
-
- // NOTE: `totalScalarQuantities` omits dynamic reservation,
- // persistent volume info, and allocation info. We additionally
- // remove the static reservations here via `toUnreserved()`.
- Resources availableHeadroom =
- roleSorter->totalScalarQuantities().toUnreserved();
+ Resources availableHeadroom = roleSorter->totalScalarQuantities();
// Subtract allocated resources from the total.
foreachkey (const string& role, roles) {
- // NOTE: `totalScalarQuantities` omits dynamic reservation,
- // persistent volume info, and allocation info. We additionally
- // remove the static reservations here via `toUnreserved()`.
- availableHeadroom -=
- roleSorter->allocationScalarQuantities(role).toUnreserved();
+ availableHeadroom -= roleSorter->allocationScalarQuantities(role);
}
// Calculate total allocated reservations. Note that we need to ensure
@@ -1733,11 +1718,8 @@ void HierarchicalAllocatorProcess::__allocate()
}
foreachvalue (const Resources& resources, allocations) {
- // NOTE: `totalScalarQuantities` omits dynamic reservation,
- // persistent volume info, and allocation info. We additionally
- // remove the static reservations here via `toUnreserved()`.
totalAllocatedReservationScalarQuantities +=
- resources.reserved().createStrippedScalarQuantity().toUnreserved();
+ resources.reserved().createStrippedScalarQuantity();
}
}
@@ -1748,11 +1730,8 @@ void HierarchicalAllocatorProcess::__allocate()
// Subtract revocable resources.
foreachvalue (const Slave& slave, slaves) {
- // NOTE: `totalScalarQuantities` omits dynamic reservation,
- // persistent volume info, and allocation info. We additionally
- // remove the static reservations here via `toUnreserved()`.
- availableHeadroom -= slave.getAvailable().revocable()
- .createStrippedScalarQuantity().toUnreserved();
+ availableHeadroom -=
+ slave.getAvailable().revocable().createStrippedScalarQuantity();
}
// Due to the two stages in the allocation algorithm and the nature of
@@ -2637,9 +2616,8 @@ void HierarchicalAllocatorProcess::trackReservations(
{
foreachpair (const string& role,
const Resources& resources, reservations) {
- // We remove the static reservation metadata here via `toUnreserved()`.
const Resources scalarQuantitesToTrack =
- resources.createStrippedScalarQuantity().toUnreserved();
+ resources.createStrippedScalarQuantity();
reservationScalarQuantities[role] += scalarQuantitesToTrack;
}
@@ -2655,9 +2633,8 @@ void HierarchicalAllocatorProcess::untrackReservations(
Resources& currentReservationQuantity =
reservationScalarQuantities.at(role);
- // We remove the static reservation metadata here via `toUnreserved()`.
const Resources scalarQuantitesToUntrack =
- resources.createStrippedScalarQuantity().toUnreserved();
+ resources.createStrippedScalarQuantity();
CHECK(currentReservationQuantity.contains(scalarQuantitesToUntrack));
currentReservationQuantity -= scalarQuantitesToUntrack;
http://git-wip-us.apache.org/repos/asf/mesos/blob/f0284a51/src/tests/resources_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resources_tests.cpp b/src/tests/resources_tests.cpp
index 1410423..0095b94 100644
--- a/src/tests/resources_tests.cpp
+++ b/src/tests/resources_tests.cpp
@@ -2637,19 +2637,14 @@ TEST(ResourcesOperationTest, StrippedResourcesVolume)
Resources stripped = volume.createStrippedScalarQuantity();
EXPECT_TRUE(stripped.persistentVolumes().empty());
+ EXPECT_TRUE(stripped.reserved().empty());
EXPECT_EQ(Megabytes(200), stripped.disk().get());
- // `createStrippedScalarQuantity` doesn't remove the `role` from a
- // reserved resource.
- EXPECT_FALSE(stripped.reserved("role").empty());
-
Resource strippedVolume = *(stripped.begin());
ASSERT_EQ(Value::SCALAR, strippedVolume.type());
EXPECT_DOUBLE_EQ(200, strippedVolume.scalar().value());
- EXPECT_EQ("role", Resources::reservationRole(strippedVolume));
EXPECT_EQ("disk", strippedVolume.name());
- EXPECT_EQ(1, strippedVolume.reservations_size());
EXPECT_FALSE(strippedVolume.has_disk());
EXPECT_FALSE(Resources::isPersistentVolume(strippedVolume));
}
@@ -2678,13 +2673,11 @@ TEST(ResourcesOperationTest, StrippedResourcesReserved)
Resources stripped = dynamicallyReserved.createStrippedScalarQuantity();
- EXPECT_FALSE(stripped.reserved("role").empty());
+ EXPECT_TRUE(stripped.reserved("role").empty());
foreach (const Resource& resource, stripped) {
- EXPECT_EQ("role", Resources::reservationRole(resource));
- EXPECT_FALSE(resource.reservations().empty());
EXPECT_FALSE(Resources::isDynamicallyReserved(resource));
- EXPECT_FALSE(Resources::isUnreserved(resource));
+ EXPECT_TRUE(Resources::isUnreserved(resource));
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/f0284a51/src/tests/sorter_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/sorter_tests.cpp b/src/tests/sorter_tests.cpp
index 9cdffd7..266a9e7 100644
--- a/src/tests/sorter_tests.cpp
+++ b/src/tests/sorter_tests.cpp
@@ -1594,7 +1594,7 @@ TYPED_TEST(CommonSorterTest, RemoveSharedResources)
sorter.add(slaveId, sharedDisk);
Resources quantity2 = sorter.totalScalarQuantities();
- EXPECT_EQ(Resources::parse("disk(role1):100").get(), quantity2 - quantity1);
+ EXPECT_EQ(Resources::parse("disk:100").get(), quantity2 - quantity1);
sorter.add(slaveId, sharedDisk);
Resources quantity3 = sorter.totalScalarQuantities();
http://git-wip-us.apache.org/repos/asf/mesos/blob/f0284a51/src/v1/resources.cpp
----------------------------------------------------------------------
diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp
index 3d06fc6..ab8fc3e 100644
--- a/src/v1/resources.cpp
+++ b/src/v1/resources.cpp
@@ -1658,24 +1658,12 @@ Resources Resources::createStrippedScalarQuantity() const
foreach (const Resource& resource, resources) {
if (resource.type() == Value::SCALAR) {
- Resource scalar = resource;
- scalar.clear_provider_id();
- scalar.clear_allocation_info();
-
- // We collapse the stack of reservations here to a single `STATIC`
- // reservation in order to maintain existing behavior of ignoring
- // the reservation type, and keeping the reservation role.
- if (Resources::isReserved(scalar)) {
- Resource::ReservationInfo collapsedReservation;
- collapsedReservation.set_type(Resource::ReservationInfo::STATIC);
- collapsedReservation.set_role(Resources::reservationRole(scalar));
- scalar.clear_reservations();
- scalar.add_reservations()->CopyFrom(collapsedReservation);
- }
+ Resource scalar;
+
+ scalar.set_name(resource.name());
+ scalar.set_type(resource.type());
+ scalar.mutable_scalar()->CopyFrom(resource.scalar());
- scalar.clear_disk();
- scalar.clear_shared();
- scalar.clear_revocable();
stripped.add(scalar);
}
}