[mesos] branch 1.5.x updated (6a8b61b -> f5bc60f)

[bm...@apache.org]

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

bmahler pushed a change to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git.


    from 6a8b61b  Fixed the broken backport for MESOS-9787.
     new 99ad476  Fixed REVIVE to clear filters for only the specified roles.
     new f5bc60f  Added MESOS-9856 to the 1.5.4 CHANGELOG.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG                                   | 1 +
 src/master/allocator/mesos/hierarchical.cpp | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

[mesos] 01/02: Fixed REVIVE to clear filters for only the specified roles.

[bm...@apache.org]

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

bmahler pushed a commit to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit 99ad4767231396bc24827e3db58d3fc5e5e1ac57
Author: Andrei Sekretenko <as...@mesosphere.io>
AuthorDate: Fri Jun 21 14:50:32 2019 -0400

    Fixed REVIVE to clear filters for only the specified roles.
    
    This is a fix for MESOS-9856 bug wich was causing all the offer filters
    to be cleared by reviveOffers() called for a specific subset of roles.
    
    Review: https://reviews.apache.org/r/70926/
---
 src/master/allocator/mesos/hierarchical.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/master/allocator/mesos/hierarchical.cpp b/src/master/allocator/mesos/hierarchical.cpp
index 5621f5e..95b447f 100644
--- a/src/master/allocator/mesos/hierarchical.cpp
+++ b/src/master/allocator/mesos/hierarchical.cpp
@@ -1319,7 +1319,6 @@ void HierarchicalAllocatorProcess::reviveOffers(
   CHECK(frameworks.contains(frameworkId));
 
   Framework& framework = frameworks.at(frameworkId);
-  framework.offerFilters.clear();
   framework.inverseOfferFilters.clear();
 
   const set<string>& roles = roles_.empty() ? framework.roles : roles_;
@@ -1328,9 +1327,11 @@ void HierarchicalAllocatorProcess::reviveOffers(
   // SUPPRESS is not parameterized. When parameterization is added,
   // we may need to differentiate between the cases here.
   foreach (const string& role, roles) {
-    CHECK(frameworkSorters.contains(role));
+    framework.offerFilters.erase(role);
 
+    CHECK(frameworkSorters.contains(role));
     frameworkSorters.at(role)->activate(frameworkId.value());
+
     framework.suppressedRoles.erase(role);
   }
 

[mesos] 02/02: Added MESOS-9856 to the 1.5.4 CHANGELOG.

[bm...@apache.org]

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

bmahler pushed a commit to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit f5bc60f624db7b1d1f071fec01c18b2ab73b08b5
Author: Benjamin Mahler <bm...@apache.org>
AuthorDate: Fri Jun 21 15:42:57 2019 -0400

    Added MESOS-9856 to the 1.5.4 CHANGELOG.
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ae9cb1a..c8a75c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ Release Notes - Mesos - Version 1.5.4 (WIP)
   * [MESOS-9766] - /__processes__ endpoint can hang.
   * [MESOS-9786] - Race between two REMOVE_QUOTA calls crashes the master.
   * [MESOS-9787] - Log slow SSL (TLS) peer reverse DNS lookup.
+  * [MESOS-9856] - REVIVE call with specified role(s) clears filters for all roles of a framework.
 
 ** Improvement
   * [MESOS-9159] - Support Foreign URLs in docker registry puller.