Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-14714-blueprintv2 de877aa7f -> b3ae38154
AMBARI-22614. Remove temporary workaround for setRepoVersion (adoroszlai) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3ae3815 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3ae3815 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3ae3815 Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2 Commit: b3ae381546dea2f3a5182c90fbeaf8bfb338859a Parents: de877aa Author: Doroszlai, Attila <adorosz...@hortonworks.com> Authored: Fri Dec 8 20:48:58 2017 +0100 Committer: Doroszlai, Attila <adorosz...@hortonworks.com> Committed: Fri Dec 8 20:48:58 2017 +0100 ---------------------------------------------------------------------- .../ambari/server/stack/StackManager.java | 3 --- .../apache/ambari/server/orm/OrmTestHelper.java | 21 ++------------------ .../server/state/cluster/ClusterImplTest.java | 6 +++--- .../server/state/cluster/ClustersTest.java | 10 +++++----- .../ConcurrentServiceConfigVersionTest.java | 2 +- ...omponentHostConcurrentWriteDeadlockTest.java | 2 +- 6 files changed, 12 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b3ae3815/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java index dc77f19..fc49a24 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java @@ -307,9 +307,6 @@ public class StackManager { stackEntity.setStackName(stackName); stackEntity.setStackVersion(stackVersion); - //TODO this is hack which should be removed during merge with BP branch - stackEntity.setRepoVersion(""); - stackDao.create(stackEntity); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/b3ae3815/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java ---------------------------------------------------------------------- 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 dafc5e8..557d5c2 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 @@ -328,22 +328,6 @@ public class OrmTestHelper { return stackEntity; } - //TODO this is hack which should be removed during merge with BP branch - @Transactional - public StackEntity createStackWithRepoVersion(StackId stackId, String repoVersion) throws AmbariException { - StackEntity stackEntity = stackDAO.find(stackId.getStackName(), stackId.getStackVersion()); - - if (null == stackEntity) { - stackEntity = new StackEntity(); - stackEntity.setStackName(stackId.getStackName()); - stackEntity.setStackVersion(stackId.getStackVersion()); - stackEntity.setRepoVersion(repoVersion); - stackDAO.create(stackEntity); - } - - return stackEntity; - } - /** * Creates an empty cluster with an ID. * @@ -671,11 +655,10 @@ public class OrmTestHelper { * @param version stack version * @return repository version */ - public RepositoryVersionEntity getOrCreateRepositoryVersion(StackId stackId, - String version) { + public RepositoryVersionEntity getOrCreateRepositoryVersion(StackId stackId, String version) { StackEntity stackEntity = null; try { - stackEntity = createStackWithRepoVersion(stackId, version); + stackEntity = createStack(stackId); } catch (Exception e) { LOG.error("Expected successful repository", e); } http://git-wip-us.apache.org/repos/asf/ambari/blob/b3ae3815/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java index d40679a..2f52065 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java @@ -215,7 +215,7 @@ public class ClusterImplTest { String stackVersion = "HDP-2.1.1"; String repoVersion = "2.1.1-1234"; StackId stackId = new StackId(stackVersion); - ormTestHelper.createStackWithRepoVersion(stackId, ""); + ormTestHelper.createStack(stackId); clusters.addCluster(clusterName, stackId); Cluster cluster = clusters.getCluster(clusterName); @@ -277,7 +277,7 @@ public class ClusterImplTest { String hostToDelete = hostName2; StackId stackId = new StackId("HDP-2.1.1"); - ormTestHelper.createStackWithRepoVersion(stackId, ""); + ormTestHelper.createStack(stackId); clusters.addCluster(clusterName, stackId); Cluster cluster = clusters.getCluster(clusterName); @@ -317,7 +317,7 @@ public class ClusterImplTest { String clusterName = "TEST_CLUSTER_SIZE"; String hostName1 = "host1", hostName2 = "host2"; StackId stackId = new StackId("HDP", "2.1.1"); - ormTestHelper.createStackWithRepoVersion(stackId, ""); + ormTestHelper.createStack(stackId); clusters.addCluster(clusterName, stackId); Cluster cluster = clusters.getCluster(clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/b3ae3815/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java index 730d51c..24b42e8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java @@ -145,7 +145,7 @@ public class ClustersTest { public void testAddAndGetCluster() throws AmbariException { StackId stackId = new StackId("HDP-2.1.1"); - helper.createStackWithRepoVersion(stackId,""); + helper.createStack(stackId); String c1 = "foo"; String c2 = "foo"; @@ -199,7 +199,7 @@ public class ClustersTest { public void testAddAndGetClusterWithSecurityType() throws AmbariException { StackId stackId = new StackId("HDP-2.1.1"); - helper.createStackWithRepoVersion(stackId, ""); + helper.createStack(stackId); String c1 = "foo"; SecurityType securityType = SecurityType.KERBEROS; @@ -266,7 +266,7 @@ public class ClustersTest { StackId stackId = new StackId("HDP-0.1"); - helper.createStackWithRepoVersion(stackId, ""); + helper.createStack(stackId); clusters.addCluster(c1, stackId); clusters.addCluster(c2, stackId); @@ -352,7 +352,7 @@ public class ClustersTest { StackId stackId = new StackId("HDP-0.1"); - helper.createStackWithRepoVersion(stackId, ""); + helper.createStack(stackId); clusters.addCluster(c1, stackId); clusters.addCluster(c2, stackId); @@ -385,7 +385,7 @@ public class ClustersTest { StackId stackId = new StackId("HDP-0.1"); - helper.createStackWithRepoVersion(stackId, ""); + helper.createStack(stackId); clusters.addCluster(c1, stackId); http://git-wip-us.apache.org/repos/asf/ambari/blob/b3ae3815/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java index 558b334..a91319e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java @@ -119,7 +119,7 @@ public class ConcurrentServiceConfigVersionTest { injector.getInstance(GuiceJpaInitializer.class); injector.injectMembers(this); repositoryVersion = helper.getOrCreateRepositoryVersion(stackId, stackId.getStackVersion()); - helper.createStackWithRepoVersion(stackId, repositoryVersion.getVersion()); + helper.createStack(stackId); clusters.addCluster("c1", stackId); cluster = clusters.getCluster("c1"); serviceGroup = serviceGroupFactory.createNew(cluster, "test_service_group", new HashSet<ServiceGroupKey>()); http://git-wip-us.apache.org/repos/asf/ambari/blob/b3ae3815/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java index ca7a7ac..a62dd6e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java @@ -123,7 +123,7 @@ public class ServiceComponentHostConcurrentWriteDeadlockTest { OrmTestHelper helper = injector.getInstance(OrmTestHelper.class); m_repositoryVersion = helper.getOrCreateRepositoryVersion(stackId, REPO_VERSION); - helper.createStackWithRepoVersion(stackId, m_repositoryVersion.getVersion()); + helper.createStack(stackId); clusters.addCluster("c1", stackId); cluster = clusters.getCluster("c1"); serviceGroup = serviceGroupFactory.createNew(cluster, "test_service_group", new HashSet<ServiceGroupKey>());
