Add try/catch logic for xds stream initialization (#1012)

linkedin · Aug 7, 2024 · cd385ff · cd385ff
1 parent eaef65f
commit cd385ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-version=29.58.1
+version=29.58.2
 group=com.linkedin.pegasus
 org.gradle.configureondemand=true
 org.gradle.parallel=true