[mesos] 11/15: Updated validation of 'Reserve' call.

[bennoe]

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

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

commit 1aedc02e5cf8ab2a5aea7c9ed8327139ca9c0f0e
Author: Benno Evers <bev...@mesosphere.com>
AuthorDate: Fri Nov 8 14:07:29 2019 +0100

    Updated validation of 'Reserve' call.
    
    Updated `master::validation::operation::validate(Reserve&)` to
    account for the new `source` field in the reserve call, verifying
    that `source` and `resources` have a common reservation ancestor.
    
    Review: https://reviews.apache.org/r/71696/
---
 src/master/validation.cpp | 57 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/src/master/validation.cpp b/src/master/validation.cpp
index a7ecefb..c5fbbdd 100644
--- a/src/master/validation.cpp
+++ b/src/master/validation.cpp
@@ -2214,6 +2214,63 @@ Option<Error> validate(
     return Error("Invalid resources: " + error->message);
   }
 
+  error = resource::validate(reserve.source());
+  if (error.isSome()) {
+    return Error("Invalid source: " + error->message);
+  }
+
+  if (reserve.source_size() > 0) {
+    Resources source = reserve.source();
+    Resources target = reserve.resources();
+
+    auto validateReservationResources =
+      [](const RepeatedPtrField<Resource>& resources) -> Option<Error> {
+      // Resources should not be empty.
+      if (resources.empty()) {
+        return Error("Resource cannot be empty");
+      }
+
+      // All passed resources should have identical reservations.
+      const RepeatedPtrField<Resource::ReservationInfo>& reservations =
+        resources.begin()->reservations();
+
+      if (!std::all_of(
+              resources.begin(),
+              resources.end(),
+              [&](const Resource& resource) {
+                return resource.reservations_size() == reservations.size() &&
+                       std::equal(
+                           resource.reservations().begin(),
+                           resource.reservations().end(),
+                           reservations.begin());
+              })) {
+        return Error(
+            "Mixed reservations are not supported" + stringify(resources));
+      }
+
+      return None();
+    };
+
+    error = validateReservationResources(source);
+    if (error.isSome()) {
+      return Error("Invalid source: " + error->message);
+    }
+
+    error = validateReservationResources(target);
+    if (error.isSome()) {
+      return Error("Invalid resources: " + error->message);
+    }
+
+    // Both operands should refer to identical resource quantities.
+    if (source.toUnreserved() != target.toUnreserved()) {
+      return Error(
+          "Source and target resources should refer to identical resource "
+          "quantities: " +
+          stringify(source.toUnreserved()) + " vs. " +
+          stringify(target.toUnreserved()));
+    }
+  }
+
   error =
     resource::internal::validateSingleResourceProvider(reserve.resources());
   if (error.isSome()) {