[mesos] branch 1.9.x updated: Made `CHECK` in sorter print out more info upon failure.

[mzhu]

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

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


The following commit(s) were added to refs/heads/1.9.x by this push:
     new 8907a55  Made `CHECK` in sorter print out more info upon failure.
8907a55 is described below

commit 8907a55a01fdc3367bf5952541fce9de1c08b64e
Author: Meng Zhu <m...@mesosphere.io>
AuthorDate: Fri Oct 4 10:48:40 2019 -0400

    Made `CHECK` in sorter print out more info upon failure.
    
    Review: https://reviews.apache.org/r/71581
---
 src/master/allocator/mesos/sorter/drf/sorter.hpp    | 6 ++++--
 src/master/allocator/mesos/sorter/random/sorter.hpp | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/master/allocator/mesos/sorter/drf/sorter.hpp 
b/src/master/allocator/mesos/sorter/drf/sorter.hpp
index 299985c..248ca81 100644
--- a/src/master/allocator/mesos/sorter/drf/sorter.hpp
+++ b/src/master/allocator/mesos/sorter/drf/sorter.hpp
@@ -336,7 +336,8 @@ struct DRFSorter::Node
 
     void subtract(const SlaveID& slaveId, const Resources& toRemove)
     {
-      CHECK(resources.contains(slaveId));
+      CHECK(resources.contains(slaveId))
+        << "Resources " << resources << " does not contain " << slaveId;
       CHECK(resources.at(slaveId).contains(toRemove))
         << "Resources " << resources.at(slaveId) << " at agent " << slaveId
         << " does not contain " << toRemove;
@@ -374,7 +375,8 @@ struct DRFSorter::Node
       const ResourceQuantities newAllocationQuantities =
         ResourceQuantities::fromScalarResources(newAllocation.scalars());
 
-      CHECK(resources.contains(slaveId));
+      CHECK(resources.contains(slaveId))
+        << "Resources " << resources << " does not contain " << slaveId;
       CHECK(resources[slaveId].contains(oldAllocation))
         << "Resources " << resources[slaveId] << " at agent " << slaveId
         << " does not contain " << oldAllocation;
diff --git a/src/master/allocator/mesos/sorter/random/sorter.hpp 
b/src/master/allocator/mesos/sorter/random/sorter.hpp
index b77c5cc..df9c895 100644
--- a/src/master/allocator/mesos/sorter/random/sorter.hpp
+++ b/src/master/allocator/mesos/sorter/random/sorter.hpp
@@ -356,7 +356,8 @@ struct RandomSorter::Node
 
     void subtract(const SlaveID& slaveId, const Resources& toRemove)
     {
-      CHECK(resources.contains(slaveId));
+      CHECK(resources.contains(slaveId))
+        << "Resources " << resources << " does not contain " << slaveId;
       CHECK(resources.at(slaveId).contains(toRemove))
         << "Resources " << resources.at(slaveId) << " at agent " << slaveId
         << " does not contain " << toRemove;
@@ -394,7 +395,8 @@ struct RandomSorter::Node
       const ResourceQuantities newAllocationQuantities =
         ResourceQuantities::fromScalarResources(newAllocation.scalars());
 
-      CHECK(resources.contains(slaveId));
+      CHECK(resources.contains(slaveId))
+        << "Resources " << resources << " does not contain " << slaveId;
       CHECK(resources[slaveId].contains(oldAllocation))
         << "Resources " << resources[slaveId] << " at agent " << slaveId
         << " does not contain " << oldAllocation;