diff --git a/pom.xml b/pom.xml index ff467a57c27..a1f57e0c3a6 100644 --- a/pom.xml +++ b/pom.xml @@ -39,27 +39,28 @@ - 2.19.0 - 1.7 - 1.7 + 2.22.1 + 1.7.35 + 1.8 + 1.8 2.7.3 1.6.1 4.13 - 2.11.8 + 2.11.12 2.11 1.8.5 1.19.1 1.46 2.5.0 2.5.3 - 2.3.12 + 2.5.32 1.2.1 1.1.3 4.3.9.RELEASE 4.6 - 3.7.8 + 3.12.13 15.0 - 2.2 + 2.10.1 ${project.build.directory}/test-dir true 1.0.1 @@ -123,6 +124,7 @@ 3.2.4 27.0-jre + 9.4.43.v20210629 @@ -355,6 +357,14 @@ org.slf4j slf4j-log4j12 + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -410,6 +420,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -445,6 +463,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -458,6 +484,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + diff --git a/smart-agent/src/main/java/org/smartdata/agent/SmartAgent.java b/smart-agent/src/main/java/org/smartdata/agent/SmartAgent.java index bd30eda1938..dcfab573096 100644 --- a/smart-agent/src/main/java/org/smartdata/agent/SmartAgent.java +++ b/smart-agent/src/main/java/org/smartdata/agent/SmartAgent.java @@ -66,6 +66,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import scala.concurrent.Await; import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; @@ -172,14 +173,18 @@ public void run() { executorService.scheduleAtFixedRate( statusReportTask, 1000, reportPeriod, TimeUnit.MILLISECONDS); - system.awaitTermination(); + try { + Await.result(system.whenTerminated(), Duration.Inf()); + } catch (Exception e) { + LOG.error("Failure during actor system runtime.", e); + } } public void shutdown() { Services.stop(); - if (system != null && !system.isTerminated()) { + if (system != null && !system.whenTerminated().isCompleted()) { LOG.info("Shutting down system {}", AgentUtils.getSystemAddres(system)); - system.shutdown(); + system.terminate(); } } diff --git a/smart-common/pom.xml b/smart-common/pom.xml index 95b8f012dc7..17d882d75f0 100644 --- a/smart-common/pom.xml +++ b/smart-common/pom.xml @@ -60,6 +60,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + diff --git a/smart-engine/pom.xml b/smart-engine/pom.xml index ea259c36150..49ff4dae479 100644 --- a/smart-engine/pom.xml +++ b/smart-engine/pom.xml @@ -51,6 +51,14 @@ commons-configuration commons-configuration + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -218,11 +226,31 @@ org.smartdata smart-hadoop-3.2 1.6.0-SNAPSHOT + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + org.smartdata smart-hadoop-client-3.2 1.6.0-SNAPSHOT + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + diff --git a/smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/agent/AgentMaster.java b/smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/agent/AgentMaster.java index 08294fed593..27ab3db1140 100644 --- a/smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/agent/AgentMaster.java +++ b/smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/agent/AgentMaster.java @@ -125,7 +125,7 @@ public void stopCmdlet(long cmdletId) { } public void shutdown() { - if (system != null && !system.isTerminated()) { + if (system != null && !system.whenTerminated().isCompleted()) { if (master != null && !master.isTerminated()) { LOG.info("Shutting down master {}...", AgentUtils.getFullPath(system, master.path())); @@ -134,7 +134,7 @@ public void shutdown() { LOG.info("Shutting down system {}...", AgentUtils.getSystemAddres(system)); - system.shutdown(); + system.terminate(); } } @@ -193,7 +193,11 @@ public void run() { } } }); - system.awaitTermination(); + try { + Await.result(system.whenTerminated(), Duration.Inf()); + } catch (Exception e) { + LOG.error("Failure during actor system runtime.", e); + } } } diff --git a/smart-engine/src/test/java/org/smartdata/server/engine/cmdlet/agent/ActorSystemHarness.java b/smart-engine/src/test/java/org/smartdata/server/engine/cmdlet/agent/ActorSystemHarness.java index fd996fd9738..74ab5795a26 100644 --- a/smart-engine/src/test/java/org/smartdata/server/engine/cmdlet/agent/ActorSystemHarness.java +++ b/smart-engine/src/test/java/org/smartdata/server/engine/cmdlet/agent/ActorSystemHarness.java @@ -33,7 +33,7 @@ public void startActorSystem() { @After public void stopActorSystem() { - system.shutdown(); + system.terminate(); } public ActorSystem getActorSystem() { diff --git a/smart-hadoop-support/smart-hadoop-3.2/pom.xml b/smart-hadoop-support/smart-hadoop-3.2/pom.xml index d4bbea7545a..ff51a6db051 100644 --- a/smart-hadoop-support/smart-hadoop-3.2/pom.xml +++ b/smart-hadoop-support/smart-hadoop-3.2/pom.xml @@ -57,6 +57,14 @@ org.eclipse.jetty jetty-util-ajax + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -79,6 +87,16 @@ org.apache.hadoop hadoop-aws ${hadoop.version} + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop diff --git a/smart-hadoop-support/smart-hadoop-3/pom.xml b/smart-hadoop-support/smart-hadoop-3/pom.xml index 1f1c76186bd..8a6cafc89aa 100644 --- a/smart-hadoop-support/smart-hadoop-3/pom.xml +++ b/smart-hadoop-support/smart-hadoop-3/pom.xml @@ -53,6 +53,14 @@ org.eclipse.jetty jetty-util-ajax + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -70,6 +78,16 @@ org.apache.hadoop hadoop-aws ${hadoop.version} + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + diff --git a/smart-hadoop-support/smart-hadoop-common/pom.xml b/smart-hadoop-support/smart-hadoop-common/pom.xml index 1ace6594c0a..a5bce9241ee 100644 --- a/smart-hadoop-support/smart-hadoop-common/pom.xml +++ b/smart-hadoop-support/smart-hadoop-common/pom.xml @@ -58,12 +58,30 @@ org.eclipse.jetty jetty-util-ajax + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + org.apache.hadoop hadoop-common ${hadoop.version} + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop diff --git a/smart-hadoop-support/smart-hadoop/pom.xml b/smart-hadoop-support/smart-hadoop/pom.xml index ed937eec6ec..814d73372ac 100644 --- a/smart-hadoop-support/smart-hadoop/pom.xml +++ b/smart-hadoop-support/smart-hadoop/pom.xml @@ -157,12 +157,30 @@ org.eclipse.jetty jetty-util-ajax + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + org.apache.hadoop hadoop-distcp ${hadoop.version} + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop @@ -177,12 +195,30 @@ org.codehaus.jackson jackson-mapper-asl + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + org.apache.hadoop hadoop-mapreduce-client-jobclient ${hadoop.version} + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + com.squareup diff --git a/smart-hadoop-support/smart-inputstream/pom.xml b/smart-hadoop-support/smart-inputstream/pom.xml index 47e317bc5d0..76fdf708880 100644 --- a/smart-hadoop-support/smart-inputstream/pom.xml +++ b/smart-hadoop-support/smart-inputstream/pom.xml @@ -91,6 +91,16 @@ org.apache.hadoop hadoop-hdfs ${hadoop.version} + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + diff --git a/smart-metrics/pom.xml b/smart-metrics/pom.xml index c16da007bd2..fa05ae1154c 100644 --- a/smart-metrics/pom.xml +++ b/smart-metrics/pom.xml @@ -51,6 +51,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + diff --git a/smart-server/pom.xml b/smart-server/pom.xml index f1cefe6da23..c1aea145ef1 100644 --- a/smart-server/pom.xml +++ b/smart-server/pom.xml @@ -90,7 +90,7 @@ org.slf4j slf4j-api - 1.7.25 + ${slf4j-api.version} com.squareup @@ -304,6 +304,11 @@ test test-jar + + org.eclipse.jetty + jetty-http + ${jetty.version} + diff --git a/smart-zeppelin/zeppelin-web/pom.xml b/smart-zeppelin/zeppelin-web/pom.xml index a286046508b..70ae05f8dcd 100644 --- a/smart-zeppelin/zeppelin-web/pom.xml +++ b/smart-zeppelin/zeppelin-web/pom.xml @@ -39,7 +39,7 @@ - v12.0.0 + v16.20.2 v0.27.5 4.2.0 UTF-8