You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/06/13 19:06:58 UTC
ambari git commit: AMBARI-17173. Allow option to skip duplicate URL
checking when creating VDF. Part 2 (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk fed0aae14 -> 3935198af
AMBARI-17173. Allow option to skip duplicate URL checking when creating VDF. Part 2 (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3935198a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3935198a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3935198a
Branch: refs/heads/trunk
Commit: 3935198af2493e1a00cb5598c2722125cbd146a6
Parents: fed0aae
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Jun 13 13:51:52 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Jun 13 13:51:59 2016 -0400
----------------------------------------------------------------------
.../RepositoryVersionResourceProvider.java | 18 ++++++++----------
.../VersionDefinitionResourceProviderTest.java | 2 +-
2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3935198a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
index 62568cf..8d6e6e2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
@@ -477,16 +477,14 @@ public class RepositoryVersionResourceProvider extends AbstractAuthorizedResourc
final Set<String> osRepositoryVersion = new HashSet<String>();
- if (!skipUrlCheck) {
- for (OperatingSystemEntity os: repositoryVersion.getOperatingSystems()) {
- osRepositoryVersion.add(os.getOsType());
-
- for (RepositoryEntity repositoryEntity : os.getRepositories()) {
- String baseUrl = repositoryEntity.getBaseUrl();
- if (os.isAmbariManagedRepos() && existingRepoUrls.contains(baseUrl)) {
- throw new AmbariException("Base url " + baseUrl + " is already defined for another repository version. " +
- "Setting up base urls that contain the same versions of components will cause stack upgrade to fail.");
- }
+ for (OperatingSystemEntity os: repositoryVersion.getOperatingSystems()) {
+ osRepositoryVersion.add(os.getOsType());
+
+ for (RepositoryEntity repositoryEntity : os.getRepositories()) {
+ String baseUrl = repositoryEntity.getBaseUrl();
+ if (!skipUrlCheck && os.isAmbariManagedRepos() && existingRepoUrls.contains(baseUrl)) {
+ throw new AmbariException("Base url " + baseUrl + " is already defined for another repository version. " +
+ "Setting up base urls that contain the same versions of components will cause stack upgrade to fail.");
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3935198a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java
index 3bc4aec..6b66f12 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java
@@ -521,7 +521,7 @@ public class VersionDefinitionResourceProviderTest {
Assert.assertNotNull(res.getPropertyValue("VersionDefinition/validation"));
validation = (Set<String>) res.getPropertyValue("VersionDefinition/validation");
- Assert.assertEquals(3, validation.size());
+ Assert.assertEquals(2, validation.size());
for (String reason : validation) {
if (reason.contains("http://baseurl1")) {
Assert.fail("URL validation should be skipped for http://baseurl1");