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 6c306c1 [INLONG-3520][DataProxy] Unify the data directory for the
dataproxy (#3521)
6c306c1 is described below
commit 6c306c137e59c1c678db182cb43b8c4ab1ad0f90
Author: dockerzhang <[email protected]>
AuthorDate: Sat Apr 2 18:17:01 2022 +0800
[INLONG-3520][DataProxy] Unify the data directory for the dataproxy (#3521)
---
inlong-dashboard/src/components/MetaData/DataSourcesBinLog.ts | 2 +-
inlong-dataproxy/conf/dataproxy-pulsar.conf | 2 +-
inlong-dataproxy/conf/dataproxy-tube.conf | 4 ++--
.../dataproxy-source/src/main/resources/dataproxy-pulsar.conf | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/inlong-dashboard/src/components/MetaData/DataSourcesBinLog.ts
b/inlong-dashboard/src/components/MetaData/DataSourcesBinLog.ts
index 6ba8e1f..de01ca2 100644
--- a/inlong-dashboard/src/components/MetaData/DataSourcesBinLog.ts
+++ b/inlong-dashboard/src/components/MetaData/DataSourcesBinLog.ts
@@ -73,7 +73,7 @@ export const getDataSourcesBinLogFields = (
type: 'input',
label:
i18n.t('components.AccessHelper.DataSourceMetaData.Db.HistoryFilename'),
rules: [{ required: true }],
- initialValue: '/agentInstallPath/.history',
+ initialValue: '/data/inlong-agent/.history',
props: {
disabled: currentValues?.status === 101,
},
diff --git a/inlong-dataproxy/conf/dataproxy-pulsar.conf
b/inlong-dataproxy/conf/dataproxy-pulsar.conf
index 06422b7..42b9e1d 100644
--- a/inlong-dataproxy/conf/dataproxy-pulsar.conf
+++ b/inlong-dataproxy/conf/dataproxy-pulsar.conf
@@ -79,7 +79,7 @@ agent1.channels.ch-msg5.capacity = 100000000
agent1.channels.ch-msg5.maxFileSize = 1073741824
agent1.channels.ch-msg5.minimumRequiredSpace = 1073741824
agent1.channels.ch-msg5.checkpointDir = ./data/file/ch-msg5/check
-agent1.channels.ch-msg5.dataDirs = DATAPROXY_HOME/file/ch-msg5/data
+agent1.channels.ch-msg5.dataDirs = ./data/file/ch-msg5/data
agent1.channels.ch-msg5.fsyncPerTransaction = false
agent1.channels.ch-msg5.fsyncInterval = 10
diff --git a/inlong-dataproxy/conf/dataproxy-tube.conf
b/inlong-dataproxy/conf/dataproxy-tube.conf
index f6099ca..f548f3e 100644
--- a/inlong-dataproxy/conf/dataproxy-tube.conf
+++ b/inlong-dataproxy/conf/dataproxy-tube.conf
@@ -72,7 +72,7 @@ agent1.channels.ch-msg5.capacity = 100000000
agent1.channels.ch-msg5.maxFileSize = 1073741824
agent1.channels.ch-msg5.minimumRequiredSpace = 1073741824
agent1.channels.ch-msg5.checkpointDir = ./data/file/ch-msg5/check
-agent1.channels.ch-msg5.dataDirs = DATAPROXY_HOME/file/ch-msg5/data
+agent1.channels.ch-msg5.dataDirs = ./data/file/ch-msg5/data
agent1.channels.ch-msg5.fsyncPerTransaction = false
agent1.channels.ch-msg5.fsyncInterval = 5
@@ -81,7 +81,7 @@ agent1.channels.ch-msg6.capacity = 100000000
agent1.channels.ch-msg6.maxFileSize = 1073741824
agent1.channels.ch-msg6.minimumRequiredSpace = 1073741824
agent1.channels.ch-msg6.checkpointDir = ./data/file/ch-msg6/check
-agent1.channels.ch-msg6.dataDirs = DATAPROXY_HOME/file/ch-msg6/data
+agent1.channels.ch-msg6.dataDirs = ./data/file/ch-msg6/data
agent1.channels.ch-msg6.fsyncPerTransaction = false
agent1.channels.ch-msg6.fsyncInterval = 5
diff --git
a/inlong-dataproxy/dataproxy-source/src/main/resources/dataproxy-pulsar.conf
b/inlong-dataproxy/dataproxy-source/src/main/resources/dataproxy-pulsar.conf
index 0ef2f41..7bf5612 100644
--- a/inlong-dataproxy/dataproxy-source/src/main/resources/dataproxy-pulsar.conf
+++ b/inlong-dataproxy/dataproxy-source/src/main/resources/dataproxy-pulsar.conf
@@ -42,7 +42,7 @@ agent1.sources.tcp-source.msg-factory-name =
org.apache.inlong.dataproxy.source.
agent1.sources.tcp-source.host = 0.0.0.0
agent1.sources.tcp-source.port = 46801
agent1.sources.tcp-source.max-msg-length = 524288
-#agent1.sources.tcp-source.topic =
persistent://public/default/dataproxy-default-topic
+# agent1.sources.tcp-source.topic =
persistent://public/default/dataproxy-default-topic
agent1.sources.tcp-source.attr = m=9
agent1.sources.tcp-source.connections = 30000
agent1.sources.tcp-source.max-threads = 64
@@ -53,7 +53,7 @@ agent1.sources.tcp-source.selector.type =
org.apache.inlong.dataproxy.channel.Fa
agent1.sources.tcp-source.selector.master = ch-msg1 ch-msg2
# For order message
agent1.sources.tcp-source.selector.order = ch-msg3
-agent1.sources.tcp-source.metric-recovery-path = /data/DataProxy/file/recovery
+agent1.sources.tcp-source.metric-recovery-path = ./data/file/recovery
agent1.sources.tcp-source.metric-agent-port = 8003
agent1.sources.tcp-source.metric-cache-size = 1000000
agent1.sources.tcp-source.set = 10
@@ -78,8 +78,8 @@ agent1.channels.ch-msg5.type = file
agent1.channels.ch-msg5.capacity = 100000000
agent1.channels.ch-msg5.maxFileSize = 1073741824
agent1.channels.ch-msg5.minimumRequiredSpace = 1073741824
-agent1.channels.ch-msg5.checkpointDir = /data/DataProxy/file/ch-msg5/check
-agent1.channels.ch-msg5.dataDirs = DATAPROXY_HOME/file/ch-msg5/data
+agent1.channels.ch-msg5.checkpointDir = ./data/file/ch-msg5/check
+agent1.channels.ch-msg5.dataDirs = ./data/file/ch-msg5/data
agent1.channels.ch-msg5.fsyncPerTransaction = false
agent1.channels.ch-msg5.fsyncInterval = 10
