Merge pull request #108 from dvonthenen/bug/mesos0282state

Handle the case when the recover state is empty in 0.28.2
thecodeteam · Jun 15, 2016 · 1659e53 · 1659e53
2 parents 4394449 + 07c1200
commit 1659e53
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/isolator/isolator/docker_volume_driver_isolator.cpp b/isolator/isolator/docker_volume_driver_isolator.cpp
@@ -177,6 +177,10 @@ Future<Nothing> DockerVolumeDriverIsolator::recover(
   LOG(INFO) << "dvdicheckpoint::recover() called";
   Result<State> resultState =
     mesos::internal::slave::state::recover(mesosWorkingDir, true);
+  if (resultState.isNone()) {
+    LOG(INFO) << "dvdicheckpoint::recover(): recover state is NONE";
+    return Nothing();
+  }
 
   State state = resultState.get();
   LOG(INFO) << "dvdicheckpoint::recover() returned: " << state.errors;