From cd385ffc0b925343be57502bb270ff65a9d0a3cc Mon Sep 17 00:00:00 2001
From: zhonchen <zhonchen+1@linkedin.com>
Date: Wed, 7 Aug 2024 09:27:36 -0700
Subject: [PATCH] Add try/catch logic for xds stream initialization (#1012)

---
 CHANGELOG.md                                            | 6 +++++-
 d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java | 9 ++++++++-
 gradle.properties                                       | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4de4f23f8..ef48176545 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@ and what APIs have changed, if applicable.
 
 ## [Unreleased]
 
+## [29.58.2] - 2024-08-06
+- Add try/catch logic for INDIS xds stream initialization
+
 ## [29.58.1] - 2024-07-19
 - Increase verbosity of testExtensionSchemaValidation tests
 
@@ -5713,7 +5716,8 @@ patch operations can re-use these classes for generating patch messages.
 
 ## [0.14.1]
 
-[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.58.1...master
+[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.58.2...master
+[29.58.2]: https://github.com/linkedin/rest.li/compare/v29.58.1...v29.58.2
 [29.58.1]: https://github.com/linkedin/rest.li/compare/v29.58.0...v29.58.1
 [29.58.0]: https://github.com/linkedin/rest.li/compare/v29.57.2...v29.58.0
 [29.57.2]: https://github.com/linkedin/rest.li/compare/v29.57.1...v29.57.2
diff --git a/d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java b/d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java
index ee4e25231f..6f8a64bb39 100644
--- a/d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java
+++ b/d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java
@@ -173,7 +173,14 @@ public void startRpcStream()
   {
     _executorService.execute(() -> {
       if (!isInBackoff()) {
-        startRpcStreamLocal();
+        try
+        {
+          startRpcStreamLocal();
+        }
+        catch (Throwable t)
+        {
+          _log.error("Unexpected exception while starting RPC stream", t);
+        }
       }
     });
   }
diff --git a/gradle.properties b/gradle.properties
index 70302c20d6..90cc34d51a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=29.58.1
+version=29.58.2
 group=com.linkedin.pegasus
 org.gradle.configureondemand=true
 org.gradle.parallel=true