[ambari] branch branch-2.6 updated: AMBARI-23174 : Add storm topology metric expressions for custom downsampling config.

2018-03-07 Thread avijayan 
This is an automated email from the ASF dual-hosted git repository.

avijayan pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
 new b55567c  AMBARI-23174 : Add storm topology metric expressions for 
custom downsampling config.
b55567c is described below

commit b55567c4411bf4257f3610e00ba92d20c7d4c039
Author: Aravindan Vijayan 
AuthorDate: Wed Mar 7 13:44:35 2018 -0800

AMBARI-23174 : Add storm topology metric expressions for custom 
downsampling config.
---
 .../common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
index bcbcabd..f991cf4 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
@@ -722,7 +722,7 @@
   
   
 timeline.metrics.downsampler.event.metric.patterns
-
+topology\.%
 
   Commas separated list of metric name regular expressions that are like 
events. No interpolation will be done for such
   metrics, and the downsampling SUM aggregators will sum the values across 
time instead of averaging them out.

-- 
To stop receiving notification emails like this one, please contact
avija...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-23176 - Some Minor Fixes For Failing Tests Due to Repo Version Refactor (#587)

2018-03-07 Thread jonathanhurley 
This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 146518d  AMBARI-23176 - Some Minor Fixes For Failing Tests Due to Repo 
Version Refactor (#587)
146518d is described below

commit 146518df1325932d701cb9ac467b5419081d78b6
Author: Jonathan Hurley 
AuthorDate: Wed Mar 7 20:39:17 2018 -0500

AMBARI-23176 - Some Minor Fixes For Failing Tests Due to Repo Version 
Refactor (#587)
---
 .../ambari/server/orm/entities/MpackEntity.java|  4 ++
 .../server/orm/entities/RepoDefinitionEntity.java  |  1 -
 .../ambari/server/orm/entities/RepoOsEntity.java   | 12 -
 .../apache/ambari/server/orm/OrmTestHelper.java| 54 --
 4 files changed, 66 insertions(+), 5 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/MpackEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/MpackEntity.java
index 15b4540..20fc872 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/MpackEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/MpackEntity.java
@@ -139,6 +139,10 @@ public class MpackEntity {
*/
   public void setRepositoryOperatingSystems(List 
repositoryOperatingSystems) {
 this.repositoryOperatingSystems = repositoryOperatingSystems;
+for (RepoOsEntity repositoryOperatingSystem : repositoryOperatingSystems) {
+  repositoryOperatingSystem.setMpackEntity(this);
+  repositoryOperatingSystem.setMpackId(id);
+}
   }
 
   public MpackEntity() {
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
index 3b50608..edcc1f1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
@@ -37,7 +37,6 @@ import javax.persistence.TableGenerator;
 
 import org.apache.ambari.server.state.RepositoryInfo;
 import org.apache.ambari.server.state.stack.RepoTag;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.google.common.base.Objects;
 
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoOsEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoOsEntity.java
index d61b043..9af0ea9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoOsEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoOsEntity.java
@@ -134,10 +134,20 @@ public class RepoOsEntity {
*
* @return the management pack ID.
*/
-  public long getMpackId() {
+  public Long getMpackId() {
 return mpackId;
   }
 
+  /**
+   * Sets the management pack ID.
+   *
+   * @param mpackId
+   *  the management pack ID.
+   */
+  public void setMpackId(Long mpackId) {
+this.mpackId = mpackId;
+  }
+
   public String getFamily() {
 return family;
   }
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
index fbc041d..e996c3a 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
@@ -85,6 +85,9 @@ import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.HostState;
+import org.apache.ambari.server.state.Module;
+import org.apache.ambari.server.state.ModuleComponent;
+import org.apache.ambari.server.state.Mpack;
 import org.apache.ambari.server.state.RepositoryVersionState;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
@@ -98,11 +101,13 @@ import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.alert.Scope;
 import org.apache.ambari.server.state.alert.SourceType;
 import org.apache.ambari.server.state.cluster.ClustersImpl;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Provider;
@@ -342,6 +347,33 @@ public class OrmTestHelper {
   mpackEntity.setMpackVersion(stackId.getStackVersion());
   mpackEntity.setMpackUri("http://mpacks.org/; + stackId.toString() + 
".json");

[ambari] 01/01: AMBARI-23175. Fix for PUT Host Component API failing because validation check fails. (#586).

2018-03-07 Thread swapan 
This is an automated email from the ASF dual-hosted git repository.

swapan pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 364cf4a116a48d2d805c08df9ed0e249d607bbac
Merge: 47cb5b6 842b847
Author: swapanshridhar 
AuthorDate: Wed Mar 7 15:40:41 2018 -0800

AMBARI-23175. Fix for PUT Host Component API failing because validation 
check fails. (#586).

AMBARI-23175. Fix for PUT Host Component API failing because validation 
check fails. (#586).

 .../server/controller/internal/HostComponentResourceProvider.java   | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
swa...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated (47cb5b6 -> 364cf4a)

2018-03-07 Thread swapan 
This is an automated email from the ASF dual-hosted git repository.

swapan pushed a change to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from 47cb5b6  AMBARI-23167 - StackOverflowError thrown during cluster 
creation
 add 842b847  AMBARI-23175. Fix for PUT Host Component API failing because 
validation check fails.
 new 364cf4a  AMBARI-23175. Fix for PUT Host Component API failing because 
validation check fails. (#586).

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.


Summary of changes:
 .../server/controller/internal/HostComponentResourceProvider.java   | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
swa...@apache.org.

[ambari] branch trunk updated: AMBARI-23172. Build fails for Debian (jdeb plugin not found). (swagle) (#583)

2018-03-07 Thread swagle 
This is an automated email from the ASF dual-hosted git repository.

swagle 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 e5e10cd  AMBARI-23172. Build fails for Debian (jdeb plugin not found). 
(swagle) (#583)
e5e10cd is described below

commit e5e10cd81fcf48cbcee82456769145ad8c954e1e
Author: Siddharth 
AuthorDate: Wed Mar 7 12:55:54 2018 -0800

AMBARI-23172. Build fails for Debian (jdeb plugin not found). (swagle) 
(#583)
---
 ambari-serviceadvisor/pom.xml | 17 +
 1 file changed, 17 insertions(+)

diff --git a/ambari-serviceadvisor/pom.xml b/ambari-serviceadvisor/pom.xml
index dad3d36..5399bdd 100644
--- a/ambari-serviceadvisor/pom.xml
+++ b/ambari-serviceadvisor/pom.xml
@@ -136,6 +136,23 @@
 
   
   
+org.vafer
+jdeb
+1.0.1
+
+  
+none
+
+  jdeb
+
+  
+
+
+  true
+  false
+
+  
+  
 org.apache.rat
 apache-rat-plugin
 0.12

-- 
To stop receiving notification emails like this one, please contact
swa...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-23167 - StackOverflowError thrown during cluster creation

2018-03-07 Thread jonathanhurley 
This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 47cb5b6  AMBARI-23167 - StackOverflowError thrown during cluster 
creation
47cb5b6 is described below

commit 47cb5b6ad44f7ee37958b544d5ae830e83ca8e0f
Author: Jonathan Hurley 
AuthorDate: Wed Mar 7 13:09:40 2018 -0500

AMBARI-23167 - StackOverflowError thrown during cluster creation
---
 .../ambari/server/orm/entities/MpackEntity.java|  7 ++-
 .../server/orm/entities/RepoDefinitionEntity.java  |  8 
 .../ambari/server/orm/entities/RepoOsEntity.java   | 24 +++---
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/MpackEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/MpackEntity.java
index 1a2d580..15b4540 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/MpackEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/MpackEntity.java
@@ -24,6 +24,7 @@ import java.util.Objects;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -73,7 +74,11 @@ public class MpackEntity {
* organized by operating system. A single operating system can have multiple
* repo URLs defined for it for a given management pack.
*/
-  @OneToMany(orphanRemoval = true, cascade = CascadeType.ALL, mappedBy = 
"mpackEntity")
+  @OneToMany(
+  orphanRemoval = true,
+  fetch = FetchType.EAGER,
+  cascade = { CascadeType.MERGE, CascadeType.REFRESH, CascadeType.REMOVE },
+  mappedBy = "mpackEntity")
   private List repositoryOperatingSystems = new ArrayList<>();
 
   public Long getId() {
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
index 9c85d1f..3b50608 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java
@@ -217,10 +217,10 @@ public class RepoDefinitionEntity {
*/
   @Override
   public String toString() {
-return new ToStringBuilder(null)
-  .append("id", repoID)
-  .append("name", repoName)
-  .append("tags", repoTags)
+return Objects.toStringHelper(this)
+  .add("id", repoID)
+  .add("name", repoName)
+  .add("tags", repoTags)
   .toString();
   }  
 
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoOsEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoOsEntity.java
index d0799de..d61b043 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoOsEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoOsEntity.java
@@ -35,7 +35,6 @@ import javax.persistence.TableGenerator;
 
 import org.apache.ambari.annotations.Experimental;
 import org.apache.ambari.annotations.ExperimentalFeature;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.google.common.base.Objects;
 
@@ -139,16 +138,6 @@ public class RepoOsEntity {
 return mpackId;
   }
 
-  /**
-   * Sets the management pack ID.
-   *
-   * @param mpackId
-   *  the ID of the management pack which owns this repository.
-   */
-  public void setMpackId(long mpackId) {
-this.mpackId = mpackId;
-  }
-
   public String getFamily() {
 return family;
   }
@@ -182,7 +171,6 @@ public class RepoOsEntity {
*/
   public void setMpackEntity(MpackEntity mpackEntity) {
 this.mpackEntity = mpackEntity;
-mpackId = mpackEntity.getId();
   }
 
   /**
@@ -190,7 +178,8 @@ public class RepoOsEntity {
*/
   @Override
   public int hashCode() {
-return java.util.Objects.hash(mpackId, family, ambariManaged, 
repoDefinitionEntities);
+return java.util.Objects.hash(mpackId, mpackEntity, family, ambariManaged,
+repoDefinitionEntities);
   }
 
   /**
@@ -212,6 +201,7 @@ public class RepoOsEntity {
 
 RepoOsEntity that = (RepoOsEntity) object;
 return Objects.equal(mpackId, that.mpackId)
+&& Objects.equal(mpackEntity, that.mpackEntity)
 && Objects.equal(ambariManaged, that.ambariManaged)
 && Objects.equal(family, that.family)
 && Objects.equal(repoDefinitionEntities, that.repoDefinitionEntities);
@@ -222,10 +212,10 @@ public class RepoOsEntity {
*/
   @Override
   public String

[ambari] branch trunk updated: [AMBARI-22981] Updating Hadoop RPC Encryption Properties During Upgrade (#546)

2018-03-07 Thread rlevas 
This is an automated email from the ASF dual-hosted git repository.

rlevas 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 ce7237c  [AMBARI-22981] Updating Hadoop RPC Encryption Properties 
During Upgrade (#546)
ce7237c is described below

commit ce7237cc4a2f1dd78b929c83a6db5ef62018bd84
Author: smolnar82 <34065904+smolna...@users.noreply.github.com>
AuthorDate: Wed Mar 7 17:20:03 2018 +0100

[AMBARI-22981] Updating Hadoop RPC Encryption Properties During Upgrade 
(#546)

* AMBARI-22981. Updating Hadoop RPC Encryption Properties During Upgrade

* AMBARI-22981. Removed unnecessary security_enabled check
---
 .../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 12 
 .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-3.0.xml   |  5 ++---
 ambari-web/app/data/configs/wizards/secure_mapping.js| 16 
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 4608673..1ce0455 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -53,18 +53,14 @@
   
   
 
-  
+  
 hdfs-site
-
+
   
 
-  
+  
 core-site
-
+
   
 
   
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-3.0.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-3.0.xml
index a842f40..3e6b7bd 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-3.0.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-3.0.xml
@@ -295,14 +295,13 @@
 
 
-
+
 
 
 
 
-
+
 
 
 
diff --git a/ambari-web/app/data/configs/wizards/secure_mapping.js 
b/ambari-web/app/data/configs/wizards/secure_mapping.js
index 2d24628..fcc981a 100644
--- a/ambari-web/app/data/configs/wizards/secure_mapping.js
+++ b/ambari-web/app/data/configs/wizards/secure_mapping.js
@@ -39,6 +39,14 @@ var props = [
 "serviceName": "HDFS"
   },
   {
+"name": "hadoop.rpc.protection",
+"templateName": [],
+"foreignKey": null,
+"value": "authentication,privacy",
+"filename": "core-site.xml",
+"serviceName": "HDFS"
+  },
+  {
 "name": "hadoop.security.auth_to_local",
 "templateName": ["resourcemanager_primary_name", "kerberos_domain", 
"yarn_user", "nodemanager_primary_name", "namenode_primary_name", "hdfs_user", 
"datanode_primary_name", "hbase_master_primary_name", 
"hbase_user","hbase_regionserver_primary_name","oozie_primary_name","oozie_user","jobhistory_primary_name","mapred_user","journalnode_principal_name","falcon_primary_name","falcon_user"],
 "foreignKey": null,
@@ -170,6 +178,14 @@ var props = [
 "serviceName": "HDFS"
   },
   {
+"name": "dfs.data.transfer.protection",
+"templateName": [],
+"foreignKey": null,
+"value": "authentication,privacy",
+"filename": "hdfs-site.xml",
+"serviceName": "HDFS"
+  },
+  {
 "name": "mapreduce.jobhistory.principal",
 "templateName": ["jobhistory_principal_name", "kerberos_domain"],
 "foreignKey": null,

-- 
To stop receiving notification emails like this one, please contact
rle...@apache.org.

[ambari] branch trunk updated: AMBARI-23163 Unable to add a service in second go from Ambari-UI

2018-03-07 Thread atkach 
This is an automated email from the ASF dual-hosted git repository.

atkach 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 cf3da47  AMBARI-23163 Unable to add a service in second go from 
Ambari-UI
cf3da47 is described below

commit cf3da47e07cd178fd4f606ee6d0c4522e21c142c
Author: Andrii Tkach 
AuthorDate: Wed Mar 7 14:38:19 2018 +0200

AMBARI-23163 Unable to add a service in second go from Ambari-UI
---
 .../common/modal_popups/config_validation/config_validation_popup.js   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/ambari-web/app/views/common/modal_popups/config_validation/config_validation_popup.js
 
b/ambari-web/app/views/common/modal_popups/config_validation/config_validation_popup.js
index 46911a0..665226d 100644
--- 
a/ambari-web/app/views/common/modal_popups/config_validation/config_validation_popup.js
+++ 
b/ambari-web/app/views/common/modal_popups/config_validation/config_validation_popup.js
@@ -23,7 +23,7 @@ var App = require('app');
  *
  * @return {*}
  */
-App.showConfigValidationPopup = function (configErrors, primary, secondary) {
+App.showConfigValidationPopup = function (configErrors, primary, secondary, 
controller) {
   return App.ModalPopup.show({
 header: Em.I18n.t('installer.step7.popup.validation.warning.header'),
 classNames: ['common-modal-wrapper','modal-full-width'],
@@ -45,6 +45,7 @@ App.showConfigValidationPopup = function (configErrors, 
primary, secondary) {
 },
 disablePrimary: !!configErrors.get('criticalIssues.length'),
 bodyClass: App.ValidationsView.extend({
+  controller: controller,
   configErrors: configErrors
 })
   });

-- 
To stop receiving notification emails like this one, please contact
atk...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-23156. Remove Required Group Name and Expose Lifecycle to API

2018-03-07 Thread ncole 
This is an automated email from the ASF dual-hosted git repository.

ncole pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new f7c0240  AMBARI-23156. Remove Required Group Name and Expose Lifecycle 
to API
f7c0240 is described below

commit f7c0240e5a885037f89a2a99d0ab886f2942c279
Author: Nate Cole 
AuthorDate: Tue Mar 6 12:18:53 2018 -0500

AMBARI-23156. Remove Required Group Name and Expose Lifecycle to API
---
 .../internal/UpgradeGroupResourceProvider.java |  4 +
 .../internal/UpgradeResourceProvider.java  |  1 +
 .../server/orm/entities/UpgradeGroupEntity.java| 24 +-
 .../apache/ambari/server/state/UpgradeContext.java |  4 +-
 .../apache/ambari/server/state/UpgradeHelper.java  | 14 +++-
 .../ambari/server/state/stack/UpgradePack.java |  3 +-
 .../server/state/stack/upgrade/Grouping.java   | 10 ++-
 .../server/state/stack/upgrade/Lifecycle.java  | 94 -
 .../server/state/stack/upgrade/LifecycleType.java  | 98 ++
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql |  1 +
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql |  1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql|  1 +
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  |  1 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql|  1 +
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql |  1 +
 ambari-server/src/main/resources/upgrade-pack.xsd  | 17 +---
 .../ambari/server/orm/dao/UpgradeDAOTest.java  |  5 +-
 .../ambari/server/state/stack/UpgradePackTest.java | 10 ++-
 .../mpacks-v2/upgrade-packs/upgrade-basic.xml  |  3 +-
 19 files changed, 186 insertions(+), 107 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeGroupResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeGroupResourceProvider.java
index 913375a..63c870f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeGroupResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeGroupResourceProvider.java
@@ -57,6 +57,7 @@ public class UpgradeGroupResourceProvider extends 
AbstractControllerResourceProv
   protected static final String UPGRADE_CLUSTER_NAME = 
"UpgradeGroup/cluster_name";
   protected static final String UPGRADE_GROUP_NAME = "UpgradeGroup/name";
   protected static final String UPGRADE_GROUP_TITLE = "UpgradeGroup/title";
+  protected static final String UPGRADE_GROUP_LIFECYCLE = 
"UpgradeGroup/lifecycle";
   protected static final String UPGRADE_GROUP_PROGRESS_PERCENT = 
"UpgradeGroup/progress_percent";
   protected static final String UPGRADE_GROUP_STATUS = "UpgradeGroup/status";
   protected static final String UPGRADE_GROUP_DISPLAY_STATUS = 
"UpgradeGroup/display_status";
@@ -68,6 +69,7 @@ public class UpgradeGroupResourceProvider extends 
AbstractControllerResourceProv
 
   private static final Set PK_PROPERTY_IDS = new HashSet<>(
 Arrays.asList(UPGRADE_REQUEST_ID, UPGRADE_GROUP_ID));
+
   private static final Set PROPERTY_IDS = new HashSet<>();
 
   private static final Map KEY_PROPERTY_IDS = new 
HashMap<>();
@@ -90,6 +92,7 @@ public class UpgradeGroupResourceProvider extends 
AbstractControllerResourceProv
 PROPERTY_IDS.add(UPGRADE_GROUP_TOTAL_TASKS);
 PROPERTY_IDS.add(UPGRADE_GROUP_IN_PROGRESS_TASKS);
 PROPERTY_IDS.add(UPGRADE_GROUP_COMPLETED_TASKS);
+PROPERTY_IDS.add(UPGRADE_GROUP_LIFECYCLE);
 
 // keys
 KEY_PROPERTY_IDS.put(Resource.Type.UpgradeGroup, UPGRADE_GROUP_ID);
@@ -183,6 +186,7 @@ public class UpgradeGroupResourceProvider extends 
AbstractControllerResourceProv
 setResourceProperty(resource, UPGRADE_GROUP_ID, group.getId(), 
requestedIds);
 setResourceProperty(resource, UPGRADE_GROUP_NAME, group.getName(), 
requestedIds);
 setResourceProperty(resource, UPGRADE_GROUP_TITLE, group.getTitle(), 
requestedIds);
+setResourceProperty(resource, UPGRADE_GROUP_LIFECYCLE, 
group.getLifecycle(), requestedIds);
 
 return resource;
   }
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index dd2b45a..09ca1ee 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -822,6 +822,7 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 
   if(!itemEntities.isEmpty()) {
 UpgradeGroupEntity groupEntity = new UpgradeGroupEntity();
+

[ambari] branch branch-2.6 updated: [AMBARI-23161] Invalid storage property value for zeppelin in stack H… (#568)

2018-03-07 Thread vbrodetskyi 
This is an automated email from the ASF dual-hosted git repository.

vbrodetskyi pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
 new ef1aace  [AMBARI-23161] Invalid storage property value for zeppelin in 
stack H… (#568)
ef1aace is described below

commit ef1aace01ed1181c5ede4950d7551cd3aead019c
Author: vbrodetskyi 
AuthorDate: Wed Mar 7 16:17:06 2018 +0200

[AMBARI-23161] Invalid storage property value for zeppelin in stack H… 
(#568)

* [AMBARI-23161] Invalid storage property value for zeppelin in stack HDP 
2.6

* [AMBARI-23161] Invalid storage property value for zeppelin in stack HDP 
2.6
---
 .../resources/stacks/HDP/2.6/services/stack_advisor.py | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
index 0c6c2c7..27558cb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
@@ -21,6 +21,7 @@ import json
 import math
 import re
 from resource_management.libraries.functions import format
+from resource_management.libraries.functions.version import compare_versions
 
 
 class HDP26StackAdvisor(HDP25StackAdvisor):
@@ -72,7 +73,7 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
   streamline_bare_principal = 
get_bare_principal(_streamline_principal_name)
   
storm_nimbus_impersonation_acl.replace('{{streamline_bare_principal}}', 
streamline_bare_principal)
   putStormSiteProperty('nimbus.impersonation.acl', 
storm_nimbus_impersonation_acl)
-  
+
   storm_nimbus_autocred_plugin_classes = 
storm_site["nimbus.autocredential.plugins.classes"] if 
"nimbus.autocredential.plugins.classes" in storm_site else None
   if storm_nimbus_autocred_plugin_classes is not None:
 new_storm_nimbus_autocred_plugin_classes = 
['org.apache.storm.hdfs.security.AutoHDFS',
@@ -117,6 +118,17 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
 :type hosts dict
 """
 super(HDP26StackAdvisor, 
self).recommendZeppelinConfigurations(configurations, clusterData, services, 
hosts)
+
+cluster_env = self.getServicesSiteProperties(services, "cluster-env")
+if cluster_env and "recommendations_full_stack_version" in cluster_env:
+  full_stack_version = cluster_env["recommendations_full_stack_version"]
+  if compare_versions(full_stack_version, '2.6.3.0') >= 0:
+zeppelin_config = self.getServicesSiteProperties(services, 
"zeppelin-config")
+if zeppelin_config and 
zeppelin_config.get('zeppelin.notebook.storage', None) == 
'org.apache.zeppelin.notebook.repo.VFSNotebookRepo':
+  putZeppelinConfigProperty = self.putProperty(configurations, 
'zeppelin-config', services)
+  putZeppelinConfigProperty('zeppelin.notebook.storage', 
'org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo')
+
+
 self.__addZeppelinToLivy2SuperUsers(configurations, services)
 
   def recommendAtlasConfigurations(self, configurations, clusterData, 
services, hosts):

-- 
To stop receiving notification emails like this one, please contact
vbrodets...@apache.org.

[ambari] branch trunk updated: AMBARI-23055. GPL repo is not hidden when default version is chosen in UI. (mpapirkovskyy)

2018-03-07 Thread mpapirkovskyy 
This is an automated email from the ASF dual-hosted git repository.

mpapirkovskyy 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 7d388ad  AMBARI-23055. GPL repo is not hidden when default version is 
chosen in UI. (mpapirkovskyy)
7d388ad is described below

commit 7d388adad9bc4736a711c5e7fefeca525f78dcff
Author: Myroslav Papirkovskyi 
AuthorDate: Tue Mar 6 17:28:43 2018 +0200

AMBARI-23055. GPL repo is not hidden when default version is chosen in UI. 
(mpapirkovskyy)
---
 .../ambari/server/controller/AmbariManagementControllerImpl.java   | 3 +--
 .../main/java/org/apache/ambari/server/controller/AmbariServer.java| 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 1c921f2..90d6151 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -219,7 +219,6 @@ import 
org.apache.ambari.server.state.quicklinksprofile.QuickLinksProfile;
 import org.apache.ambari.server.state.repository.VersionDefinitionXml;
 import org.apache.ambari.server.state.scheduler.RequestExecutionFactory;
 import org.apache.ambari.server.state.stack.OsFamily;
-import org.apache.ambari.server.state.stack.RepoTag;
 import org.apache.ambari.server.state.stack.RepositoryXml;
 import org.apache.ambari.server.state.stack.WidgetLayout;
 import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
@@ -4389,7 +4388,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 for (RepositoryXml.Repo repo : os.getRepos()) {
   RepositoryResponse resp = new RepositoryResponse(repo.getBaseUrl(), 
os.getFamily(),
   repo.getRepoId(), repo.getRepoName(), repo.getDistribution(), 
repo.getComponents(), repo.getMirrorsList(),
-  repo.getBaseUrl(), Collections.emptySet());
+  repo.getBaseUrl(), repo.getTags());
 
   resp.setVersionDefinitionId(versionDefinitionId);
   resp.setStackName(stackId.getStackName());
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 7f0127f..1651f1a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -691,6 +691,7 @@ public class AmbariServer {
   apiConnector = new ServerConnector(server, acceptors, -1,
 new SslConnectionFactory(contextFactoryApi, 
HttpVersion.HTTP_1_1.toString()),
 new HttpConnectionFactory(https_config));
+  apiConnector.setPort(configs.getClientSSLApiPort());
 } else  {
   apiConnector = new ServerConnector(server, acceptors, -1, new 
HttpConnectionFactory(http_config));
   apiConnector.setPort(configs.getClientApiPort());

-- 
To stop receiving notification emails like this one, please contact
mpapirkovs...@apache.org.

[ambari] branch branch-2.6 updated: AMBARI-23055. GPL repo is not hidden when default version is chosen in UI. (mpapirkovskyy)

2018-03-07 Thread mpapirkovskyy 
This is an automated email from the ASF dual-hosted git repository.

mpapirkovskyy pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
 new 1ec645a  AMBARI-23055. GPL repo is not hidden when default version is 
chosen in UI. (mpapirkovskyy)
1ec645a is described below

commit 1ec645afbda1a0d5fdb4507c62aa26eb46be98c7
Author: Myroslav Papirkovskyi 
AuthorDate: Tue Mar 6 15:16:26 2018 +0200

AMBARI-23055. GPL repo is not hidden when default version is chosen in UI. 
(mpapirkovskyy)
---
 .../apache/ambari/server/controller/AmbariManagementControllerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 2f49bf3..2611e5a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -4506,7 +4506,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 for (RepositoryXml.Repo repo : os.getRepos()) {
   RepositoryResponse resp = new RepositoryResponse(repo.getBaseUrl(), 
os.getFamily(),
   repo.getRepoId(), repo.getRepoName(), repo.getDistribution(), 
repo.getComponents(), repo.getMirrorsList(),
-  repo.getBaseUrl(), repo.getLatestUri(), 
Collections.emptyList(), Collections.emptySet());
+  repo.getBaseUrl(), repo.getLatestUri(), 
Collections.emptyList(), repo.getTags());
 
   resp.setVersionDefinitionId(versionDefinitionId);
   resp.setStackName(stackId.getStackName());

-- 
To stop receiving notification emails like this one, please contact
mpapirkovs...@apache.org.

[ambari] branch branch-2.6 updated (7cf6ad6 -> fe6462b)

2018-03-07 Thread alexantonenko 
This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a change to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from 7cf6ad6  AMBARI-23106. Optionally generate localjceks://file/{path} 
url (#494)
 add 3f74eda  AMBARI-23162. Pass full stack version in recommendation 
request (alexantonenko)
 new fe6462b  Merge pull request #572 from hiveww/AMBARI-23162-branch-2.6

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.


Summary of changes:
 ambari-web/app/app.js   |  1 +
 ambari-web/app/config.js|  1 +
 ambari-web/app/controllers/installer.js |  8 ++--
 ambari-web/app/models/repository.js |  2 +-
 ambari-web/app/utils/ajax/ajax.js   | 20 
 5 files changed, 29 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
alexantone...@apache.org.

[ambari] 01/01: Merge pull request #572 from hiveww/AMBARI-23162-branch-2.6

2018-03-07 Thread alexantonenko 
This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit fe6462b55c4c15a194e2ae42bca5c0b5912fa59e
Merge: 7cf6ad6 3f74eda
Author: Alexander Antonenko 
AuthorDate: Wed Mar 7 15:04:37 2018 +0200

Merge pull request #572 from hiveww/AMBARI-23162-branch-2.6

AMBARI-23162. Pass full stack version in recommendation request (alex…

 ambari-web/app/app.js   |  1 +
 ambari-web/app/config.js|  1 +
 ambari-web/app/controllers/installer.js |  8 ++--
 ambari-web/app/models/repository.js |  2 +-
 ambari-web/app/utils/ajax/ajax.js   | 20 
 5 files changed, 29 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
alexantone...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-22614 fix OrmTestHelper to support mpacks in unit tests (benyoka) (#569)

2018-03-07 Thread benyoka 
This is an automated email from the ASF dual-hosted git repository.

benyoka pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new f471285  AMBARI-22614 fix OrmTestHelper to support mpacks in unit 
tests (benyoka) (#569)
f471285 is described below

commit f47128513300add98bba9478cf92ce5accd55213
Author: benyoka 
AuthorDate: Wed Mar 7 10:40:11 2018 +0100

AMBARI-22614 fix OrmTestHelper to support mpacks in unit tests (benyoka) 
(#569)
---
 .../apache/ambari/server/orm/OrmTestHelper.java| 29 --
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
index 9756bda..fbc041d 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
@@ -49,6 +49,7 @@ import org.apache.ambari.server.orm.dao.ClusterDAO;
 import org.apache.ambari.server.orm.dao.HostDAO;
 import org.apache.ambari.server.orm.dao.HostRoleCommandDAO;
 import org.apache.ambari.server.orm.dao.HostVersionDAO;
+import org.apache.ambari.server.orm.dao.MpackDAO;
 import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
 import org.apache.ambari.server.orm.dao.RequestDAO;
 import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
@@ -65,6 +66,7 @@ import org.apache.ambari.server.orm.entities.HostEntity;
 import org.apache.ambari.server.orm.entities.HostRoleCommandEntity;
 import org.apache.ambari.server.orm.entities.HostStateEntity;
 import org.apache.ambari.server.orm.entities.HostVersionEntity;
+import org.apache.ambari.server.orm.entities.MpackEntity;
 import org.apache.ambari.server.orm.entities.PrincipalEntity;
 import org.apache.ambari.server.orm.entities.PrincipalTypeEntity;
 import org.apache.ambari.server.orm.entities.RepoDefinitionEntity;
@@ -144,6 +146,9 @@ public class OrmTestHelper {
   @Inject
   private StackDAO stackDAO;
 
+  @Inject
+  MpackDAO mpackDAO;
+
   private static final StackId HDP_206 = new StackId("HDP", "2.0.6");
   public static final StackId STACK_ID = new StackId("HDP", "2.2.0");
   public static final String CLUSTER_NAME = "test_cluster1";
@@ -327,13 +332,32 @@ public class OrmTestHelper {
   }
 
   @Transactional
+  public MpackEntity createMpack(StackId stackId) throws AmbariException {
+List mpackEntities =
+  mpackDAO.findByNameVersion(stackId.getStackName(), 
stackId.getStackVersion());
+MpackEntity mpackEntity = !mpackEntities.isEmpty() ? mpackEntities.get(0) 
: null;
+if (mpackEntities.isEmpty()) {
+  mpackEntity = new MpackEntity();
+  mpackEntity.setMpackName(stackId.getStackName());
+  mpackEntity.setMpackVersion(stackId.getStackVersion());
+  mpackEntity.setMpackUri("http://mpacks.org/; + stackId.toString() + 
".json");
+  mpackDAO.create(mpackEntity);
+}
+return mpackEntity;
+  }
+
+  @Transactional
   public StackEntity createStack(StackId stackId) throws AmbariException {
 StackEntity stackEntity = stackDAO.find(stackId.getStackName(), 
stackId.getStackVersion());
-
 if (null == stackEntity) {
   stackEntity = new StackEntity();
   stackEntity.setStackName(stackId.getStackName());
   stackEntity.setStackVersion(stackId.getStackVersion());
+  List mpackEntities =
+mpackDAO.findByNameVersion(stackId.getStackName(), 
stackId.getStackVersion());
+  if (!mpackEntities.isEmpty()) {
+stackEntity.setMpackId(mpackEntities.get(0).getId());
+  }
   stackDAO.create(stackEntity);
 }
 
@@ -669,6 +693,7 @@ public class OrmTestHelper {
   String version) {
 StackEntity stackEntity = null;
 try {
+  createMpack(stackId); // creating mpack before stack makes sure stack 
will be linked to mpack
   stackEntity = createStack(stackId);
 } catch (Exception e) {
   LOG.error("Expected successful repository", e);
@@ -695,9 +720,9 @@ public class OrmTestHelper {
 repoOsEntity.setAmbariManaged(true);
 repoOsEntity.addRepoDefinition(repoDefinitionEntity1);
 repoOsEntity.addRepoDefinition(repoDefinitionEntity2);
+repoOsEntity.setMpackEntity(createMpack(stackId));
 operatingSystems.add(repoOsEntity);
 
-
 repositoryVersion = repositoryVersionDAO.create(stackEntity, version,
 String.valueOf(System.currentTimeMillis()) + 
uniqueCounter.incrementAndGet(), operatingSystems);
 

-- 
To stop receiving notification emails like this one, please contact
beny...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-23130] Persist cluster creation request (#559)

2018-03-07 Thread benyoka 
This is an automated email from the ASF dual-hosted git repository.

benyoka pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new f4cdbe8  [AMBARI-23130] Persist cluster creation request (#559)
f4cdbe8 is described below

commit f4cdbe83ac21d6433db94d292ba4c4035087ec7d
Author: benyoka 
AuthorDate: Wed Mar 7 10:19:58 2018 +0100

[AMBARI-23130] Persist cluster creation request (#559)

* AMBARI-23130 persist raw cluster provision request and extract stack ids 
on server restart (benyoka)

* AMBARI-23130 add columnt to other DDLs + fix DDLs (benyoka)

* AMBARI-23130 fix review findings (benyoka)
---
 .../controller/internal/BaseClusterRequest.java|  21 
 .../internal/ClusterResourceProvider.java  |   3 +-
 .../controller/internal/HostResourceProvider.java  |   4 +-
 .../internal/ProvisionClusterRequest.java  |   4 +-
 .../controller/internal/ScaleClusterRequest.java   |   3 +-
 .../server/orm/entities/TopologyRequestEntity.java |  18 +++
 .../BlueprintBasedClusterProvisionRequest.java |  16 ++-
 .../server/topology/ClusterTopologyImpl.java   |  10 +-
 .../ambari/server/topology/PersistedStateImpl.java |  19 +++-
 .../ambari/server/topology/TopologyRequest.java|  12 ++
 .../server/topology/TopologyRequestFactory.java|   2 +-
 .../topology/TopologyRequestFactoryImpl.java   |   5 +-
 .../server/topology/TopologyRequestUtil.java   |  76 +
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql |   1 +
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql |   1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql|   7 +-
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  |   1 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql|   1 +
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql |   1 +
 .../internal/ClusterResourceProviderTest.java  |  11 +-
 .../internal/ProvisionClusterRequestTest.java  |  34 +++---
 .../internal/ScaleClusterRequestTest.java  |  20 ++--
 .../server/topology/PersistedStateImplTest.java| 123 +
 .../server/topology/TopologyManagerTest.java   |   2 +-
 .../server/topology/TopologyRequestUtilTest.java   |  60 ++
 25 files changed, 394 insertions(+), 61 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java
index 77eafeb..0d243a2 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java
@@ -29,6 +29,7 @@ import org.apache.ambari.server.api.predicate.Token;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.ResourceProvider;
 import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
+import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.topology.Blueprint;
 import org.apache.ambari.server.topology.BlueprintFactory;
 import org.apache.ambari.server.topology.Configuration;
@@ -36,6 +37,7 @@ import org.apache.ambari.server.topology.HostGroupInfo;
 import org.apache.ambari.server.topology.InvalidTopologyTemplateException;
 import org.apache.ambari.server.topology.SecurityConfiguration;
 import org.apache.ambari.server.topology.TopologyRequest;
+import org.apache.ambari.server.topology.TopologyRequestUtil;
 
 /**
  * Provides common cluster request functionality.
@@ -54,6 +56,11 @@ public abstract class BaseClusterRequest implements 
TopologyRequest {
   protected ProvisionAction provisionAction;
 
   /**
+   * The raw request body. We would like to persist it.
+   */
+  protected String rawRequestBody;
+
+  /**
* cluster id
*/
   protected Long clusterId;
@@ -119,6 +126,19 @@ public abstract class BaseClusterRequest implements 
TopologyRequest {
   }
 
   /**
+   * @return the raw request body in JSON string
+   */
+  public String getRawRequestBody() {
+return rawRequestBody;
+  }
+
+  @Override
+  public Set getStackIds() {
+return TopologyRequestUtil.getStackIdsFromRequest(
+  TopologyRequestUtil.getPropertyMap(rawRequestBody));
+  }
+
+  /**
* Validate that all properties specified in the predicate are valid for the 
Host resource.
*
* @param predicate  predicate to validate
@@ -180,6 +200,7 @@ public abstract class BaseClusterRequest implements 
TopologyRequest {
 return securityConfiguration;
   }
 
+
   /**
* Get the host resource provider instance.
*
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java