[mesos] branch master updated: Removed unused class fields in the allocator.

[mz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mzhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new c8b2aff  Removed unused class fields in the allocator.
c8b2aff is described below

commit c8b2aff0b52fd667925b0aa43a2f5040df02b005
Author: Meng Zhu <mz...@mesosphere.io>
AuthorDate: Fri Jan 11 16:10:24 2019 -0800

    Removed unused class fields in the allocator.
    
    These fields were used before we introducing the
    `mesos::allocator::Options` struct. They are now
    duplicated and unused.
    
    Review: https://reviews.apache.org/r/69729
---
 include/mesos/allocator/allocator.hpp       | 10 ++++++++++
 src/master/allocator/mesos/hierarchical.hpp | 12 ------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/include/mesos/allocator/allocator.hpp b/include/mesos/allocator/allocator.hpp
index b58371b..f186838 100644
--- a/include/mesos/allocator/allocator.hpp
+++ b/include/mesos/allocator/allocator.hpp
@@ -49,12 +49,22 @@ namespace allocator {
 struct Options
 {
   Duration allocationInterval = Seconds(1);
+
+  // Resources (by name) that will be excluded from a role's fair share.
   Option<std::set<std::string>> fairnessExcludeResourceNames = None();
+
+  // Filter GPU resources based on the `GPU_RESOURCES` framework capability.
   bool filterGpuResources = true;
+
+  // The master's domain, if any.
   Option<DomainInfo> domain = None();
+
+  // The minimum allocatable resource quantities, if any.
   Option<std::vector<mesos::internal::ResourceQuantities>>
     minAllocatableResources = None();
+
   size_t maxCompletedFrameworks = 0;
+
   bool publishPerFrameworkMetrics = true;
 };
 
diff --git a/src/master/allocator/mesos/hierarchical.hpp b/src/master/allocator/mesos/hierarchical.hpp
index a4425bc..ca16383 100644
--- a/src/master/allocator/mesos/hierarchical.hpp
+++ b/src/master/allocator/mesos/hierarchical.hpp
@@ -549,18 +549,6 @@ protected:
   // Slaves to send offers for.
   Option<hashset<std::string>> whitelist;
 
-  // Resources (by name) that will be excluded from a role's fair share.
-  Option<std::set<std::string>> fairnessExcludeResourceNames;
-
-  // Filter GPU resources based on the `GPU_RESOURCES` framework capability.
-  bool filterGpuResources;
-
-  // The master's domain, if any.
-  Option<DomainInfo> domain;
-
-  // The minimum allocatable resources, if any.
-  Option<std::vector<Resources>> minAllocatableResources;
-
   // There are two stages of allocation:
   //
   //   Stage 1: Allocate to satisfy quota guarantees.