[5/9] mesos git commit: Added validation for executor's shutdown grace period.

[al...@apache.org]

Added validation for executor's shutdown grace period.

Review: https://reviews.apache.org/r/44854/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/52cba1d5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/52cba1d5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/52cba1d5

Branch: refs/heads/master
Commit: 52cba1d5518d698fa5b4c6ec6a0777cc1aa7853c
Parents: 92266d0
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Thu Mar 24 17:29:36 2016 +0100
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Thu Mar 24 18:21:01 2016 +0100

----------------------------------------------------------------------
 src/master/validation.cpp             |  8 ++++
 src/tests/master_validation_tests.cpp | 59 ++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/52cba1d5/src/master/validation.cpp
----------------------------------------------------------------------
diff --git a/src/master/validation.cpp b/src/master/validation.cpp
index 820a9fa..d4fe568 100644
--- a/src/master/validation.cpp
+++ b/src/master/validation.cpp
@@ -368,6 +368,14 @@ Option<Error> validateExecutorInfo(
           stringify(task.executor()) + "\n"
           "------------------------------------------------------------\n");
     }
+
+    // Make sure provided duration is non-negative.
+    if (task.executor().has_shutdown_grace_period() &&
+        Nanoseconds(task.executor().shutdown_grace_period().nanoseconds()) <
+          Duration::zero()) {
+      return Error(
+          "ExecutorInfo's 'shutdown_grace_period' must be non-negative");
+    }
   }
 
   return None();

http://git-wip-us.apache.org/repos/asf/mesos/blob/52cba1d5/src/tests/master_validation_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp
index 8d0070a..d531fc1 100644
--- a/src/tests/master_validation_tests.cpp
+++ b/src/tests/master_validation_tests.cpp
@@ -1165,6 +1165,65 @@ TEST_F(TaskValidationTest, TaskAndExecutorUseRevocableResources)
 }
 
 
+// Ensures that negative executor shutdown grace period in `ExecutorInfo`
+// is rejected during `TaskInfo` validation.
+TEST_F(TaskValidationTest, ExecutorShutdownGracePeriodIsNonNegative)
+{
+  Try<Owned<cluster::Master>> master = StartMaster();
+  ASSERT_SOME(master);
+
+  Owned<MasterDetector> detector = master.get()->createDetector();
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
+  ASSERT_SOME(slave);
+
+  MockScheduler sched;
+  MesosSchedulerDriver driver(
+      &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
+
+  EXPECT_CALL(sched, registered(&driver, _, _))
+    .Times(1);
+
+  Future<vector<Offer>> offers;
+  EXPECT_CALL(sched, resourceOffers(&driver, _))
+    .WillOnce(FutureArg<1>(&offers))
+    .WillRepeatedly(Return()); // Ignore subsequent offers.
+
+  driver.start();
+
+  AWAIT_READY(offers);
+  EXPECT_NE(0u, offers->size());
+  Offer offer = offers.get()[0];
+
+  ExecutorInfo executorInfo(DEFAULT_EXECUTOR_INFO);
+  executorInfo.mutable_shutdown_grace_period()->set_nanoseconds(
+      Seconds(-1).ns());
+
+  TaskInfo task;
+  task.set_name("");
+  task.mutable_task_id()->set_value("1");
+  task.mutable_slave_id()->MergeFrom(offer.slave_id());
+  task.mutable_resources()->MergeFrom(offer.resources());
+  task.mutable_executor()->MergeFrom(executorInfo);
+
+  Future<TaskStatus> status;
+  EXPECT_CALL(sched, statusUpdate(&driver, _))
+    .WillOnce(FutureArg<1>(&status));
+
+  driver.launchTasks(offer.id(), {task});
+
+  AWAIT_READY(status);
+  EXPECT_EQ(task.task_id(), status->task_id());
+  EXPECT_EQ(TASK_ERROR, status->state());
+  EXPECT_EQ(TaskStatus::REASON_TASK_INVALID, status->reason());
+  EXPECT_TRUE(status->has_message());
+  EXPECT_EQ("ExecutorInfo's 'shutdown_grace_period' must be non-negative",
+            status->message());
+
+  driver.stop();
+  driver.join();
+}
+
+
 // TODO(jieyu): Add tests for checking duplicated persistence ID
 // against offered resources.