<fix>[zstack]: call interrupt after receiving InterruptedException

shanshan.ning · shanshan.ning · commit a2a6d38fa1d3 · 2023-04-23T13:34:03.000+08:00
"InterruptedException" should not be ignored, call interrupt manually after receiving InterruptedException

Related: ZSTAC-53781

Change-Id: I6d69707a6670747777746b6f6962646b77686876
diff --git a/compute/src/main/java/org/zstack/compute/host/HostBase.java b/compute/src/main/java/org/zstack/compute/host/HostBase.java
@@ -724,6 +724,7 @@ public void fail(ErrorCode errorCode) {
                         try {
                             TimeUnit.SECONDS.sleep(sleep);
                         } catch (InterruptedException ignored) {
+                            Thread.currentThread().interrupt();
                         }
                     }
                 }
diff --git a/console/src/main/java/org/zstack/console/ConsoleManagerImpl.java b/console/src/main/java/org/zstack/console/ConsoleManagerImpl.java
@@ -232,6 +232,7 @@ public void afterMigrateVm(VmInstanceInventory inv, String srcHostUuid) {
             }
         } catch (InterruptedException e) {
             logger.warn(e.getMessage(), e);
+            Thread.currentThread().interrupt();
         }
     }
 
diff --git a/core/src/main/java/org/zstack/core/cloudbus/CloudBusImpl2.java b/core/src/main/java/org/zstack/core/cloudbus/CloudBusImpl2.java
@@ -158,6 +158,7 @@ private void retry(Message msg) {
                 TimeUnit.SECONDS.sleep(CloudBusGlobalProperty.RABBITMQ_RETRY_DELAY_ON_RETURN);
             } catch (InterruptedException e) {
                 logger.warn(e.getMessage(), e);
+                Thread.currentThread().interrupt();
             }
 
             if (msg instanceof Event) {
@@ -213,6 +214,7 @@ Channel acquire() {
                 DebugUtils.Assert(chan!=null, String.format("cannot get a channel after 10 minutes"));
                 return chan;
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 throw new CloudRuntimeException(e);
             }
         }
@@ -477,6 +479,7 @@ private boolean recoverSend() throws IOException {
                         TimeUnit.SECONDS.sleep(interval);
                     } catch (InterruptedException e1) {
                         logger.warn(e1.getMessage());
+                        Thread.currentThread().interrupt();
                     }
 
                     try {
@@ -1833,6 +1836,7 @@ List<Message> getRequests() {
                 try {
                     e.wait(msg.getTimeout());
                 } catch (InterruptedException e1) {
+                    Thread.currentThread().interrupt();
                     throw new CloudRuntimeException(e1);
                 }
             }
@@ -1929,6 +1933,7 @@ List<Message> getRequests() {
                 try {
                     e.wait(minTimeout);
                 } catch (InterruptedException e1) {
+                    Thread.currentThread().interrupt();
                     throw new CloudRuntimeException(e1);
                 }
             }
diff --git a/core/src/main/java/org/zstack/core/db/DBSourceUtils.java b/core/src/main/java/org/zstack/core/db/DBSourceUtils.java
@@ -43,6 +43,8 @@ public static boolean waitDBConnected(int retryTimes, int interval) {
     private static void sleep(int seconds) {
         try {
             TimeUnit.SECONDS.sleep(seconds);
-        } catch (InterruptedException ignore) {}
+        } catch (InterruptedException ignore) {
+            Thread.currentThread().interrupt();
+        }
     }
 }
diff --git a/core/src/main/java/org/zstack/core/retry/Retry.java b/core/src/main/java/org/zstack/core/retry/Retry.java
@@ -88,6 +88,7 @@ public T run() {
                     TimeUnit.SECONDS.sleep(interval);
                 } catch (InterruptedException e) {
                     logger.warn(e.getMessage(), e);
+                    Thread.currentThread().interrupt();
                 }
 
 
diff --git a/core/src/main/java/org/zstack/core/salt/SaltRunner.java b/core/src/main/java/org/zstack/core/salt/SaltRunner.java
@@ -288,6 +288,7 @@ public void success() {
                         try {
                             TimeUnit.SECONDS.sleep(interval);
                         } catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
                             throw new CloudRuntimeException(e);
                         }
                     }
@@ -302,6 +303,7 @@ public void success() {
                 } catch (Exception e) {
                     logger.warn(String.format("failed to run salt state[%s] on system[%s], %s", stateName, targetIp, e.getMessage()));
                     completion.fail(operr(e.getMessage()));
+                    Thread.currentThread().interrupt();
                 }
             }
 
diff --git a/header/src/main/java/org/zstack/header/core/FutureCompletion.java b/header/src/main/java/org/zstack/header/core/FutureCompletion.java
@@ -83,6 +83,7 @@ private void doWait(long timeout) {
         try {
             wait(timeout);
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new CloudRuntimeException(e);
         }
     }
@@ -95,6 +96,7 @@ public synchronized void await() {
         try {
             wait();
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new CloudRuntimeException(e);
         }
     }
diff --git a/header/src/main/java/org/zstack/header/core/FutureReturnValueCompletion.java b/header/src/main/java/org/zstack/header/core/FutureReturnValueCompletion.java
@@ -54,6 +54,7 @@ private void dumpSlowFuture() {
         try {
             wait(SLOW_FUTURE_TIMEOUT);
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new CloudRuntimeException(e);
         }
 
@@ -75,6 +76,7 @@ private void dumpSlowFuture() {
             }
         } catch (Exception e) {
             logger.warn(String.format("dumpSlowFuture get exception %s %s", e.getMessage(), e.toString()));
+            Thread.currentThread().interrupt();
         }
     }
 
@@ -95,6 +97,7 @@ public synchronized void await(long timeout) {
         try {
             wait(timeout);
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new CloudRuntimeException(e);
         }
 
@@ -115,6 +118,7 @@ public synchronized void await() {
         try {
             wait();
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new CloudRuntimeException(e);
         }
     }
diff --git a/plugin/applianceVm/src/main/java/org/zstack/appliancevm/ApplianceVmConnectFlow.java b/plugin/applianceVm/src/main/java/org/zstack/appliancevm/ApplianceVmConnectFlow.java
@@ -144,6 +144,7 @@ public boolean run() {
                     logger.warn(e1.getMessage(), e1);
                     ErrorCode err = e1 instanceof OperationFailureException ? ((OperationFailureException)e1).getErrorCode() : err(ApplianceVmErrors.UNABLE_TO_START, e1.getMessage());
                     chain.fail(err);
+                    Thread.currentThread().interrupt();
                     return true;
                 }
             }
diff --git a/plugin/ceph/src/main/java/org/zstack/storage/ceph/backup/CephBackupStorageBase.java b/plugin/ceph/src/main/java/org/zstack/storage/ceph/backup/CephBackupStorageBase.java
@@ -1539,6 +1539,7 @@ public void done() {
                             TimeUnit.SECONDS.sleep(CephGlobalConfig.BACKUP_STORAGE_MON_RECONNECT_DELAY.value(Long.class));
                         } catch (InterruptedException e) {
                             e.printStackTrace();
+                            Thread.currentThread().interrupt();
                         }
                     }
 
@@ -1561,6 +1562,7 @@ public void fail(ErrorCode errorCode) {
                 } catch (Throwable t) {
                     releaseLock.done();
                     logger.warn(t.getMessage(), t);
+                    Thread.currentThread().interrupt();
                 }
             }
 
diff --git a/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageBase.java b/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageBase.java
@@ -3534,6 +3534,7 @@ public void done() {
                         try {
                             TimeUnit.SECONDS.sleep(CephGlobalConfig.PRIMARY_STORAGE_MON_RECONNECT_DELAY.value(Long.class));
                         } catch (InterruptedException ignored) {
+                            Thread.currentThread().interrupt();
                         }
                     }
 
@@ -3555,6 +3556,7 @@ public void fail(ErrorCode errorCode) {
                 } catch (Throwable t) {
                     releaseLock.done();
                     logger.warn(t.getMessage(), t);
+                    Thread.currentThread().interrupt();
                 }
             }
 
diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java b/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java
@@ -3894,6 +3894,7 @@ public void run(FlowTrigger trigger, Map data) {
                             try {
                                 TimeUnit.SECONDS.sleep(3);
                             } catch (InterruptedException e) {
+                                Thread.currentThread().interrupt();
                                 throw new RuntimeException(e.getMessage());
                             }
                             ret = sshShell.runCommand(cmd);
diff --git a/portal/src/main/java/org/zstack/portal/managementnode/ManagementNodeManagerImpl.java b/portal/src/main/java/org/zstack/portal/managementnode/ManagementNodeManagerImpl.java
@@ -626,6 +626,7 @@ public void handle(ErrorCode errCode, Map data) {
                     this.wait(TimeUnit.SECONDS.toMillis(1));
                 } catch (InterruptedException e) {
                     logger.warn("Interrupted while daemon is running, continue ...", e);
+                    Thread.currentThread().interrupt();
                 }
             }
         }
@@ -902,6 +903,7 @@ private void sleepAHeartbeatInterval() {
                 try {
                     TimeUnit.SECONDS.sleep(ManagementNodeGlobalConfig.NODE_HEARTBEAT_INTERVAL.value(Long.class));
                 } catch (InterruptedException ignored) {
+                    Thread.currentThread().interrupt();
                 }
             }
 
@@ -1090,6 +1092,7 @@ public void startNode() {
             try {
                 TimeUnit.SECONDS.sleep(1);
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 throw new CloudRuntimeException(e);
             }
         }
diff --git a/sdk/src/main/java/org/zstack/sdk/ZSClient.java b/sdk/src/main/java/org/zstack/sdk/ZSClient.java
@@ -266,6 +266,7 @@ private ApiResult syncWebHookResult() {
                 try {
                     this.wait(timeout);
                 } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                     throw new ApiException(e);
                 }
 
@@ -642,6 +643,7 @@ private ApiResult syncPollResult(String url) {
                 } catch (InterruptedException e) {
                     //ignore
                 } catch (IOException e) {
+                    Thread.currentThread().interrupt();
                     throw new ApiException(e);
                 }
             }
diff --git a/search/src/main/java/org/zstack/search/SearchFacadeImpl.java b/search/src/main/java/org/zstack/search/SearchFacadeImpl.java
@@ -135,6 +135,7 @@ public void documentsAdded(long increment) {
             logger.info(String.format("refresh search indexes success, cost %d ms", watch.getLapse()));
         } catch (Throwable e) {
             logger.warn("a unhandled exception happened", e);
+            Thread.currentThread().interrupt();
         }
     }
 
diff --git a/utils/src/main/java/org/zstack/utils/Linux.java b/utils/src/main/java/org/zstack/utils/Linux.java
@@ -61,6 +61,7 @@ public static ShellResult shell(List<String> cmd) {
             ret.setStdout(IOUtils.toString(pro.getInputStream()));
             return ret;
         } catch (Exception e) {
+            Thread.currentThread().interrupt();
             throw new RuntimeException(e);
         }
     }
diff --git a/utils/src/main/java/org/zstack/utils/ShellUtils.java b/utils/src/main/java/org/zstack/utils/ShellUtils.java
@@ -258,6 +258,7 @@ public ShellResult run() {
                 StringBuilder sb = new StringBuilder();
                 sb.append("Shell command failed:\n");
                 sb.append(command);
+                Thread.currentThread().interrupt();
                 throw new ShellException(sb.toString(), e);
             } finally {
                 if (process != null) {
diff --git a/utils/src/main/java/org/zstack/utils/TimeUtils.java b/utils/src/main/java/org/zstack/utils/TimeUtils.java
@@ -41,6 +41,7 @@ public static boolean loopExecuteUntilTimeoutIgnoreExceptionAndReturn(long perio
                 unit.sleep(interval);
             } catch (Throwable t) {
                 logger.debug(String.format("%s, after %s ms timeout", t.getMessage(), period-count));
+                Thread.currentThread().interrupt();
             }
             count += interval;
         }

Original file line number	Diff line number	Diff line change
`@@ -724,6 +724,7 @@ public void fail(ErrorCode errorCode) {`
`724`	`724`	`try {`
`725`	`725`	`TimeUnit.SECONDS.sleep(sleep);`
`726`	`726`	`} catch (InterruptedException ignored) {`
	`727`	`+ Thread.currentThread().interrupt();`
`727`	`728`	`}`
`728`	`729`	`}`
`729`	`730`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,7 @@ public void afterMigrateVm(VmInstanceInventory inv, String srcHostUuid) {`
`232`	`232`	`}`
`233`	`233`	`} catch (InterruptedException e) {`
`234`	`234`	`logger.warn(e.getMessage(), e);`
	`235`	`+ Thread.currentThread().interrupt();`
`235`	`236`	`}`
`236`	`237`	`}`
`237`	`238`
Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ private void retry(Message msg) {`
`158`	`158`	`TimeUnit.SECONDS.sleep(CloudBusGlobalProperty.RABBITMQ_RETRY_DELAY_ON_RETURN);`
`159`	`159`	`} catch (InterruptedException e) {`
`160`	`160`	`logger.warn(e.getMessage(), e);`
	`161`	`+ Thread.currentThread().interrupt();`
`161`	`162`	`}`
`162`	`163`
`163`	`164`	`if (msg instanceof Event) {`
`@@ -213,6 +214,7 @@ Channel acquire() {`
`213`	`214`	`DebugUtils.Assert(chan!=null, String.format("cannot get a channel after 10 minutes"));`
`214`	`215`	`return chan;`
`215`	`216`	`} catch (InterruptedException e) {`
	`217`	`+ Thread.currentThread().interrupt();`
`216`	`218`	`throw new CloudRuntimeException(e);`
`217`	`219`	`}`
`218`	`220`	`}`
`@@ -477,6 +479,7 @@ private boolean recoverSend() throws IOException {`
`477`	`479`	`TimeUnit.SECONDS.sleep(interval);`
`478`	`480`	`} catch (InterruptedException e1) {`
`479`	`481`	`logger.warn(e1.getMessage());`
	`482`	`+ Thread.currentThread().interrupt();`
`480`	`483`	`}`
`481`	`484`
`482`	`485`	`try {`
`@@ -1833,6 +1836,7 @@ List<Message> getRequests() {`
`1833`	`1836`	`try {`
`1834`	`1837`	`e.wait(msg.getTimeout());`
`1835`	`1838`	`} catch (InterruptedException e1) {`
	`1839`	`+ Thread.currentThread().interrupt();`
`1836`	`1840`	`throw new CloudRuntimeException(e1);`
`1837`	`1841`	`}`
`1838`	`1842`	`}`
`@@ -1929,6 +1933,7 @@ List<Message> getRequests() {`
`1929`	`1933`	`try {`
`1930`	`1934`	`e.wait(minTimeout);`
`1931`	`1935`	`} catch (InterruptedException e1) {`
	`1936`	`+ Thread.currentThread().interrupt();`
`1932`	`1937`	`throw new CloudRuntimeException(e1);`
`1933`	`1938`	`}`
`1934`	`1939`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public static boolean waitDBConnected(int retryTimes, int interval) {`
`43`	`43`	`private static void sleep(int seconds) {`
`44`	`44`	`try {`
`45`	`45`	`TimeUnit.SECONDS.sleep(seconds);`
`46`		`- } catch (InterruptedException ignore) {}`
	`46`	`+ } catch (InterruptedException ignore) {`
	`47`	`+ Thread.currentThread().interrupt();`
	`48`	`+ }`
`47`	`49`	`}`
`48`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ public T run() {`
`88`	`88`	`TimeUnit.SECONDS.sleep(interval);`
`89`	`89`	`} catch (InterruptedException e) {`
`90`	`90`	`logger.warn(e.getMessage(), e);`
	`91`	`+ Thread.currentThread().interrupt();`
`91`	`92`	`}`
`92`	`93`
`93`	`94`
Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,7 @@ public void success() {`
`288`	`288`	`try {`
`289`	`289`	`TimeUnit.SECONDS.sleep(interval);`
`290`	`290`	`} catch (InterruptedException e) {`
	`291`	`+ Thread.currentThread().interrupt();`
`291`	`292`	`throw new CloudRuntimeException(e);`
`292`	`293`	`}`
`293`	`294`	`}`
`@@ -302,6 +303,7 @@ public void success() {`
`302`	`303`	`} catch (Exception e) {`
`303`	`304`	`logger.warn(String.format("failed to run salt state[%s] on system[%s], %s", stateName, targetIp, e.getMessage()));`
`304`	`305`	`completion.fail(operr(e.getMessage()));`
	`306`	`+ Thread.currentThread().interrupt();`
`305`	`307`	`}`
`306`	`308`	`}`
`307`	`309`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ private void doWait(long timeout) {`
`83`	`83`	`try {`
`84`	`84`	`wait(timeout);`
`85`	`85`	`} catch (InterruptedException e) {`
	`86`	`+ Thread.currentThread().interrupt();`
`86`	`87`	`throw new CloudRuntimeException(e);`
`87`	`88`	`}`
`88`	`89`	`}`
`@@ -95,6 +96,7 @@ public synchronized void await() {`
`95`	`96`	`try {`
`96`	`97`	`wait();`
`97`	`98`	`} catch (InterruptedException e) {`
	`99`	`+ Thread.currentThread().interrupt();`
`98`	`100`	`throw new CloudRuntimeException(e);`
`99`	`101`	`}`
`100`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ private void dumpSlowFuture() {`
`54`	`54`	`try {`
`55`	`55`	`wait(SLOW_FUTURE_TIMEOUT);`
`56`	`56`	`} catch (InterruptedException e) {`
	`57`	`+ Thread.currentThread().interrupt();`
`57`	`58`	`throw new CloudRuntimeException(e);`
`58`	`59`	`}`
`59`	`60`
`@@ -75,6 +76,7 @@ private void dumpSlowFuture() {`
`75`	`76`	`}`
`76`	`77`	`} catch (Exception e) {`
`77`	`78`	`logger.warn(String.format("dumpSlowFuture get exception %s %s", e.getMessage(), e.toString()));`
	`79`	`+ Thread.currentThread().interrupt();`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`
`@@ -95,6 +97,7 @@ public synchronized void await(long timeout) {`
`95`	`97`	`try {`
`96`	`98`	`wait(timeout);`
`97`	`99`	`} catch (InterruptedException e) {`
	`100`	`+ Thread.currentThread().interrupt();`
`98`	`101`	`throw new CloudRuntimeException(e);`
`99`	`102`	`}`
`100`	`103`
`@@ -115,6 +118,7 @@ public synchronized void await() {`
`115`	`118`	`try {`
`116`	`119`	`wait();`
`117`	`120`	`} catch (InterruptedException e) {`
	`121`	`+ Thread.currentThread().interrupt();`
`118`	`122`	`throw new CloudRuntimeException(e);`
`119`	`123`	`}`
`120`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ public boolean run() {`
`144`	`144`	`logger.warn(e1.getMessage(), e1);`
`145`	`145`	`ErrorCode err = e1 instanceof OperationFailureException ? ((OperationFailureException)e1).getErrorCode() : err(ApplianceVmErrors.UNABLE_TO_START, e1.getMessage());`
`146`	`146`	`chain.fail(err);`
	`147`	`+ Thread.currentThread().interrupt();`
`147`	`148`	`return true;`
`148`	`149`	`}`
`149`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1539,6 +1539,7 @@ public void done() {`
`1539`	`1539`	`TimeUnit.SECONDS.sleep(CephGlobalConfig.BACKUP_STORAGE_MON_RECONNECT_DELAY.value(Long.class));`
`1540`	`1540`	`} catch (InterruptedException e) {`
`1541`	`1541`	`e.printStackTrace();`
	`1542`	`+ Thread.currentThread().interrupt();`
`1542`	`1543`	`}`
`1543`	`1544`	`}`
`1544`	`1545`
`@@ -1561,6 +1562,7 @@ public void fail(ErrorCode errorCode) {`
`1561`	`1562`	`} catch (Throwable t) {`
`1562`	`1563`	`releaseLock.done();`
`1563`	`1564`	`logger.warn(t.getMessage(), t);`
	`1565`	`+ Thread.currentThread().interrupt();`
`1564`	`1566`	`}`
`1565`	`1567`	`}`
`1566`	`1568`