You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ji...@apache.org on 2022/04/18 10:20:36 UTC
[incubator-doris-manager] branch revert-50-revert-49-master created (now c37649c)
This is an automated email from the ASF dual-hosted git repository.
jiafengzheng pushed a change to branch revert-50-revert-49-master
in repository https://gitbox.apache.org/repos/asf/incubator-doris-manager.git
at c37649c Revert "Revert "[fix] merge #48 (#49)" (#50)"
This branch includes the following new commits:
new c37649c Revert "Revert "[fix] merge #48 (#49)" (#50)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[incubator-doris-manager] 01/01: Revert "Revert "[fix] merge #48 (#49)" (#50)"
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiafengzheng pushed a commit to branch revert-50-revert-49-master
in repository https://gitbox.apache.org/repos/asf/incubator-doris-manager.git
commit c37649c5c06c9770fa352c4214697676dcdfabaf
Author: jiafeng.zhang <zh...@gmail.com>
AuthorDate: Mon Apr 18 18:20:32 2022 +0800
Revert "Revert "[fix] merge #48 (#49)" (#50)"
This reverts commit 315c3fd87f42cadec5677d20ceeb352073109b5b.
---
manager/dm-agent/pom.xml | 2 +-
manager/dm-server/pom.xml | 2 +-
.../stack/control/manager/ResourceClusterManager.java | 14 ++++++++++----
manager/pom.xml | 2 +-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/manager/dm-agent/pom.xml b/manager/dm-agent/pom.xml
index f884824..8923257 100644
--- a/manager/dm-agent/pom.xml
+++ b/manager/dm-agent/pom.xml
@@ -54,7 +54,7 @@ under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5</version>
+ <version>4.5.13</version>
</dependency>
<dependency>
diff --git a/manager/dm-server/pom.xml b/manager/dm-server/pom.xml
index 0dc86ab..648e55b 100644
--- a/manager/dm-server/pom.xml
+++ b/manager/dm-server/pom.xml
@@ -47,7 +47,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/manager/dm-server/src/main/java/org/apache/doris/stack/control/manager/ResourceClusterManager.java b/manager/dm-server/src/main/java/org/apache/doris/stack/control/manager/ResourceClusterManager.java
index 75fd80b..d7e13c7 100644
--- a/manager/dm-server/src/main/java/org/apache/doris/stack/control/manager/ResourceClusterManager.java
+++ b/manager/dm-server/src/main/java/org/apache/doris/stack/control/manager/ResourceClusterManager.java
@@ -115,10 +115,6 @@ public class ResourceClusterManager {
PMResourceClusterAccessInfo.class);
// TODO:The path can be set separately for each machine later
List<ResourceNodeEntity> nodeEntities = nodeRepository.getByResourceClusterId(resourceClusterId);
- AgentInstallEventConfigInfo configInfo = new AgentInstallEventConfigInfo();
- configInfo.setSshUser(accessInfo.getSshUser());
- configInfo.setSshPort(accessInfo.getSshPort());
- configInfo.setSshKey(accessInfo.getSshKey());
log.debug("check agent port for resource cluster {} all nodes", resourceClusterId);
@@ -127,6 +123,11 @@ public class ResourceClusterManager {
// but it may expose this problem early if the port has been used.
List<Pair<ResourceNodeEntity, CompletableFuture<Boolean>>> nodeFutures = new ArrayList<>();
for (ResourceNodeEntity nodeEntity : nodeEntities) {
+ AgentInstallEventConfigInfo configInfo = new AgentInstallEventConfigInfo();
+ configInfo.setSshUser(accessInfo.getSshUser());
+ configInfo.setSshPort(accessInfo.getSshPort());
+ configInfo.setSshKey(accessInfo.getSshKey());
+
CompletableFuture<Boolean> portCheckFuture = CompletableFuture.supplyAsync(() -> {
try {
nodeAndAgentManager.checkSshConnect(nodeEntity, configInfo);
@@ -169,6 +170,11 @@ public class ResourceClusterManager {
log.debug("install agent for resource cluster {} all nodes", resourceClusterId);
for (ResourceNodeEntity nodeEntity : nodeEntities) {
log.info("start to install agent to {} node {}", nodeEntity.getId(), nodeEntity.getHost());
+ AgentInstallEventConfigInfo configInfo = new AgentInstallEventConfigInfo();
+ configInfo.setSshUser(accessInfo.getSshUser());
+ configInfo.setSshPort(accessInfo.getSshPort());
+ configInfo.setSshKey(accessInfo.getSshKey());
+
nodeAndAgentManager.installAgentOperation(nodeEntity, configInfo, requestId);
}
}
diff --git a/manager/pom.xml b/manager/pom.xml
index b5bdbd2..813f86f 100644
--- a/manager/pom.xml
+++ b/manager/pom.xml
@@ -214,7 +214,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org