diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java index 55bb3d336c..ea458c9764 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java @@ -149,6 +149,7 @@ public class ZooKeeperState { return sendThread.ret; } catch (InterruptedException e) { logger.error("send " + cmd + " to server " + host + ":" + port + " failed!", e); + Thread.currentThread().interrupt(); } return ""; } diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java index 96fbe4cec1..5189097e68 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java @@ -74,7 +74,8 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { .andReturn(); Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class); - Assert.assertEquals(Status.PROJECT_NOT_FOUNT,result.getCode().intValue()); + assert result != null; + Assert.assertEquals(Status.PROJECT_NOT_FOUNT.getCode(),result.getCode().intValue()); logger.info(mvcResult.getResponse().getContentAsString()); } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java index aafdb86014..9a24fdb407 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java @@ -78,7 +78,7 @@ public abstract class AbstractShell { /** * If or not script finished executing */ - private volatile AtomicBoolean completed; + private AtomicBoolean completed; public AbstractShell() { this(0L); @@ -202,7 +202,7 @@ public abstract class AbstractShell { } catch (InterruptedException ie) { logger.warn("Interrupted while reading the error and in stream", ie); } - completed.set(true); + completed.compareAndSet(false,true); //the timeout thread handling //taken care in finally block if (exitCode != 0 || errMsg.length() > 0) { diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java index a9a124547a..7d47ffe738 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java @@ -231,6 +231,8 @@ public class ThreadUtils { public static void sleep(final long millis) { try { Thread.sleep(millis); - } catch (final InterruptedException ignore) {} + } catch (final InterruptedException ignore) { + Thread.currentThread().interrupt(); + } } } diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/PropertyUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/PropertyUtilsTest.java index 2b9b0b54fd..eb43b40163 100644 --- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/PropertyUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/PropertyUtilsTest.java @@ -17,6 +17,7 @@ package org.apache.dolphinscheduler.common.utils; import org.apache.dolphinscheduler.common.Constants; +import org.junit.Assert; import org.junit.Test; import static org.junit.Assert.assertNotNull; @@ -26,6 +27,5 @@ public class PropertyUtilsTest { @Test public void getString() { assertNotNull(PropertyUtils.getString(Constants.FS_DEFAULTFS)); - assertNotNull(PropertyUtils.getInt("spring.redis.port")); } } \ No newline at end of file diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapperTest.java index c16ece7e85..0c1dc20ac9 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapperTest.java @@ -63,7 +63,6 @@ public class AccessTokenMapperTest { Integer userId = 1; AccessToken accessToken = createAccessToken(userId); - assertNotNull(accessToken.getId()); assertThat(accessToken.getId(), greaterThan(0)); } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java index 4e298e3aa3..064305d33b 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java @@ -54,7 +54,6 @@ public class AlertMapperTest { @Test public void testInsert(){ Alert expectedAlert = createAlert(); - assertNotNull(expectedAlert.getId()); assertThat(expectedAlert.getId(), greaterThan(0)); } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java index 297ea66c94..a64ab711ad 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java @@ -62,7 +62,6 @@ public class CommandMapperTest { @Test public void testInsert(){ Command command = createCommand(); - assertNotNull(command.getId()); assertThat(command.getId(),greaterThan(0)); } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java index 92df6cc45c..04d726e357 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java @@ -71,7 +71,6 @@ public class DataSourceMapperTest { @Test public void testInsert(){ DataSource dataSource = createDataSource(); - assertNotNull(dataSource.getId()); assertThat(dataSource.getId(), greaterThan(0)); } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java index 3bfed64553..c5bd626f9f 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java @@ -132,7 +132,7 @@ public class ProcessInstanceMapperTest { processInstanceMapper.updateById(processInstance); ProcessInstance processInstance1 = processInstanceMapper.queryDetailById(processInstance.getId()); - Assert.assertNotEquals(processInstance1, 50); + Assert.assertNotNull(processInstance1); processInstanceMapper.deleteById(processInstance.getId()); } diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseService.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseService.java index b9772ca523..7abb31b31c 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseService.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseService.java @@ -89,6 +89,7 @@ public class TaskResponseService { eventQueue.put(taskResponseEvent); } catch (InterruptedException e) { logger.error("put task : {} error :{}", taskResponseEvent,e); + Thread.currentThread().interrupt(); } } diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java index 2a8e411c33..5be6050f87 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java @@ -1026,6 +1026,7 @@ public class MasterExecThread implements Runnable { Thread.sleep(Constants.SLEEP_TIME_MILLIS); } catch (InterruptedException e) { logger.error(e.getMessage(),e); + Thread.currentThread().interrupt(); } updateProcessInstanceState(); } diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java index 712f882e19..30dd0f9f12 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java @@ -97,7 +97,7 @@ public class MasterSchedulerService extends Thread { } @Override - public void start(){ + public synchronized void start(){ super.setName("MasterSchedulerService"); super.start(); } @@ -107,7 +107,9 @@ public class MasterSchedulerService extends Thread { boolean terminated = false; try { terminated = masterExecService.awaitTermination(5, TimeUnit.SECONDS); - } catch (InterruptedException ignore) {} + } catch (InterruptedException ignore) { + Thread.currentThread().interrupt(); + } if(!terminated){ logger.warn("masterExecService shutdown without terminated, increase await time"); } diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log/LogPromise.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log/LogPromise.java index 98ee3fdbbf..016176764f 100644 --- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log/LogPromise.java +++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log/LogPromise.java @@ -100,6 +100,7 @@ public class LogPromise { try { latch.await(timeout, TimeUnit.MILLISECONDS); } catch (InterruptedException ignore) { + Thread.currentThread().interrupt(); } PROMISES.remove(opaque); return this.result; diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperCachedOperator.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperCachedOperator.java index 3fa47f848c..4fe941503e 100644 --- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperCachedOperator.java +++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperCachedOperator.java @@ -83,6 +83,7 @@ public class ZookeeperCachedOperator extends ZookeeperOperator { try { Thread.sleep(500); } catch (InterruptedException ignore) { + Thread.currentThread().interrupt(); } super.close(); }