[07/11] ambari git commit: AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version upgrade) (dili)

2017-11-17 Thread jonathanhurley 
AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version 
upgrade) (dili)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/29512573
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/29512573
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/29512573

Branch: refs/heads/branch-feature-AMBARI-22457
Commit: 29512573090948e29d38bb0d259f72b0a5e42e99
Parents: 3279bef
Author: Di Li 
Authored: Thu Nov 16 12:22:35 2017 -0500
Committer: Di Li 
Committed: Thu Nov 16 12:22:35 2017 -0500

--
 .../internal/UpgradeResourceProvider.java   |  36 ++
 .../upgrades/CreateAndConfigureAction.java  | 164 +
 .../ambari/server/state/stack/UpgradePack.java  |   3 +
 .../state/stack/upgrade/ClusterGrouping.java|   2 +
 .../stack/upgrade/CreateAndConfigureTask.java   |  57 +++
 .../ambari/server/state/stack/upgrade/Task.java |   6 +-
 .../src/main/resources/upgrade-pack.xsd |   9 +-
 .../upgrades/CreateAndConfigureActionTest.java  | 357 +++
 8 files changed, 632 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/29512573/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
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 66f5bf9..b6846f7 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
@@ -92,6 +92,7 @@ import 
org.apache.ambari.server.state.UpgradeHelper.UpgradeGroupHolder;
 import org.apache.ambari.server.state.stack.ConfigUpgradePack;
 import org.apache.ambari.server.state.stack.UpgradePack;
 import org.apache.ambari.server.state.stack.upgrade.ConfigureTask;
+import org.apache.ambari.server.state.stack.upgrade.CreateAndConfigureTask;
 import org.apache.ambari.server.state.stack.upgrade.Direction;
 import org.apache.ambari.server.state.stack.upgrade.ManualTask;
 import org.apache.ambari.server.state.stack.upgrade.ServerSideActionTask;
@@ -1336,6 +1337,41 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 
 break;
   }
+  case CREATE_AND_CONFIGURE: {
+CreateAndConfigureTask ct = (CreateAndConfigureTask) task;
+
+// !!! would prefer to do this in the sequence generator, but there's 
too many
+// places to miss
+if (context.getOrchestrationType().isRevertable() && 
!ct.supportsPatch) {
+  process = false;
+}
+
+Map configurationChanges =
+ct.getConfigurationChanges(cluster, configUpgradePack);
+
+// add all configuration changes to the command params
+commandParams.putAll(configurationChanges);
+
+// extract the config type to build the summary
+String configType = 
configurationChanges.get(CreateAndConfigureTask.PARAMETER_CONFIG_TYPE);
+if (null != configType) {
+  itemDetail = String.format("Updating configuration %s", configType);
+} else {
+  itemDetail = "Skipping Configuration Task "
+  + StringUtils.defaultString(ct.id, "(missing id)");
+}
+
+entity.setText(itemDetail);
+
+String configureTaskSummary = ct.getSummary(configUpgradePack);
+if (null != configureTaskSummary) {
+  stageText = configureTaskSummary;
+} else {
+  stageText = itemDetail;
+}
+
+break;
+  }
   default:
 break;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/29512573/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
new file mode 100644
index 000..e60938a
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License,

[48/50] [abbrv] ambari git commit: AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version upgrade) (dili)

2017-11-16 Thread rlevas 
AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version 
upgrade) (dili)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f51b1cca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f51b1cca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f51b1cca

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: f51b1ccabbd952316979a35f398561e962164aab
Parents: a393926
Author: Di Li 
Authored: Thu Nov 16 13:47:56 2017 -0500
Committer: Di Li 
Committed: Thu Nov 16 13:47:56 2017 -0500

--
 .../internal/UpgradeResourceProvider.java   |  36 ++
 .../upgrades/CreateAndConfigureAction.java  | 164 +
 .../ambari/server/state/stack/UpgradePack.java  |   3 +
 .../state/stack/upgrade/ClusterGrouping.java|   2 +
 .../stack/upgrade/CreateAndConfigureTask.java   |  57 +++
 .../ambari/server/state/stack/upgrade/Task.java |   6 +-
 .../src/main/resources/upgrade-pack.xsd |   9 +-
 .../upgrades/CreateAndConfigureActionTest.java  | 357 +++
 8 files changed, 632 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f51b1cca/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
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 d4111d6..e4dd441 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
@@ -93,6 +93,7 @@ import 
org.apache.ambari.server.state.UpgradeHelper.UpgradeGroupHolder;
 import org.apache.ambari.server.state.stack.ConfigUpgradePack;
 import org.apache.ambari.server.state.stack.UpgradePack;
 import org.apache.ambari.server.state.stack.upgrade.ConfigureTask;
+import org.apache.ambari.server.state.stack.upgrade.CreateAndConfigureTask;
 import org.apache.ambari.server.state.stack.upgrade.Direction;
 import org.apache.ambari.server.state.stack.upgrade.ManualTask;
 import org.apache.ambari.server.state.stack.upgrade.ServerSideActionTask;
@@ -1341,6 +1342,41 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 
 break;
   }
+  case CREATE_AND_CONFIGURE: {
+CreateAndConfigureTask ct = (CreateAndConfigureTask) task;
+
+// !!! would prefer to do this in the sequence generator, but there's 
too many
+// places to miss
+if (context.getOrchestrationType().isRevertable() && 
!ct.supportsPatch) {
+  process = false;
+}
+
+Map configurationChanges =
+ct.getConfigurationChanges(cluster, configUpgradePack);
+
+// add all configuration changes to the command params
+commandParams.putAll(configurationChanges);
+
+// extract the config type to build the summary
+String configType = 
configurationChanges.get(CreateAndConfigureTask.PARAMETER_CONFIG_TYPE);
+if (null != configType) {
+  itemDetail = String.format("Updating configuration %s", configType);
+} else {
+  itemDetail = "Skipping Configuration Task "
+  + StringUtils.defaultString(ct.id, "(missing id)");
+}
+
+entity.setText(itemDetail);
+
+String configureTaskSummary = ct.getSummary(configUpgradePack);
+if (null != configureTaskSummary) {
+  stageText = configureTaskSummary;
+} else {
+  stageText = itemDetail;
+}
+
+break;
+  }
   default:
 break;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/f51b1cca/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
new file mode 100644
index 000..e60938a
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License,

ambari git commit: AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version upgrade) (dili)

2017-11-16 Thread dili 
Repository: ambari
Updated Branches:
  refs/heads/trunk a393926c5 -> f51b1ccab


AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version 
upgrade) (dili)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f51b1cca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f51b1cca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f51b1cca

Branch: refs/heads/trunk
Commit: f51b1ccabbd952316979a35f398561e962164aab
Parents: a393926
Author: Di Li 
Authored: Thu Nov 16 13:47:56 2017 -0500
Committer: Di Li 
Committed: Thu Nov 16 13:47:56 2017 -0500

--
 .../internal/UpgradeResourceProvider.java   |  36 ++
 .../upgrades/CreateAndConfigureAction.java  | 164 +
 .../ambari/server/state/stack/UpgradePack.java  |   3 +
 .../state/stack/upgrade/ClusterGrouping.java|   2 +
 .../stack/upgrade/CreateAndConfigureTask.java   |  57 +++
 .../ambari/server/state/stack/upgrade/Task.java |   6 +-
 .../src/main/resources/upgrade-pack.xsd |   9 +-
 .../upgrades/CreateAndConfigureActionTest.java  | 357 +++
 8 files changed, 632 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f51b1cca/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
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 d4111d6..e4dd441 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
@@ -93,6 +93,7 @@ import 
org.apache.ambari.server.state.UpgradeHelper.UpgradeGroupHolder;
 import org.apache.ambari.server.state.stack.ConfigUpgradePack;
 import org.apache.ambari.server.state.stack.UpgradePack;
 import org.apache.ambari.server.state.stack.upgrade.ConfigureTask;
+import org.apache.ambari.server.state.stack.upgrade.CreateAndConfigureTask;
 import org.apache.ambari.server.state.stack.upgrade.Direction;
 import org.apache.ambari.server.state.stack.upgrade.ManualTask;
 import org.apache.ambari.server.state.stack.upgrade.ServerSideActionTask;
@@ -1341,6 +1342,41 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 
 break;
   }
+  case CREATE_AND_CONFIGURE: {
+CreateAndConfigureTask ct = (CreateAndConfigureTask) task;
+
+// !!! would prefer to do this in the sequence generator, but there's 
too many
+// places to miss
+if (context.getOrchestrationType().isRevertable() && 
!ct.supportsPatch) {
+  process = false;
+}
+
+Map configurationChanges =
+ct.getConfigurationChanges(cluster, configUpgradePack);
+
+// add all configuration changes to the command params
+commandParams.putAll(configurationChanges);
+
+// extract the config type to build the summary
+String configType = 
configurationChanges.get(CreateAndConfigureTask.PARAMETER_CONFIG_TYPE);
+if (null != configType) {
+  itemDetail = String.format("Updating configuration %s", configType);
+} else {
+  itemDetail = "Skipping Configuration Task "
+  + StringUtils.defaultString(ct.id, "(missing id)");
+}
+
+entity.setText(itemDetail);
+
+String configureTaskSummary = ct.getSummary(configUpgradePack);
+if (null != configureTaskSummary) {
+  stageText = configureTaskSummary;
+} else {
+  stageText = itemDetail;
+}
+
+break;
+  }
   default:
 break;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/f51b1cca/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
new file mode 100644
index 000..e60938a
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The

ambari git commit: AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version upgrade) (dili)

2017-11-16 Thread dili 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 3279bef52 -> 295125730


AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version 
upgrade) (dili)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/29512573
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/29512573
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/29512573

Branch: refs/heads/branch-2.6
Commit: 29512573090948e29d38bb0d259f72b0a5e42e99
Parents: 3279bef
Author: Di Li 
Authored: Thu Nov 16 12:22:35 2017 -0500
Committer: Di Li 
Committed: Thu Nov 16 12:22:35 2017 -0500

--
 .../internal/UpgradeResourceProvider.java   |  36 ++
 .../upgrades/CreateAndConfigureAction.java  | 164 +
 .../ambari/server/state/stack/UpgradePack.java  |   3 +
 .../state/stack/upgrade/ClusterGrouping.java|   2 +
 .../stack/upgrade/CreateAndConfigureTask.java   |  57 +++
 .../ambari/server/state/stack/upgrade/Task.java |   6 +-
 .../src/main/resources/upgrade-pack.xsd |   9 +-
 .../upgrades/CreateAndConfigureActionTest.java  | 357 +++
 8 files changed, 632 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/29512573/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
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 66f5bf9..b6846f7 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
@@ -92,6 +92,7 @@ import 
org.apache.ambari.server.state.UpgradeHelper.UpgradeGroupHolder;
 import org.apache.ambari.server.state.stack.ConfigUpgradePack;
 import org.apache.ambari.server.state.stack.UpgradePack;
 import org.apache.ambari.server.state.stack.upgrade.ConfigureTask;
+import org.apache.ambari.server.state.stack.upgrade.CreateAndConfigureTask;
 import org.apache.ambari.server.state.stack.upgrade.Direction;
 import org.apache.ambari.server.state.stack.upgrade.ManualTask;
 import org.apache.ambari.server.state.stack.upgrade.ServerSideActionTask;
@@ -1336,6 +1337,41 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 
 break;
   }
+  case CREATE_AND_CONFIGURE: {
+CreateAndConfigureTask ct = (CreateAndConfigureTask) task;
+
+// !!! would prefer to do this in the sequence generator, but there's 
too many
+// places to miss
+if (context.getOrchestrationType().isRevertable() && 
!ct.supportsPatch) {
+  process = false;
+}
+
+Map configurationChanges =
+ct.getConfigurationChanges(cluster, configUpgradePack);
+
+// add all configuration changes to the command params
+commandParams.putAll(configurationChanges);
+
+// extract the config type to build the summary
+String configType = 
configurationChanges.get(CreateAndConfigureTask.PARAMETER_CONFIG_TYPE);
+if (null != configType) {
+  itemDetail = String.format("Updating configuration %s", configType);
+} else {
+  itemDetail = "Skipping Configuration Task "
+  + StringUtils.defaultString(ct.id, "(missing id)");
+}
+
+entity.setText(itemDetail);
+
+String configureTaskSummary = ct.getSummary(configUpgradePack);
+if (null != configureTaskSummary) {
+  stageText = configureTaskSummary;
+} else {
+  stageText = itemDetail;
+}
+
+break;
+  }
   default:
 break;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/29512573/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
new file mode 100644
index 000..e60938a
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright