This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/bigtop-manager.git
The following commit(s) were added to refs/heads/main by this push:
new 5204c6fe BIGTOP-4444: Options when adding hosts default parameters
should take effect (#238)
5204c6fe is described below
commit 5204c6fef795fd14606eee363fe3e1452ac63228
Author: Dansanyo <[email protected]>
AuthorDate: Wed Jul 9 21:42:16 2025 +0800
BIGTOP-4444: Options when adding hosts default parameters should take
effect (#238)
---
.../server/service/impl/HostServiceImpl.java | 21 +++++++++++++++++++++
bigtop-manager-ui/src/locales/en_US/host.ts | 3 ++-
bigtop-manager-ui/src/locales/zh_CN/host.ts | 3 ++-
.../src/pages/cluster-manage/hosts/create.vue | 2 +-
4 files changed, 26 insertions(+), 3 deletions(-)
diff --git
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java
index 1ec32399..969b8977 100644
---
a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java
+++
b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java
@@ -86,6 +86,10 @@ public class HostServiceImpl implements HostService {
private final ExecutorService executorService =
Executors.newFixedThreadPool(5);
+ private static final Integer DEFAULT_GRPC_PORT = 8835;
+ private static final Integer DEFAULT_SSH_PORT = 22;
+ private static final String DEFAULT_AGENT_DIR = "/opt";
+
@Override
public PageVO<HostVO> list(HostQuery hostQuery) {
PageQuery pageQuery = PageUtils.getPageQuery();
@@ -101,6 +105,7 @@ public class HostServiceImpl implements HostService {
@Override
public List<HostVO> add(HostDTO hostDTO) {
+ setDefaultValues(hostDTO);
List<HostPO> hostPOList =
HostConverter.INSTANCE.fromDTO2POListUsingHostnames(hostDTO);
for (HostPO hostPO : hostPOList) {
hostPO.setStatus(HealthyStatusEnum.HEALTHY.getCode());
@@ -227,6 +232,7 @@ public class HostServiceImpl implements HostService {
installedStatus.clear();
for (HostDTO hostDTO : hostDTOList) {
+ setDefaultValues(hostDTO);
for (String hostname : hostDTO.getHostnames()) {
InstalledStatusVO installedStatusVO = new InstalledStatusVO();
installedStatusVO.setHostname(hostname);
@@ -323,4 +329,19 @@ public class HostServiceImpl implements HostService {
throw new RuntimeException(e);
}
}
+
+ private void setDefaultValues(HostDTO hostDTO) {
+ if (hostDTO == null) {
+ return;
+ }
+ if (hostDTO.getGrpcPort() == null) {
+ hostDTO.setGrpcPort(DEFAULT_GRPC_PORT);
+ }
+ if (hostDTO.getSshPort() == null) {
+ hostDTO.setSshPort(DEFAULT_SSH_PORT);
+ }
+ if (hostDTO.getAgentDir() == null) {
+ hostDTO.setAgentDir(DEFAULT_AGENT_DIR);
+ }
+ }
}
diff --git a/bigtop-manager-ui/src/locales/en_US/host.ts
b/bigtop-manager-ui/src/locales/en_US/host.ts
index 7bfd805d..7479fc72 100644
--- a/bigtop-manager-ui/src/locales/en_US/host.ts
+++ b/bigtop-manager-ui/src/locales/en_US/host.ts
@@ -43,5 +43,6 @@ export default {
description: 'Description',
key_password_not_match: 'Key Passwords do not match.',
default_agent_path: 'Agent application installed path, default to /opt',
- default_grpc_port: 'Agent application grpc port, default to 8835'
+ default_grpc_port: 'Agent application grpc port, default to 8835',
+ default_ssh_port: 'Agent application ssh port, default to 22'
}
diff --git a/bigtop-manager-ui/src/locales/zh_CN/host.ts
b/bigtop-manager-ui/src/locales/zh_CN/host.ts
index 88ffefe3..85faf40e 100644
--- a/bigtop-manager-ui/src/locales/zh_CN/host.ts
+++ b/bigtop-manager-ui/src/locales/zh_CN/host.ts
@@ -43,5 +43,6 @@ export default {
description: '备注',
key_password_not_match: '密钥口令不一致。',
default_agent_path: '代理应用程序安装路径，默认为/opt',
- default_grpc_port: '代理应用程序gRPC端口，默认为8835'
+ default_grpc_port: '代理应用程序gRPC端口，默认为8835',
+ default_ssh_port: '代理应用程序SSH端口，默认为22'
}
diff --git a/bigtop-manager-ui/src/pages/cluster-manage/hosts/create.vue
b/bigtop-manager-ui/src/pages/cluster-manage/hosts/create.vue
index 027aaf45..c202eb53 100644
--- a/bigtop-manager-ui/src/pages/cluster-manage/hosts/create.vue
+++ b/bigtop-manager-ui/src/pages/cluster-manage/hosts/create.vue
@@ -303,7 +303,7 @@
label: t('host.ssh_port')
},
controlProps: {
- placeholder: t('common.enter_error',
[`${t('host.ssh_port')}`.toLowerCase()])
+ placeholder: t('host.default_ssh_port')
}
},
{
