You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/07/08 10:46:45 UTC
[incubator-inlong] branch master updated: [INLONG-681] modify
assembly in agent proxy tubemanager (#520)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang 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 0ed0549 [INLONG-681] modify assembly in agent proxy tubemanager (#520)
0ed0549 is described below
commit 0ed0549582919c2506bfae79cebd68b7b152ad71
Author: ziruipeng <zp...@connect.ust.hk>
AuthorDate: Thu Jul 8 18:46:38 2021 +0800
[INLONG-681] modify assembly in agent proxy tubemanager (#520)
Co-authored-by: stingpeng <st...@tencent.com>
---
inlong-agent/agent-release/package.xml | 11 ++---
inlong-agent/agent-release/pom.xml | 7 ++--
inlong-agent/conf/agent.properties | 2 +-
.../dataproxy/utils/ServiceDiscoveryUtils.java | 3 +-
inlong-dataproxy/dataproxy-dist/pom.xml | 6 +--
.../dataproxy-dist/src/main/assembly/bin.xml | 8 ++--
inlong-tubemq/tubemq-manager/READMe.md | 49 ----------------------
inlong-tubemq/tubemq-manager/pom.xml | 2 +-
.../tubemq-manager/src/main/assembly/assembly.xml | 2 +-
9 files changed, 22 insertions(+), 68 deletions(-)
diff --git a/inlong-agent/agent-release/package.xml b/inlong-agent/agent-release/package.xml
index c2e5581..74151a7 100644
--- a/inlong-agent/agent-release/package.xml
+++ b/inlong-agent/agent-release/package.xml
@@ -17,15 +17,16 @@
under the License.
-->
<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<formats>
- <format>tar.gz</format>
<format>dir</format>
+ <format>tar.gz</format>
</formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<!-- for bin -->
<fileSet>
diff --git a/inlong-agent/agent-release/pom.xml b/inlong-agent/agent-release/pom.xml
index 309861b..55db0c5 100644
--- a/inlong-agent/agent-release/pom.xml
+++ b/inlong-agent/agent-release/pom.xml
@@ -18,8 +18,8 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-agent</artifactId>
@@ -61,10 +61,11 @@
<goal>single</goal>
</goals>
<configuration>
+ <finalName>apache-inlong-agent-${project.version}</finalName>
<descriptors>
<descriptor>package.xml</descriptor>
</descriptors>
- <finalName>apache-inlong-agent-${project.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
diff --git a/inlong-agent/conf/agent.properties b/inlong-agent/conf/agent.properties
index 666b53a..63549bf 100755
--- a/inlong-agent/conf/agent.properties
+++ b/inlong-agent/conf/agent.properties
@@ -42,7 +42,7 @@ agent.http.port=8008
######################
# fetch interval(s)
agent.fetchCenter.interval=5
-agent.fetcher.classname=
+agent.fetcher.classname=org.apache.inlong.agent.plugin.fetcher.ManagerFetcher
#######################
diff --git a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/utils/ServiceDiscoveryUtils.java b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/utils/ServiceDiscoveryUtils.java
index 141c17f..702116c 100644
--- a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/utils/ServiceDiscoveryUtils.java
+++ b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/utils/ServiceDiscoveryUtils.java
@@ -229,7 +229,8 @@ public class ServiceDiscoveryUtils {
try {
File managerIpListFile = new File(managerIpLocalPath);
if (!managerIpListFile.exists()) {
- log.error("ServiceDiscovery no found local bidInfo file, path is [" + managerIpLocalPath + "].");
+ log.info("ServiceDiscovery no found local bidInfo file, "
+ + "doesn't matter, path is [" + managerIpLocalPath + "].");
return null;
}
byte[] serialized;
diff --git a/inlong-dataproxy/dataproxy-dist/pom.xml b/inlong-dataproxy/dataproxy-dist/pom.xml
index 04ac5f7..ef27d4f 100644
--- a/inlong-dataproxy/dataproxy-dist/pom.xml
+++ b/inlong-dataproxy/dataproxy-dist/pom.xml
@@ -17,8 +17,8 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-dataproxy</artifactId>
@@ -57,7 +57,7 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>apache-inlong-proxy-${project.version}</finalName>
+ <finalName>apache-inlong-dataproxy-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors>
diff --git a/inlong-dataproxy/dataproxy-dist/src/main/assembly/bin.xml b/inlong-dataproxy/dataproxy-dist/src/main/assembly/bin.xml
index 1aaf745..b3ff5c9 100644
--- a/inlong-dataproxy/dataproxy-dist/src/main/assembly/bin.xml
+++ b/inlong-dataproxy/dataproxy-dist/src/main/assembly/bin.xml
@@ -18,9 +18,9 @@
-->
<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>bin</id>
@@ -29,7 +29,7 @@
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-inlong-proxy-${project.version}-bin</baseDirectory>
+ <baseDirectory>apache-inlong-dataproxy-${project.version}-bin</baseDirectory>
<dependencySets>
<dependencySet>
diff --git a/inlong-tubemq/tubemq-manager/READMe.md b/inlong-tubemq/tubemq-manager/READMe.md
deleted file mode 100644
index 7020a4c..0000000
--- a/inlong-tubemq/tubemq-manager/READMe.md
+++ /dev/null
@@ -1,49 +0,0 @@
-License
-=======
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you
-under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
-language governing permissions and limitations under the License.
-
-# introduction
-
-tube-admin is used to manage multiple tubemq cluster. It works with tubemq-web project. tube-admin provide restful api
-and tubemq-web use them to provide front-end web pages. This page is going to introduce how to set up tubemq-admin
-environment.
-
-# build
-
-```shell script
-mvn clean package
-```
-
-# distribution
-
-env requirements:
-
-1. mysql
-2. java(1.8+)
-
-In the dist directory, you can find a installable file called `tubemq-manager-bin.zip`. Unzip it and add mysql address
-configuration in `conf/application.properties`
-
-```properties
-spring.jpa.hibernate.ddl-auto=update
-# configuration for manager
-spring.datasource.url=jdbc:mysql://x.x.x.x:3306/tubeAdmin
-spring.datasource.username=xx
-spring.datasource.password=xxx
-```
-
-Then setup mysql database called `tubeadmin`, start this project by this command
-
-```shell script
-bin/start-admin.sh
-```
diff --git a/inlong-tubemq/tubemq-manager/pom.xml b/inlong-tubemq/tubemq-manager/pom.xml
index a30dc05..2ee2824 100644
--- a/inlong-tubemq/tubemq-manager/pom.xml
+++ b/inlong-tubemq/tubemq-manager/pom.xml
@@ -167,7 +167,7 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>${project.artifactId}</finalName>
+ <finalName>apache-inlong-tubemanager-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
diff --git a/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml b/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
index c6d38aa..11675f9 100644
--- a/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
+++ b/inlong-tubemq/tubemq-manager/src/main/assembly/assembly.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>bin</id>
<formats>
- <format>zip</format>
+ <format>tar.gz</format>
</formats>
<dependencySets>
<dependencySet>