This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new b5ed34895 [INLONG-3716][Manager] Optimize the manager plugin
dependency (#3717)
b5ed34895 is described below
commit b5ed34895d422fe2a02a0d89184778b1488220a5
Author: dockerzhang <[email protected]>
AuthorDate: Fri Apr 15 09:27:48 2022 +0800
[INLONG-3716][Manager] Optimize the manager plugin dependency (#3717)
---
inlong-audit/bin/proxy-start.sh | 2 +-
inlong-dataproxy/bin/dataproxy-start.sh | 2 +-
inlong-manager/manager-plugins/pom.xml | 59 ----------------------
.../manager/plugin/flink/ManagerFlinkTask.java | 1 +
.../inlong/manager/plugin/util/FlinkUtils.java | 5 +-
.../service/source/SourceSnapshotOperation.java | 8 ++-
inlong-manager/manager-web/pom.xml | 5 ++
pom.xml | 5 --
8 files changed, 17 insertions(+), 70 deletions(-)
diff --git a/inlong-audit/bin/proxy-start.sh b/inlong-audit/bin/proxy-start.sh
index b3bc3d0a7..3cb1c1295 100644
--- a/inlong-audit/bin/proxy-start.sh
+++ b/inlong-audit/bin/proxy-start.sh
@@ -54,7 +54,7 @@ if [ ! -d "${LOG_DIR}" ]; then
mkdir ${LOG_DIR}
fi
if [ -f "$CONFIG_FILE_WITH_PATH" ]; then
- nohup bin/audit-proxy agent --conf conf/ -f
"${CONFIG_FILE_WITH_COFING_PATH}" -n agent1 --no-reload-conf
1>${LOG_DIR}/proxy.log 2>${LOG_DIR}/proxy-error.log &
+ nohup bash +x bin/audit-proxy agent --conf conf/ -f
"${CONFIG_FILE_WITH_COFING_PATH}" -n agent1 --no-reload-conf
1>${LOG_DIR}/proxy.log 2>${LOG_DIR}/proxy-error.log &
else
error "${CONFIG_FILE_WITH_PATH} is not exist! start failed!" 1
fi
diff --git a/inlong-dataproxy/bin/dataproxy-start.sh
b/inlong-dataproxy/bin/dataproxy-start.sh
index 71b582923..fcf02a9d1 100755
--- a/inlong-dataproxy/bin/dataproxy-start.sh
+++ b/inlong-dataproxy/bin/dataproxy-start.sh
@@ -51,7 +51,7 @@ CONFIG_FILE_WITH_COFING_PATH="conf/${CONFIG_FILE}"
CONFIG_FILE_WITH_PATH="${basedir}/${CONFIG_FILE}"
if [ -f "$CONFIG_FILE_WITH_PATH" ]; then
- nohup bin/dataproxy-ng agent --conf conf/ -f
"${CONFIG_FILE_WITH_COFING_PATH}" -n agent1 --no-reload-conf > /dev/null 2>&1 &
+ nohup bash +x bin/dataproxy-ng agent --conf conf/ -f
"${CONFIG_FILE_WITH_COFING_PATH}" -n agent1 --no-reload-conf > /dev/null 2>&1 &
else
error "${CONFIG_FILE_WITH_PATH} is not exist! start failed!" 1
fi
\ No newline at end of file
diff --git a/inlong-manager/manager-plugins/pom.xml
b/inlong-manager/manager-plugins/pom.xml
index 935984174..6bf990212 100644
--- a/inlong-manager/manager-plugins/pom.xml
+++ b/inlong-manager/manager-plugins/pom.xml
@@ -51,10 +51,6 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients_2.11</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -67,62 +63,7 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>META-INF/*</include>
- <include>flink-sort-plugin.properties</include>
- </includes>
- </resource>
- </resources>
- <finalName>manager-plugins</finalName>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>${project.build.encoding}</encoding>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- <annotationProcessorPaths>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- <version>${plugin.compile.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
-
<shadedArtifactAttached>false</shadedArtifactAttached>
-
<finalName>${project.artifactId}-${project.version}</finalName>
- <filters>>
- <filter>
- <artifact>*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
diff --git
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/ManagerFlinkTask.java
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/ManagerFlinkTask.java
index 1ddbe1523..4b9fcdc69 100644
---
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/ManagerFlinkTask.java
+++
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/flink/ManagerFlinkTask.java
@@ -88,6 +88,7 @@ public class ManagerFlinkTask {
}
/**
+ * genPath
* @param flinkInfo
* @param dataflow
*/
diff --git
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/util/FlinkUtils.java
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/util/FlinkUtils.java
index 7b0384e44..7e3654fd8 100644
---
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/util/FlinkUtils.java
+++
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/util/FlinkUtils.java
@@ -38,11 +38,10 @@ import java.util.regex.Pattern;
public class FlinkUtils {
public static final String BASE_DIRECTORY = "config";
- /**
- */
public static final List<String> FLINK_VERSION_COLLECTION =
Arrays.asList("Flink-1.13");
/**
+ * getLatestFlinkVersion
* @param supportedFlink
* @return
*/
@@ -116,6 +115,7 @@ public class FlinkUtils {
}
/**
+ * getConfigDirectory
* @param name
* @return
*/
@@ -124,6 +124,7 @@ public class FlinkUtils {
}
/**
+ * writeConfigToFile
* @param configJobDirectory
* @param configFileName
* @param content
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/SourceSnapshotOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/SourceSnapshotOperation.java
index 265650ed2..f850b7719 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/SourceSnapshotOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/SourceSnapshotOperation.java
@@ -116,10 +116,14 @@ public class SourceSnapshotOperation implements
AutoCloseable {
String agentIp = request.getAgentIp();
List<TaskSnapshotMessage> snapshotList = request.getSnapshotList();
if (CollectionUtils.isEmpty(snapshotList)) {
- LOGGER.info("receive snapshot from ip={}, but snapshot list is
empty", agentIp);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.info("receive snapshot from ip={}, but snapshot list is
empty", agentIp);
+ }
return true;
}
- LOGGER.debug("receive snapshot from ip={}, msg size={}", agentIp,
snapshotList.size());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("receive snapshot from ip={}, msg size={}", agentIp,
snapshotList.size());
+ }
try {
// Offer the request of snapshot to the queue, and another thread
will parse the data in the queue.
diff --git a/inlong-manager/manager-web/pom.xml
b/inlong-manager/manager-web/pom.xml
index 602bd1f23..7dbca030d 100644
--- a/inlong-manager/manager-web/pom.xml
+++ b/inlong-manager/manager-web/pom.xml
@@ -46,6 +46,11 @@
<artifactId>manager-client-tools</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>manager-plugins</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
diff --git a/pom.xml b/pom.xml
index c42a6201c..e5f893603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -580,11 +580,6 @@
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
