You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ya...@apache.org on 2017/07/21 04:26:46 UTC
mesos git commit: Print the `resource` that fails CHECK.
Repository: mesos
Updated Branches:
refs/heads/master 13104ef80 -> 1b15ff7a8
Print the `resource` that fails CHECK.
This patch focuses on the CHECKs added in 1e2200.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1b15ff7a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1b15ff7a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1b15ff7a
Branch: refs/heads/master
Commit: 1b15ff7a82a1b7da8cf1b73d9923d8f3e1a7e945
Parents: 13104ef
Author: Jiang Yan Xu <xu...@apple.com>
Authored: Thu Jul 20 17:06:31 2017 -0700
Committer: Jiang Yan Xu <xu...@apple.com>
Committed: Thu Jul 20 21:26:27 2017 -0700
----------------------------------------------------------------------
src/common/resources.cpp | 36 ++++++++++++++++++------------------
src/v1/resources.cpp | 38 +++++++++++++++++++-------------------
2 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1b15ff7a/src/common/resources.cpp
----------------------------------------------------------------------
diff --git a/src/common/resources.cpp b/src/common/resources.cpp
index 3f4fff4..8d43889 100644
--- a/src/common/resources.cpp
+++ b/src/common/resources.cpp
@@ -1047,8 +1047,8 @@ Option<Error> Resources::validate(const RepeatedPtrField<Resource>& resources)
bool Resources::isEmpty(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
if (resource.type() == Value::SCALAR) {
Value::Scalar zero;
@@ -1066,8 +1066,8 @@ bool Resources::isEmpty(const Resource& resource)
bool Resources::isPersistentVolume(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.has_disk() && resource.disk().has_persistence();
}
@@ -1077,8 +1077,8 @@ bool Resources::isReserved(
const Resource& resource,
const Option<string>& role)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return !isUnreserved(resource) &&
(role.isNone() || role.get() == reservationRole(resource));
@@ -1089,8 +1089,8 @@ bool Resources::isAllocatableTo(
const Resource& resource,
const std::string& role)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return isUnreserved(resource) ||
role == reservationRole(resource) ||
@@ -1100,8 +1100,8 @@ bool Resources::isAllocatableTo(
bool Resources::isUnreserved(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.reservations_size() == 0;
}
@@ -1109,8 +1109,8 @@ bool Resources::isUnreserved(const Resource& resource)
bool Resources::isDynamicallyReserved(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return isReserved(resource) && (resource.reservations().rbegin()->type() ==
Resource::ReservationInfo::DYNAMIC);
@@ -1119,8 +1119,8 @@ bool Resources::isDynamicallyReserved(const Resource& resource)
bool Resources::isRevocable(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.has_revocable();
}
@@ -1128,8 +1128,8 @@ bool Resources::isRevocable(const Resource& resource)
bool Resources::isShared(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.has_shared();
}
@@ -1137,8 +1137,8 @@ bool Resources::isShared(const Resource& resource)
bool Resources::hasRefinedReservations(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.reservations_size() > 1;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/1b15ff7a/src/v1/resources.cpp
----------------------------------------------------------------------
diff --git a/src/v1/resources.cpp b/src/v1/resources.cpp
index 55d493e..508f3f8 100644
--- a/src/v1/resources.cpp
+++ b/src/v1/resources.cpp
@@ -667,7 +667,7 @@ Try<Resources> Resources::parse(
resource.clear_role();
resource.clear_reservation();
} else if (resource.role() == "*") {
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_reservation()) << resource;
// Unreserved resources.
resource.clear_role();
} else {
@@ -1078,8 +1078,8 @@ Option<Error> Resources::validate(const RepeatedPtrField<Resource>& resources)
bool Resources::isEmpty(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
if (resource.type() == Value::SCALAR) {
Value::Scalar zero;
@@ -1097,8 +1097,8 @@ bool Resources::isEmpty(const Resource& resource)
bool Resources::isPersistentVolume(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.has_disk() && resource.disk().has_persistence();
}
@@ -1108,8 +1108,8 @@ bool Resources::isReserved(
const Resource& resource,
const Option<string>& role)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return !isUnreserved(resource) &&
(role.isNone() || role.get() == reservationRole(resource));
@@ -1120,8 +1120,8 @@ bool Resources::isAllocatableTo(
const Resource& resource,
const std::string& role)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return isUnreserved(resource) ||
role == reservationRole(resource) ||
@@ -1131,8 +1131,8 @@ bool Resources::isAllocatableTo(
bool Resources::isUnreserved(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.reservations_size() == 0;
}
@@ -1140,8 +1140,8 @@ bool Resources::isUnreserved(const Resource& resource)
bool Resources::isDynamicallyReserved(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return isReserved(resource) && (resource.reservations().rbegin()->type() ==
Resource::ReservationInfo::DYNAMIC);
@@ -1150,8 +1150,8 @@ bool Resources::isDynamicallyReserved(const Resource& resource)
bool Resources::isRevocable(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.has_revocable();
}
@@ -1159,8 +1159,8 @@ bool Resources::isRevocable(const Resource& resource)
bool Resources::isShared(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.has_shared();
}
@@ -1168,8 +1168,8 @@ bool Resources::isShared(const Resource& resource)
bool Resources::hasRefinedReservations(const Resource& resource)
{
- CHECK(!resource.has_role());
- CHECK(!resource.has_reservation());
+ CHECK(!resource.has_role()) << resource;
+ CHECK(!resource.has_reservation()) << resource;
return resource.reservations_size() > 1;
}