ambari git commit: AMBARI-22312 - Downgrade From HDP 2.6 to 2.5 Leaves 2.6 Hosts as CURRENT Instead of INSTALLED (jonathanhurley)

2017-10-31 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 804d654e1 -> 772c7a8a7


AMBARI-22312 - Downgrade From HDP 2.6 to 2.5 Leaves 2.6 Hosts as CURRENT 
Instead of INSTALLED (jonathanhurley)


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

Branch: refs/heads/branch-2.6
Commit: 772c7a8a7f58ad4984c03c798e2807ad1f698c3e
Parents: 804d654
Author: Jonathan Hurley 
Authored: Wed Oct 25 15:55:34 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Oct 25 16:50:35 2017 -0400

--
 .../AmbariManagementControllerImpl.java | 13 +++--
 .../upgrades/FinalizeUpgradeAction.java | 54 ++--
 2 files changed, 36 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/772c7a8a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
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 2150f7e..5ea4bbd 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
@@ -908,9 +908,16 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 
 StackId stackId = null;
 if (null != service) {
-  Service svc = cluster.getService(service);
-  stackId = svc.getDesiredStackId();
-} else {
+  try {
+Service svc = cluster.getService(service);
+stackId = svc.getDesiredStackId();
+  } catch (AmbariException ambariException) {
+LOG.warn("Adding configurations for {} even though its parent service 
{} is not installed",
+configType, service);
+  }
+}
+
+if (null == stackId) {
   stackId = cluster.getDesiredStackVersion();
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/772c7a8a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 4d5f3ba..026b926 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -196,7 +196,7 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 
   // move host versions from CURRENT to INSTALLED if their repos are no
   // longer used
-  finalizeHostRepositoryVersions(cluster);
+  finalizeHostVersionsNotDesired(cluster);
 
   if (upgradeContext.getOrchestrationType() == RepositoryType.STANDARD) {
 outSB.append(String.format("Finalizing the version for cluster %s.\n", 
cluster.getClusterName()));
@@ -276,38 +276,36 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 throw new AmbariException(messageBuff.toString());
   }
 
+  finalizeHostVersionsNotDesired(cluster);
 
-  if (upgradeContext.isPatchRevert()) {
-finalizeHostRepositoryVersions(cluster);
-  } else {
-// for every repository being downgraded to, ensure the host versions 
are correct
-Map targetVersionsByService = 
upgradeContext.getTargetVersions();
-Set targetRepositoryVersions = new 
HashSet<>();
-for (String service : targetVersionsByService.keySet()) {
-  targetRepositoryVersions.add(targetVersionsByService.get(service));
-}
+  // for every repository being downgraded to, ensure the host versions 
are correct
+  Map targetVersionsByService = 
upgradeContext.getTargetVersions();
+  Set targetRepositoryVersions = new HashSet<>();
+  for (String service : targetVersionsByService.keySet()) {
+targetRepositoryVersions.add(targetVersionsByService.get(service));
+  }
 
-for (RepositoryVersionEntity targetRepositoryVersion : 
targetRepositoryVersions) {
-  // find host versions
-  List hostVersions = 
hostVersionDAO.findHostVersionByClusterAndRepository(
-  cluster.getClusterId(), targetRepositoryVersion);
+  // move host versions in the downgrade back to CURRENT i

[37/56] [abbrv] ambari git commit: AMBARI-22312 - Downgrade From HDP 2.6 to 2.5 Leaves 2.6 Hosts as CURRENT Instead of INSTALLED (jonathanhurley)

2017-10-30 Thread mradhakrishnan 
AMBARI-22312 - Downgrade From HDP 2.6 to 2.5 Leaves 2.6 Hosts as CURRENT 
Instead of INSTALLED (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 83e8b67223cc35134476adf7c79e365c74b808d4
Parents: d1d118d
Author: Jonathan Hurley 
Authored: Wed Oct 25 20:06:55 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Oct 25 20:06:55 2017 -0400

--
 .../AmbariManagementControllerImpl.java | 13 +++--
 .../upgrades/FinalizeUpgradeAction.java | 54 ++--
 2 files changed, 36 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/83e8b672/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
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 1b1f524..380e1b4 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
@@ -909,9 +909,16 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 
 StackId stackId = null;
 if (null != service) {
-  Service svc = cluster.getService(service);
-  stackId = svc.getDesiredStackId();
-} else {
+  try {
+Service svc = cluster.getService(service);
+stackId = svc.getDesiredStackId();
+  } catch (AmbariException ambariException) {
+LOG.warn("Adding configurations for {} even though its parent service 
{} is not installed",
+configType, service);
+  }
+}
+
+if (null == stackId) {
   stackId = cluster.getDesiredStackVersion();
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/83e8b672/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 87ea1fc..755f28e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -200,7 +200,7 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 
   // move host versions from CURRENT to INSTALLED if their repos are no
   // longer used
-  finalizeHostRepositoryVersions(cluster);
+  finalizeHostVersionsNotDesired(cluster);
 
   if (upgradeContext.getOrchestrationType() == RepositoryType.STANDARD) {
 outSB.append(String.format("Finalizing the version for cluster %s.\n", 
cluster.getClusterName()));
@@ -280,38 +280,36 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 throw new AmbariException(messageBuff.toString());
   }
 
+  finalizeHostVersionsNotDesired(cluster);
 
-  if (upgradeContext.isPatchRevert()) {
-finalizeHostRepositoryVersions(cluster);
-  } else {
-// for every repository being downgraded to, ensure the host versions 
are correct
-Map targetVersionsByService = 
upgradeContext.getTargetVersions();
-Set targetRepositoryVersions = new 
HashSet<>();
-for (String service : targetVersionsByService.keySet()) {
-  targetRepositoryVersions.add(targetVersionsByService.get(service));
-}
+  // for every repository being downgraded to, ensure the host versions 
are correct
+  Map targetVersionsByService = 
upgradeContext.getTargetVersions();
+  Set targetRepositoryVersions = new HashSet<>();
+  for (String service : targetVersionsByService.keySet()) {
+targetRepositoryVersions.add(targetVersionsByService.get(service));
+  }
 
-for (RepositoryVersionEntity targetRepositoryVersion : 
targetRepositoryVersions) {
-  // find host versions
-  List hostVersions = 
hostVersionDAO.findHostVersionByClusterAndRepository(
-  cluster.getClusterId(), targetRepositoryVersion);
+  // move host versions in the downgrade back to CURRENT if they are not
+  for (RepositoryVersionEntity targetRepositoryVe

[37/71] [abbrv] ambari git commit: AMBARI-22312 - Downgrade From HDP 2.6 to 2.5 Leaves 2.6 Hosts as CURRENT Instead of INSTALLED (jonathanhurley)

2017-10-26 Thread lpuskas 
AMBARI-22312 - Downgrade From HDP 2.6 to 2.5 Leaves 2.6 Hosts as CURRENT 
Instead of INSTALLED (jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 83e8b67223cc35134476adf7c79e365c74b808d4
Parents: d1d118d
Author: Jonathan Hurley 
Authored: Wed Oct 25 20:06:55 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Oct 25 20:06:55 2017 -0400

--
 .../AmbariManagementControllerImpl.java | 13 +++--
 .../upgrades/FinalizeUpgradeAction.java | 54 ++--
 2 files changed, 36 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/83e8b672/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
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 1b1f524..380e1b4 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
@@ -909,9 +909,16 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 
 StackId stackId = null;
 if (null != service) {
-  Service svc = cluster.getService(service);
-  stackId = svc.getDesiredStackId();
-} else {
+  try {
+Service svc = cluster.getService(service);
+stackId = svc.getDesiredStackId();
+  } catch (AmbariException ambariException) {
+LOG.warn("Adding configurations for {} even though its parent service 
{} is not installed",
+configType, service);
+  }
+}
+
+if (null == stackId) {
   stackId = cluster.getDesiredStackVersion();
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/83e8b672/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 87ea1fc..755f28e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -200,7 +200,7 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 
   // move host versions from CURRENT to INSTALLED if their repos are no
   // longer used
-  finalizeHostRepositoryVersions(cluster);
+  finalizeHostVersionsNotDesired(cluster);
 
   if (upgradeContext.getOrchestrationType() == RepositoryType.STANDARD) {
 outSB.append(String.format("Finalizing the version for cluster %s.\n", 
cluster.getClusterName()));
@@ -280,38 +280,36 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 throw new AmbariException(messageBuff.toString());
   }
 
+  finalizeHostVersionsNotDesired(cluster);
 
-  if (upgradeContext.isPatchRevert()) {
-finalizeHostRepositoryVersions(cluster);
-  } else {
-// for every repository being downgraded to, ensure the host versions 
are correct
-Map targetVersionsByService = 
upgradeContext.getTargetVersions();
-Set targetRepositoryVersions = new 
HashSet<>();
-for (String service : targetVersionsByService.keySet()) {
-  targetRepositoryVersions.add(targetVersionsByService.get(service));
-}
+  // for every repository being downgraded to, ensure the host versions 
are correct
+  Map targetVersionsByService = 
upgradeContext.getTargetVersions();
+  Set targetRepositoryVersions = new HashSet<>();
+  for (String service : targetVersionsByService.keySet()) {
+targetRepositoryVersions.add(targetVersionsByService.get(service));
+  }
 
-for (RepositoryVersionEntity targetRepositoryVersion : 
targetRepositoryVersions) {
-  // find host versions
-  List hostVersions = 
hostVersionDAO.findHostVersionByClusterAndRepository(
-  cluster.getClusterId(), targetRepositoryVersion);
+  // move host versions in the downgrade back to CURRENT if they are not
+  for (RepositoryVersionEntity targetRepositoryVe

ambari git commit: AMBARI-22312 - Downgrade From HDP 2.6 to 2.5 Leaves 2.6 Hosts as CURRENT Instead of INSTALLED (jonathanhurley)

2017-10-25 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/trunk d1d118d07 -> 83e8b6722


AMBARI-22312 - Downgrade From HDP 2.6 to 2.5 Leaves 2.6 Hosts as CURRENT 
Instead of INSTALLED (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: 83e8b67223cc35134476adf7c79e365c74b808d4
Parents: d1d118d
Author: Jonathan Hurley 
Authored: Wed Oct 25 20:06:55 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Oct 25 20:06:55 2017 -0400

--
 .../AmbariManagementControllerImpl.java | 13 +++--
 .../upgrades/FinalizeUpgradeAction.java | 54 ++--
 2 files changed, 36 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/83e8b672/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
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 1b1f524..380e1b4 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
@@ -909,9 +909,16 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 
 StackId stackId = null;
 if (null != service) {
-  Service svc = cluster.getService(service);
-  stackId = svc.getDesiredStackId();
-} else {
+  try {
+Service svc = cluster.getService(service);
+stackId = svc.getDesiredStackId();
+  } catch (AmbariException ambariException) {
+LOG.warn("Adding configurations for {} even though its parent service 
{} is not installed",
+configType, service);
+  }
+}
+
+if (null == stackId) {
   stackId = cluster.getDesiredStackVersion();
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/83e8b672/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 87ea1fc..755f28e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -200,7 +200,7 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 
   // move host versions from CURRENT to INSTALLED if their repos are no
   // longer used
-  finalizeHostRepositoryVersions(cluster);
+  finalizeHostVersionsNotDesired(cluster);
 
   if (upgradeContext.getOrchestrationType() == RepositoryType.STANDARD) {
 outSB.append(String.format("Finalizing the version for cluster %s.\n", 
cluster.getClusterName()));
@@ -280,38 +280,36 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 throw new AmbariException(messageBuff.toString());
   }
 
+  finalizeHostVersionsNotDesired(cluster);
 
-  if (upgradeContext.isPatchRevert()) {
-finalizeHostRepositoryVersions(cluster);
-  } else {
-// for every repository being downgraded to, ensure the host versions 
are correct
-Map targetVersionsByService = 
upgradeContext.getTargetVersions();
-Set targetRepositoryVersions = new 
HashSet<>();
-for (String service : targetVersionsByService.keySet()) {
-  targetRepositoryVersions.add(targetVersionsByService.get(service));
-}
+  // for every repository being downgraded to, ensure the host versions 
are correct
+  Map targetVersionsByService = 
upgradeContext.getTargetVersions();
+  Set targetRepositoryVersions = new HashSet<>();
+  for (String service : targetVersionsByService.keySet()) {
+targetRepositoryVersions.add(targetVersionsByService.get(service));
+  }
 
-for (RepositoryVersionEntity targetRepositoryVersion : 
targetRepositoryVersions) {
-  // find host versions
-  List hostVersions = 
hostVersionDAO.findHostVersionByClusterAndRepository(
-  cluster.getClusterId(), targetRepositoryVersion);
+  // move host versions in the downgrade back to CURRENT if they are