You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2013/09/10 02:56:18 UTC

git commit: Ignored the recovery error due to the inability to find the latest executor run.

Updated Branches:
  refs/heads/master 4954b75f6 -> f00441b70


Ignored the recovery error due to the inability to
find the latest executor run.

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


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

Branch: refs/heads/master
Commit: f00441b70e481e4efaa06ee4a42cdfdd0ecb020c
Parents: 4954b75
Author: Vinod Kone <vi...@twitter.com>
Authored: Thu Sep 5 11:09:40 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Mon Sep 9 17:55:08 2013 -0700

----------------------------------------------------------------------
 src/slave/state.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/f00441b7/src/slave/state.cpp
----------------------------------------------------------------------
diff --git a/src/slave/state.cpp b/src/slave/state.cpp
index 51bc8f4..c03db32 100644
--- a/src/slave/state.cpp
+++ b/src/slave/state.cpp
@@ -301,18 +301,13 @@ Try<ExecutorState> ExecutorState::recover(
     }
   }
 
-  // Make sure we can find the latest executor.
+  // Find the latest executor.
+  // It is possible that we cannot find the "latest" executor if the
+  // slave died before it created the "latest" symlink.
   if (state.latest.isNone()) {
-    message =
-      "Failed to find the latest run of executor '" + executorId.value() + "'";
-
-    if (strict) {
-      return Error(message);
-    } else {
-      LOG(WARNING) << message;
-      state.errors++;
-      return state;
-    }
+    LOG(WARNING) << "Failed to find the latest run of executor '"
+                 << executorId << "' of framework " << frameworkId;
+    return state;
   }
 
   return state;