commit 0547cde8cdfc23b4810691ba5f83234b1930c835
author Benjamin Mahler <bmahler@twitter.com> Wed Dec 04 23:57:01 2013 -0800
committer Benjamin Mahler <bmahler@twitter.com> Wed Dec 04 23:57:08 2013 -0800
tree 63e61a7e08b746dde3335a1b30fda85ee0ac1d0f
parent d0cb03f9535ae1b6997f60f4de50ca96f6b19e70

Fixed an exception raised in the master related to task statuses.

src/master/master.cpp

diff --git a/src/master/master.cpp b/src/master/master.cpp
index 4f4db93..e18df7c 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -1549,7 +1549,8 @@
   LOG(INFO) << "Status update " << update << " from " << pid;
 
   // TODO(brenden) Consider wiping the `data` and `message` fields?
-  if (task->state() == status.state()) {
+  if (task->statuses_size() > 0 &&
+      task->statuses(task->statuses_size() - 1).state() == task->state()) {
     task->mutable_statuses()->RemoveLast();
   }
   task->add_statuses()->CopyFrom(status);

src/slave/slave.cpp

diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 75d9e5d..9a8b82f 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -3284,7 +3284,8 @@
   if (launchedTasks.contains(status.task_id())) {
     Task* task = launchedTasks[status.task_id()];
     // TODO(brenden): Consider wiping the `data` and `message` fields?
-    if (task->state() == status.state()) {
+    if (task->statuses_size() > 0 &&
+        task->statuses(task->statuses_size() - 1).state() == task->state()) {
       task->mutable_statuses()->RemoveLast();
     }
     task->add_statuses()->CopyFrom(status);