You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2018/12/11 17:00:23 UTC
[ambari] branch trunk updated: AMBARI-25033. Layout recommendation
adds unwanted components (#2714)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new f4b8e4b AMBARI-25033. Layout recommendation adds unwanted components (#2714)
f4b8e4b is described below
commit f4b8e4bc093f1b25ee748e6dce8f0b1e7b80cdee
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Tue Dec 11 18:00:17 2018 +0100
AMBARI-25033. Layout recommendation adds unwanted components (#2714)
---
.../org/apache/ambari/server/topology/addservice/AddServiceInfo.java | 4 ++++
.../ambari/server/topology/addservice/AddServiceOrchestrator.java | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceInfo.java
index 2df7c4d..46fe3f3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceInfo.java
@@ -115,4 +115,8 @@ public final class AddServiceInfo {
return sb.toString();
}
+ public boolean requiresLayoutRecommendation() {
+ return !request.getServices().isEmpty();
+ }
+
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceOrchestrator.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceOrchestrator.java
index 71cce4a..c4b6529 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceOrchestrator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/addservice/AddServiceOrchestrator.java
@@ -127,6 +127,11 @@ public class AddServiceOrchestrator {
* @throws IllegalArgumentException if the request cannot be satisfied
*/
private AddServiceInfo recommendLayout(AddServiceInfo request) {
+ if (!request.requiresLayoutRecommendation()) {
+ LOG.info("Using layout specified in request for {}", request);
+ return request;
+ }
+
LOG.info("Recommending layout for {}", request);
return stackAdvisorAdapter.recommendLayout(request);
}