[36/50] [abbrv] ambari git commit: AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole)
AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole) (cherry picked from commit 589d967638bc72ea1596e60bb0c1b358e888ea09) Change-Id: If50799800da2634e287b2c858844472265517bf0 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c0141992 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0141992 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0141992 Branch: refs/heads/2.5-maint Commit: c01419924ede494db1daf1c6954bf9a9c8b3e2b3 Parents: bf66bf8 Author: Nate ColeAuthored: Tue Aug 22 12:18:01 2017 -0400 Committer: Zuul Committed: Tue Aug 22 14:13:53 2017 -0700 -- .../ClusterStackVersionResourceProvider.java| 52 + ...ClusterStackVersionResourceProviderTest.java | 210 +++ 2 files changed, 214 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c0141992/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java index b489d7f..aba8b9c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java @@ -506,16 +506,15 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou final AmbariManagementController managementController = getManagementController(); final AmbariMetaInfo ami = managementController.getAmbariMetaInfo(); -String osFamily = getPowerPCOsFamily(hosts); // build the list of OS repos List operatingSystems = repoVersionEnt.getOperatingSystems(); Map perOsRepos = new HashMap<>(); for (OperatingSystemEntity operatingSystem : operatingSystems) { - String osType = getOsTypeForRepo(operatingSystem, osFamily); - if (operatingSystem.isAmbariManagedRepos()) { -perOsRepos.put(osType, operatingSystem.getRepositories()); + +if (operatingSystem.isAmbariManagedRepos()) { +perOsRepos.put(operatingSystem.getOsType(), operatingSystem.getRepositories()); } else { -perOsRepos.put(osType, Collections. emptyList()); +perOsRepos.put(operatingSystem.getOsType(), Collections. emptyList()); } } @@ -1089,47 +1088,4 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou amc.getAuthName(), serviceNote); } } - - /** - * Check one host is enough to tell the arch - * because all hosts should have the same arch. - * @param hosts List - * @return osFamily, null if hosts is empty or is X86_64 - - */ - private String getPowerPCOsFamily(List hosts) { -if (hosts.isEmpty()){ - return null; -} else { - Host host = hosts.get(0); - String osFamily = host.getHostAttributes().get("os_family"); - if (null != osFamily && osFamily.endsWith("-ppc")){ -return osFamily; - } else { -return null; - } -} - } - - /** - * Use os type with -ppc post fix for powerpc - * in order to have it consistent with the os information - * stored in the Hosts table - * No need to apply the change if os is x86_64 - * */ - private String getOsTypeForRepo(OperatingSystemEntity operatingSystem, String osFamily) { -if (null != osFamily){ - String osType = operatingSystem.getOsType(); - int pos = osFamily.indexOf("-ppc"); - if (pos > 0){ -String os = osType.substring(0, pos); -String majorVersion = osType.substring(os.length()); -return String.format("%s-ppc%s", os, majorVersion); - } else { -return operatingSystem.getOsType(); - } -} else { - return operatingSystem.getOsType(); -} - } } http://git-wip-us.apache.org/repos/asf/ambari/blob/c0141992/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java -- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index 68596e0..5627756 100644 ---
[22/50] [abbrv] ambari git commit: AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole)
AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/733c78b9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/733c78b9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/733c78b9 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: 733c78b9da84d72c847ed54515c99425ac4ca6b6 Parents: 8b133e4 Author: Nate ColeAuthored: Fri Aug 25 09:43:49 2017 -0400 Committer: Nate Cole Committed: Fri Aug 25 10:51:52 2017 -0400 -- .../ClusterStackVersionResourceProvider.java| 4 +- ...ClusterStackVersionResourceProviderTest.java | 215 ++- contrib/version-builder/version_builder.py | 4 +- 3 files changed, 217 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/733c78b9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java index 105519d..02cfd24 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java @@ -478,11 +478,10 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou List operatingSystems = repoVersionEnt.getOperatingSystems(); Map perOsRepos = new HashMap<>(); for (OperatingSystemEntity operatingSystem : operatingSystems) { - if (operatingSystem.isAmbariManagedRepos()) { perOsRepos.put(operatingSystem.getOsType(), operatingSystem.getRepositories()); } else { -perOsRepos.put(operatingSystem.getOsType(), Collections.emptyList()); +perOsRepos.put(operatingSystem.getOsType(), Collections. emptyList()); } } @@ -724,7 +723,6 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou return (compare == 0) ? 0 : (compare < 0) ? -1 : 1; } - /** * Ensures that the stack tools and stack features are set on * {@link ConfigHelper#CLUSTER_ENV} for the stack of the repository being http://git-wip-us.apache.org/repos/asf/ambari/blob/733c78b9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java -- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index fb45afb..5912ae6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java @@ -50,7 +50,8 @@ import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.Role; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; - import org.apache.ambari.server.actionmanager.Stage; +import org.apache.ambari.server.actionmanager.HostRoleCommand; +import org.apache.ambari.server.actionmanager.Stage; import org.apache.ambari.server.actionmanager.StageFactory; import org.apache.ambari.server.agent.ExecutionCommand; import org.apache.ambari.server.agent.ExecutionCommand.KeyNames; @@ -92,6 +93,7 @@ import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.cluster.ClusterImpl; import org.apache.ambari.server.state.repository.VersionDefinitionXml; import org.apache.ambari.server.state.stack.upgrade.Direction; +import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper; import org.apache.ambari.server.topology.TopologyManager; import org.apache.ambari.server.utils.StageUtils; import org.apache.commons.io.IOUtils; @@ -106,6 +108,7 @@ import org.junit.Test; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -1479,6 +1482,216 @@ public
ambari git commit: AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole)
Repository: ambari Updated Branches: refs/heads/trunk 8b133e499 -> 733c78b9d AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/733c78b9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/733c78b9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/733c78b9 Branch: refs/heads/trunk Commit: 733c78b9da84d72c847ed54515c99425ac4ca6b6 Parents: 8b133e4 Author: Nate ColeAuthored: Fri Aug 25 09:43:49 2017 -0400 Committer: Nate Cole Committed: Fri Aug 25 10:51:52 2017 -0400 -- .../ClusterStackVersionResourceProvider.java| 4 +- ...ClusterStackVersionResourceProviderTest.java | 215 ++- contrib/version-builder/version_builder.py | 4 +- 3 files changed, 217 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/733c78b9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java index 105519d..02cfd24 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java @@ -478,11 +478,10 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou List operatingSystems = repoVersionEnt.getOperatingSystems(); Map perOsRepos = new HashMap<>(); for (OperatingSystemEntity operatingSystem : operatingSystems) { - if (operatingSystem.isAmbariManagedRepos()) { perOsRepos.put(operatingSystem.getOsType(), operatingSystem.getRepositories()); } else { -perOsRepos.put(operatingSystem.getOsType(), Collections.emptyList()); +perOsRepos.put(operatingSystem.getOsType(), Collections. emptyList()); } } @@ -724,7 +723,6 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou return (compare == 0) ? 0 : (compare < 0) ? -1 : 1; } - /** * Ensures that the stack tools and stack features are set on * {@link ConfigHelper#CLUSTER_ENV} for the stack of the repository being http://git-wip-us.apache.org/repos/asf/ambari/blob/733c78b9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java -- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index fb45afb..5912ae6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java @@ -50,7 +50,8 @@ import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.Role; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; - import org.apache.ambari.server.actionmanager.Stage; +import org.apache.ambari.server.actionmanager.HostRoleCommand; +import org.apache.ambari.server.actionmanager.Stage; import org.apache.ambari.server.actionmanager.StageFactory; import org.apache.ambari.server.agent.ExecutionCommand; import org.apache.ambari.server.agent.ExecutionCommand.KeyNames; @@ -92,6 +93,7 @@ import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.cluster.ClusterImpl; import org.apache.ambari.server.state.repository.VersionDefinitionXml; import org.apache.ambari.server.state.stack.upgrade.Direction; +import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper; import org.apache.ambari.server.topology.TopologyManager; import org.apache.ambari.server.utils.StageUtils; import org.apache.commons.io.IOUtils; @@ -106,6 +108,7 @@ import org.junit.Test; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import
ambari git commit: AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole)
Repository: ambari Updated Branches: refs/heads/branch-2.6 952b8cad8 -> e16eb8c08 AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e16eb8c0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e16eb8c0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e16eb8c0 Branch: refs/heads/branch-2.6 Commit: e16eb8c085d98e3c538316df85c8b8baa904ef3f Parents: 952b8ca Author: Nate ColeAuthored: Fri Aug 25 09:08:29 2017 -0400 Committer: Nate Cole Committed: Fri Aug 25 09:11:18 2017 -0400 -- .../ClusterStackVersionResourceProvider.java| 51 + ...ClusterStackVersionResourceProviderTest.java | 212 +++ contrib/version-builder/version_builder.py | 4 +- 3 files changed, 216 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/e16eb8c0/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java index b7d58a3..7a53e91 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java @@ -467,16 +467,14 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou final AmbariManagementController managementController = getManagementController(); final AmbariMetaInfo ami = managementController.getAmbariMetaInfo(); -String osFamily = getPowerPCOsFamily(hosts); // build the list of OS repos List operatingSystems = repoVersionEnt.getOperatingSystems(); Map perOsRepos = new HashMap<>(); for (OperatingSystemEntity operatingSystem : operatingSystems) { - String osType = getOsTypeForRepo(operatingSystem, osFamily); if (operatingSystem.isAmbariManagedRepos()) { -perOsRepos.put(osType, operatingSystem.getRepositories()); +perOsRepos.put(operatingSystem.getOsType(), operatingSystem.getRepositories()); } else { -perOsRepos.put(osType, Collections. emptyList()); +perOsRepos.put(operatingSystem.getOsType(), Collections. emptyList()); } } @@ -723,49 +721,4 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou return (compare == 0) ? 0 : (compare < 0) ? -1 : 1; } - - - - /** - * Check one host is enough to tell the arch - * because all hosts should have the same arch. - * @param hosts List - * @return osFamily, null if hosts is empty or is X86_64 - - */ - private String getPowerPCOsFamily(List hosts) { -if (hosts.isEmpty()){ - return null; -} else { - Host host = hosts.get(0); - String osFamily = host.getHostAttributes().get("os_family"); - if (null != osFamily && osFamily.endsWith("-ppc")){ -return osFamily; - } else { -return null; - } -} - } - - /** - * Use os type with -ppc post fix for powerpc - * in order to have it consistent with the os information - * stored in the Hosts table - * No need to apply the change if os is x86_64 - * */ - private String getOsTypeForRepo(OperatingSystemEntity operatingSystem, String osFamily) { -if (null != osFamily){ - String osType = operatingSystem.getOsType(); - int pos = osFamily.indexOf("-ppc"); - if (pos > 0){ -String os = osType.substring(0, pos); -String majorVersion = osType.substring(os.length()); -return String.format("%s-ppc%s", os, majorVersion); - } else { -return operatingSystem.getOsType(); - } -} else { - return operatingSystem.getOsType(); -} - } } http://git-wip-us.apache.org/repos/asf/ambari/blob/e16eb8c0/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java -- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index 604cbc9..282f159 100644 ---
ambari git commit: AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole)
Repository: ambari Updated Branches: refs/heads/branch-2.5 6e5fbe519 -> 589d96763 AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/589d9676 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/589d9676 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/589d9676 Branch: refs/heads/branch-2.5 Commit: 589d967638bc72ea1596e60bb0c1b358e888ea09 Parents: 6e5fbe5 Author: Nate ColeAuthored: Tue Aug 22 12:18:01 2017 -0400 Committer: Nate Cole Committed: Tue Aug 22 14:03:59 2017 -0400 -- .../ClusterStackVersionResourceProvider.java| 52 + ...ClusterStackVersionResourceProviderTest.java | 210 +++ 2 files changed, 214 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/589d9676/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java index b489d7f..aba8b9c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java @@ -506,16 +506,15 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou final AmbariManagementController managementController = getManagementController(); final AmbariMetaInfo ami = managementController.getAmbariMetaInfo(); -String osFamily = getPowerPCOsFamily(hosts); // build the list of OS repos List operatingSystems = repoVersionEnt.getOperatingSystems(); Map perOsRepos = new HashMap<>(); for (OperatingSystemEntity operatingSystem : operatingSystems) { - String osType = getOsTypeForRepo(operatingSystem, osFamily); - if (operatingSystem.isAmbariManagedRepos()) { -perOsRepos.put(osType, operatingSystem.getRepositories()); + +if (operatingSystem.isAmbariManagedRepos()) { +perOsRepos.put(operatingSystem.getOsType(), operatingSystem.getRepositories()); } else { -perOsRepos.put(osType, Collections. emptyList()); +perOsRepos.put(operatingSystem.getOsType(), Collections. emptyList()); } } @@ -1089,47 +1088,4 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou amc.getAuthName(), serviceNote); } } - - /** - * Check one host is enough to tell the arch - * because all hosts should have the same arch. - * @param hosts List - * @return osFamily, null if hosts is empty or is X86_64 - - */ - private String getPowerPCOsFamily(List hosts) { -if (hosts.isEmpty()){ - return null; -} else { - Host host = hosts.get(0); - String osFamily = host.getHostAttributes().get("os_family"); - if (null != osFamily && osFamily.endsWith("-ppc")){ -return osFamily; - } else { -return null; - } -} - } - - /** - * Use os type with -ppc post fix for powerpc - * in order to have it consistent with the os information - * stored in the Hosts table - * No need to apply the change if os is x86_64 - * */ - private String getOsTypeForRepo(OperatingSystemEntity operatingSystem, String osFamily) { -if (null != osFamily){ - String osType = operatingSystem.getOsType(); - int pos = osFamily.indexOf("-ppc"); - if (pos > 0){ -String os = osType.substring(0, pos); -String majorVersion = osType.substring(os.length()); -return String.format("%s-ppc%s", os, majorVersion); - } else { -return operatingSystem.getOsType(); - } -} else { - return operatingSystem.getOsType(); -} - } } http://git-wip-us.apache.org/repos/asf/ambari/blob/589d9676/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java -- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index 68596e0..5627756 100644 ---