Skip to content

AMBARI-23032 export cluster as blueprint for 3.0 #1367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benyoka merged 22 commits into from
May 25, 2018
Merged

AMBARI-23032 export cluster as blueprint for 3.0 #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
63083ec
AMBARI-23032 fix execptions, export cluster settings and single mpack…
Feb 21, 2018
4ec0391
AMBARI-23032 fix review comments (benyoka)
Feb 22, 2018
bd2f0b3
AMBARI-23032 better method naming (benyoka)
Feb 22, 2018
33c0f20
AMBARI-23032 fix review comments #2 (benyoka)
Feb 22, 2018
aba404a
AMBARI-23032 fix review comments #3 (benyoka)
Feb 22, 2018
c31829c
Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' i…
Feb 26, 2018
91f1560
AMBARI-23032 fix swallowed exceptions during mpack installation
Feb 26, 2018
0d21dad
AMBARI-23032 prepare for mpack info in component
Mar 1, 2018
bf1e23c
Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' i…
Mar 1, 2018
fdbed57
Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' i…
Mar 13, 2018
1277c6e
Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' i…
Mar 19, 2018
2631e7d
Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' i…
Mar 19, 2018
3024885
AMBARI-23032 fix exceptions during installation and blueprint export …
Mar 20, 2018
cf468a6
AMBARI-23032 revert accidental changes (benyoka)
Mar 20, 2018
bb94bb7
AMBARI-23032 revert accidental changes #2 (benyoka)
Mar 20, 2018
424e420
AMBARI-23032 fixed a number of unit tests (benyoka)
Mar 21, 2018
66cbcae
AMBARI-23032 make sure Blueprints tag is exported (benyoka)
Mar 23, 2018
b5ecffb
Merge branch-feature-AMBARI-14714
Mar 26, 2018
f8c7cdb
AMBARI-23032 fix import error (benyoka)
Mar 26, 2018
2c424dd
Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' i…
Mar 26, 2018
9683e29
AMBARI-23032 fix NPE
May 24, 2018
b30770f
AMBARI-23032 fix equals() in Component (benyoka)
May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...ver/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,13 @@ private Resource createBlueprintResource(TreeNode<Resource> clusterNode) {
* Adds mpack instances to the exported blueprint resource.
*/
private void addMpackInstances(Resource blueprintResource, TreeNode<Resource> clusterNode) {
List<Map<String, Object>> mpackInstances = clusterNode.getChild("stack_versions").getChildren().stream().map(
// TODO: find a way to add mpack uri
List<Map<String, Object>> mpackInstances = clusterNode.getChild("servicegroups").getChildren().stream().map(
child -> {
Map<String, Object> stackVersionProps = child.getObject().getPropertiesMap().get("ClusterStackVersions");
Map<String, Object> serviceGroupProps = child.getObject().getPropertiesMap().get("ServiceGroupInfo");
return ImmutableMap.of(
"name", stackVersionProps.get("stack"),
"version", stackVersionProps.get("version"),
"url", stackVersionProps.get("mpack_uri"));
"name", serviceGroupProps.get("mpack_name"),
"version", serviceGroupProps.get("mpack_version"));
}).
collect(toList());
blueprintResource.setProperty(BlueprintResourceProvider.MPACK_INSTANCES_PROPERTY_ID, mpackInstances);
Expand Down
2 changes: 1 addition & 1 deletion ...er/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public ExportBlueprintRequest(TreeNode<Resource> clusterNode) throws InvalidTopo
// create service group to mpack map
serviceGroupToMpack = clusterNode.getChild("servicegroups").getChildren().stream().
map(tn -> tn.getObject().getPropertiesMap().get(ServiceGroupResourceProvider.RESPONSE_KEY)).
collect(toMap(m -> m.get("service_group_name").toString(), m -> new StackId(m.get("version").toString())));
collect(toMap(m -> m.get("service_group_name").toString(), m -> new StackId(m.get("stack").toString())));
Copy link
Contributor

@adoroszlai adoroszlai May 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1363 is changing service group response in the opposite way (return "version" instead of "stack"). I think these strings should be defined in a constant in ServiceGroupResourceProvider (also "mpack_name" etc.).


createConfiguration(clusterNode);
//todo: should be parsing Configuration from the beginning
Expand Down
3 changes: 2 additions & 1 deletion ambari-server/src/main/java/org/apache/ambari/server/topology/Component.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public StackId getStackId() {
public String getMpackInstance() {
return this.mpackInstance;
}

/**
* @return the service instance this component belongs to. Can be {@code null} if component does not belong to a service
* instance (there is a single service of the component's service type)
Expand All @@ -99,7 +100,7 @@ public String getServiceInstance() {
/**
* Gets the provision action associated with this component.
*
* @return the provision action for this component, whichRequest's Mpack instances isRequest's Mpack instances is
* @return the provision action for this component, which
* may be null if the default action is to be used
*/
public ProvisionAction getProvisionAction() {
Expand Down
4 changes: 4 additions & 0 deletions ...src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@ public TreeNode<Resource> createResultTreeSettingsObject(TreeNode<Resource> resu
serviceGroupResource.setProperty("ServiceGroupInfo/cluster_name", "c1");
serviceGroupResource.setProperty("ServiceGroupInfo/service_group_id", "1");
serviceGroupResource.setProperty("ServiceGroupInfo/service_group_name", "core");
serviceGroupResource.setProperty("ServiceGroupInfo/mpack_name", "HDP");
serviceGroupResource.setProperty("ServiceGroupInfo/mpack_version", "1.3.3");
TreeNode<Resource> serviceGroup1Tree = serviceGroupsTree.addChild(serviceGroupResource, "ServiceGroup:1");
clusterTree.addChild(serviceGroupsTree);

Expand Down Expand Up @@ -710,6 +712,8 @@ public Map<String, Map<String, Object>> getPropertiesMap() {
serviceGroupResource.setProperty("ServiceGroupInfo/cluster_name", "c1");
serviceGroupResource.setProperty("ServiceGroupInfo/service_group_id", "1");
serviceGroupResource.setProperty("ServiceGroupInfo/service_group_name", "core");
serviceGroupResource.setProperty("ServiceGroupInfo/mpack_name", "HDP");
serviceGroupResource.setProperty("ServiceGroupInfo/mpack_version", "1.3.3");
TreeNode<Resource> serviceGroup1Tree = serviceGroupsTree.addChild(serviceGroupResource, "ServiceGroup:1");
clusterTree.addChild(serviceGroupsTree);

Expand Down