fix indis null guard log (#991)

linkedin · Mar 20, 2024 · 787bef3 · 787bef3
1 parent d7fbe17
commit 787bef3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,9 @@ and what APIs have changed, if applicable.
 
 ## [Unreleased]
 
+## [29.51.10] - 2024-03-20
+- Fix null guard log issue
+
 ## [29.51.9] - 2024-03-19
 - Fix StateUpdater memory leak issue
 
@@ -5659,7 +5662,8 @@ patch operations can re-use these classes for generating patch messages.
 
 ## [0.14.1]
 
-[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.51.9...master
+[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.51.10...master
+[29.51.10]: https://github.com/linkedin/rest.li/compare/v29.51.9...v29.51.10
 [29.51.9]: https://github.com/linkedin/rest.li/compare/v29.51.8...v29.51.9
 [29.51.8]: https://github.com/linkedin/rest.li/compare/v29.51.7...v29.51.8
 [29.51.7]: https://github.com/linkedin/rest.li/compare/v29.51.6...v29.51.7

diff --git a/d2/src/main/java/com/linkedin/d2/balancer/simple/SimpleLoadBalancer.java b/d2/src/main/java/com/linkedin/d2/balancer/simple/SimpleLoadBalancer.java
@@ -915,7 +915,6 @@ public void getLoadBalancedClusterAndUriProperties(String clusterName, boolean w
       Pair<ClusterProperties, UriProperties> pair = getClusterAndUriPropertiesFromCache(clusterName, pairCallback);
       if (pair != null)
       {
-        _log.info("getClusterAndUriProperties for {} timed out, used cached value instead.", clusterName);
         pairCallback.onSuccess(pair);
       }
     };
@@ -926,7 +925,7 @@ public void getLoadBalancedClusterAndUriProperties(String clusterName, boolean w
     }
     else
     {
-      _log.info("No timeout for cluster {}", clusterName);
+      _log.debug("No timeout for cluster {}", clusterName);
       _state.listenToCluster(clusterName, new NullStateListenerCallback());
       callback.run();
     }
@@ -939,6 +938,7 @@ private void handleTimeoutFromGetClusterAndUriProperties(Throwable e, String clu
         getClusterAndUriPropertiesFromCache(clusterName, clusterAndUriPropertiesCallback);
     if (pair != null)
     {
+      _log.info("getClusterAndUriProperties for {} timed out, used cached value instead.", clusterName);
       clusterAndUriPropertiesCallback.onSuccess(pair);
     }
     else

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=29.51.9
+version=29.51.10
 group=com.linkedin.pegasus
 org.gradle.configureondemand=true
 org.gradle.parallel=true