From 63e7e4e72441911e36afdd587f9bc88067c1da32 Mon Sep 17 00:00:00 2001
From: Mohamadreza Rostami <mohamadrezarostami2@gmail.com>
Date: Tue, 19 Oct 2021 18:40:02 +0330
Subject: [PATCH] [SPARK-37061][CORE] Fix report driver status which does not
 handle response from backup masters

---
 .../main/scala/org/apache/spark/deploy/Client.scala    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/main/scala/org/apache/spark/deploy/Client.scala b/core/src/main/scala/org/apache/spark/deploy/Client.scala
index 7c5ab43a9e1b3..2f1ff54358d82 100644
--- a/core/src/main/scala/org/apache/spark/deploy/Client.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/Client.scala
@@ -190,13 +190,15 @@ private class ClientEndpoint(
                 logDebug(s"State of driver $submittedDriverID is ${state.get}, " +
                   s"continue monitoring driver status.")
               }
-            }
-        }
-      } else {
+          }
+      }
+    } else if (exception.exists(e => Utils.responseFromBackup(e.getMessage))) {
+      logDebug(s"The status response is reported from a backup spark instance. So, ignored.")
+    } else {
         logError(s"ERROR: Cluster master did not recognize $submittedDriverID")
         System.exit(-1)
-      }
     }
+  }
   override def receive: PartialFunction[Any, Unit] = {
 
     case SubmitDriverResponse(master, success, driverId, message) =>