Fixing some failing store tests. Related to: SDENT-175

TIBCOSoftware · Mar 24, 2020 · 5d5401f · 5d5401f
1 parent ca81865
commit 5d5401f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/Misc.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/Misc.java
@@ -281,8 +281,16 @@ public static Set<DistributedMember> getLeadNodes() {
    * @return Optional of DistributedMember representing primary lead node if primary lead exists in cluster
    *         Optional#empty if primary lead node does not exist in cluster
    */
-  public static Optional<DistributedMember> getPrimaryLead(){
-    return getLeadNodes().stream().filter(dm -> GemFireXDUtils.getGfxdProfile(dm).hasSparkURL()).findFirst();
+  public static Optional<DistributedMember> getPrimaryLead() {
+    try {
+      return getLeadNodes().stream().filter(dm -> GemFireXDUtils.getGfxdProfile(dm).hasSparkURL()).findFirst();
+    } catch (NoMemberFoundException ex) {
+      if (ex.getMessage().equals("SnappyData Lead node is not available")) {
+        return Optional.empty();
+      } else {
+        throw ex;
+      }
+    }
   }
 
   /**