GH-1248. Fix bug of useSessionTimeoutMs overflow (#1249)

xingsuo-zbz · 赵宝珠 · web-flow · commit 0bb3adf37877 · 2025-02-28T13:01:45.000+08:00
Co-authored-by: 赵宝珠 &lt;zhaobaozhu@xiaohongshu.com&gt;
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java b/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
@@ -241,7 +241,7 @@ private void postState(ConnectionState state) {
     private void processEvents() {
         while (state.get() == State.STARTED) {
             try {
-                int useSessionTimeoutMs = getUseSessionTimeoutMs();
+                long useSessionTimeoutMs = getUseSessionTimeoutMs();
                 long elapsedMs = startOfSuspendedEpoch == 0
                         ? useSessionTimeoutMs / 2
                         : System.currentTimeMillis() - startOfSuspendedEpoch;
@@ -281,7 +281,7 @@ private void processEvents() {
     private void checkSessionExpiration() {
         if ((currentConnectionState == ConnectionState.SUSPENDED) && (startOfSuspendedEpoch != 0)) {
             long elapsedMs = System.currentTimeMillis() - startOfSuspendedEpoch;
-            int useSessionTimeoutMs = getUseSessionTimeoutMs();
+            long useSessionTimeoutMs = getUseSessionTimeoutMs();
             if (elapsedMs >= useSessionTimeoutMs) {
                 startOfSuspendedEpoch =
                         System.currentTimeMillis(); // reset startOfSuspendedEpoch to avoid spinning on this session
@@ -317,9 +317,9 @@ private void setCurrentConnectionState(ConnectionState newConnectionState) {
         startOfSuspendedEpoch = (currentConnectionState == ConnectionState.SUSPENDED) ? System.currentTimeMillis() : 0;
     }
 
-    private int getUseSessionTimeoutMs() {
-        int lastNegotiatedSessionTimeoutMs = client.getZookeeperClient().getLastNegotiatedSessionTimeoutMs();
-        int useSessionTimeoutMs =
+    private long getUseSessionTimeoutMs() {
+        long lastNegotiatedSessionTimeoutMs = client.getZookeeperClient().getLastNegotiatedSessionTimeoutMs();
+        long useSessionTimeoutMs =
                 (lastNegotiatedSessionTimeoutMs > 0) ? lastNegotiatedSessionTimeoutMs : sessionTimeoutMs;
         useSessionTimeoutMs = sessionExpirationPercent > 0 && startOfSuspendedEpoch != 0
                 ? (useSessionTimeoutMs * sessionExpirationPercent) / 100
