This is an automated email from the ASF dual-hosted git repository.

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f1676ee3 Resolve the problem which Sonar reported that 
InterruptedException need to re-throw or re-interrupt (#862)
3f1676ee3 is described below

commit 3f1676ee3edbfd43fe2319d017cc0c7f50810882
Author: wgcn <[email protected]>
AuthorDate: Mon Apr 10 15:24:03 2023 +0800

    Resolve the problem which Sonar reported that InterruptedException need to 
re-throw or re-interrupt (#862)
---
 .../java/org/apache/paimon/benchmark/QueryRunner.java    |  3 ++-
 .../apache/paimon/benchmark/metric/FlinkRestClient.java  | 16 ++++------------
 .../apache/paimon/benchmark/metric/MetricReporter.java   |  3 ++-
 .../java/org/apache/paimon/utils/SnapshotManager.java    |  1 +
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git 
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/QueryRunner.java
 
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/QueryRunner.java
index 2785c42a6..b07cdef84 100644
--- 
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/QueryRunner.java
+++ 
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/QueryRunner.java
@@ -123,7 +123,8 @@ public class QueryRunner {
                             + BenchmarkUtils.formatLongValue((long) scanRps));
 
             return new Result(writeMetric, scanRps);
-        } catch (IOException e) {
+        } catch (IOException | InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new RuntimeException(e);
         }
     }
diff --git 
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/FlinkRestClient.java
 
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/FlinkRestClient.java
index d89d1d622..85dfe8c14 100644
--- 
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/FlinkRestClient.java
+++ 
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/FlinkRestClient.java
@@ -107,22 +107,18 @@ public class FlinkRestClient {
         }
     }
 
-    public void waitUntilNumberOfRows(String jobId, long numberOfRows) {
+    public void waitUntilNumberOfRows(String jobId, long numberOfRows) throws 
InterruptedException {
         while (true) {
             String sourceVertexId = getSourceVertexId(jobId);
             double actualNumRecords = getTotalNumRecords(jobId, 
sourceVertexId);
             if (actualNumRecords >= numberOfRows) {
                 return;
             }
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                // ignore
-            }
+            Thread.sleep(1000);
         }
     }
 
-    public long waitUntilJobFinished(String jobId) {
+    public long waitUntilJobFinished(String jobId) throws InterruptedException 
{
         while (true) {
             String url = String.format("http://%s/jobs/%s";, jmEndpoint, jobId);
             String response = executeAsString(url);
@@ -136,11 +132,7 @@ public class FlinkRestClient {
                 throw new RuntimeException(
                         "The response is not a valid JSON string:\n" + 
response, e);
             }
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                // ignore
-            }
+            Thread.sleep(1000);
         }
     }
 
diff --git 
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/MetricReporter.java
 
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/MetricReporter.java
index 8b9788c29..757d3c345 100644
--- 
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/MetricReporter.java
+++ 
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/metric/MetricReporter.java
@@ -76,6 +76,7 @@ public class MetricReporter {
             try {
                 Thread.sleep(100L);
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 throw new RuntimeException(e);
             }
             if (error != null) {
@@ -84,7 +85,7 @@ public class MetricReporter {
         }
     }
 
-    public JobBenchmarkMetric reportMetric(String name, String jobId) {
+    public JobBenchmarkMetric reportMetric(String name, String jobId) throws 
InterruptedException {
         System.out.printf("Monitor metrics after %s seconds.%n", 
monitorDelay.getSeconds());
         waitFor(monitorDelay);
 
diff --git 
a/paimon-core/src/main/java/org/apache/paimon/utils/SnapshotManager.java 
b/paimon-core/src/main/java/org/apache/paimon/utils/SnapshotManager.java
index afce751cd..1ef5d8a26 100644
--- a/paimon-core/src/main/java/org/apache/paimon/utils/SnapshotManager.java
+++ b/paimon-core/src/main/java/org/apache/paimon/utils/SnapshotManager.java
@@ -239,6 +239,7 @@ public class SnapshotManager implements Serializable {
             try {
                 TimeUnit.MILLISECONDS.sleep(READ_HINT_RETRY_INTERVAL);
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 throw new RuntimeException(e);
             }
         }

Reply via email to