Make the Blaze server kill the previous instance if the start time file doesn't exist.

It may be an old version that doesn't know how to write them yet.

--
MOS_MIGRATED_REVID=121462577

1 files changed, 8 insertions, 9 deletions

diff --git a/src/main/cpp/blaze_util_linux.cc b/src/main/cpp/blaze_util_linux.cc
index 4be6fd3e5a..5a3ce94e30 100644
--- a/src/main/cpp/blaze_util_linux.cc
+++ b/src/main/cpp/blaze_util_linux.cc
@@ -230,15 +230,14 @@ void KillServerProcess(
   }
 
   string recorded_start_time;
-  if (!ReadFile(blaze_util::JoinPath(output_base, "server/server.starttime"),
-                &recorded_start_time)) {
-    // start time file got deleted, but PID file didn't. This is strange. Let's
-    // not kill a random process. Note that this makes Blaze unable to kill
-    // hung servers that do not write a server.starttime file.
-    return;
-  }
-
-  if (recorded_start_time != start_time) {
+  bool file_present = ReadFile(
+      blaze_util::JoinPath(output_base, "server/server.starttime"),
+      &recorded_start_time);
+
+  // start time file got deleted, but PID file didn't. This is strange.
+  // Assume that this is an old Blaze process that doesn't know how to  write
+  // start time files yet.
+  if (file_present && recorded_start_time != start_time) {
     // This is a different process.
     fprintf(stderr, "PID %d got reused. Not killing the process.\n", pid);
     return;