Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-18456 20f297803 -> d6a847154
http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a84715/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java index 0f5c432..ff6dfc9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java @@ -184,17 +184,11 @@ public class ServiceTest { s.addServiceComponent(sc3); - sc1.persist(); - sc2.persist(); - sc3.persist(); - ServiceComponent sc4 = s.addServiceComponent("HDFS_CLIENT"); Assert.assertNotNull(s.getServiceComponent(sc4.getName())); Assert.assertEquals(State.INIT, s.getServiceComponent("HDFS_CLIENT").getDesiredState()); Assert.assertTrue(sc4.isClientComponent()); - sc4.persist(); - Assert.assertEquals(4, s.getServiceComponents().size()); Assert.assertNotNull(s.getServiceComponent(sc3.getName())); http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a84715/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java index 39a3948..fa5491e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java @@ -62,8 +62,6 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.persist.PersistService; import com.google.inject.util.Modules; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Tests AMBARI-9368 and AMBARI-9761 which produced a deadlock during read and @@ -611,7 +609,6 @@ public class ClusterDeadlockTest { componentName); service.addServiceComponent(serviceComponent); serviceComponent.setDesiredState(State.INSTALLED); - serviceComponent.persist(); } return serviceComponent; http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a84715/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 811d98b..ca12826 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 @@ -216,23 +216,19 @@ public class ClusterImplTest { Service hdfs = cluster.addService("HDFS"); ServiceComponent nameNode = hdfs.addServiceComponent("NAMENODE"); - nameNode.persist(); nameNode.addServiceComponentHost(hostName1).persist(); ServiceComponent dataNode = hdfs.addServiceComponent("DATANODE"); - dataNode.persist(); dataNode.addServiceComponentHost(hostName1).persist(); dataNode.addServiceComponentHost(hostName2).persist(); ServiceComponent hdfsClient = hdfs.addServiceComponent("HDFS_CLIENT"); - hdfsClient.persist(); hdfsClient.addServiceComponentHost(hostName1).persist(); hdfsClient.addServiceComponentHost(hostName2).persist(); Service tez = cluster.addService(serviceToDelete); ServiceComponent tezClient = tez.addServiceComponent("TEZ_CLIENT"); - tezClient.persist(); ServiceComponentHost tezClientHost1 = tezClient.addServiceComponentHost(hostName1); tezClientHost1.persist(); ServiceComponentHost tezClientHost2 = tezClient.addServiceComponentHost(hostName2); http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a84715/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java index fed9b98..64d8184 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java @@ -391,25 +391,18 @@ public class ClusterTest { s1.addServiceComponent(sc1CompA); s1.addServiceComponent(sc1CompB); s1.addServiceComponent(sc1CompC); - sc1CompA.persist(); - sc1CompB.persist(); - sc1CompC.persist(); // Add ZK ServiceComponent sc2CompA = serviceComponentFactory.createNew(s2, "ZOOKEEPER_SERVER"); ServiceComponent sc2CompB = serviceComponentFactory.createNew(s2, "ZOOKEEPER_CLIENT"); s2.addServiceComponent(sc2CompA); s2.addServiceComponent(sc2CompB); - sc2CompA.persist(); - sc2CompB.persist(); // Add Ganglia ServiceComponent sc3CompA = serviceComponentFactory.createNew(s3, "GANGLIA_SERVER"); ServiceComponent sc3CompB = serviceComponentFactory.createNew(s3, "GANGLIA_MONITOR"); s3.addServiceComponent(sc3CompA); s3.addServiceComponent(sc3CompB); - sc3CompA.persist(); - sc3CompB.persist(); // Host 1 will have all components ServiceComponentHost schHost1Serv1CompA = serviceComponentHostFactory.createNew(sc1CompA, "h-1"); @@ -692,7 +685,7 @@ public class ClusterTest { c1.addService(s); ServiceComponent sc = serviceComponentFactory.createNew(s, "NAMENODE"); s.addServiceComponent(sc); - sc.persist(); + ServiceComponentHost sch = serviceComponentHostFactory.createNew(sc, "h1"); sc.addServiceComponentHost(sch); @@ -711,7 +704,6 @@ public class ClusterTest { c1.addService(s1); ServiceComponent sc1 = serviceComponentFactory.createNew(s1, "PIG"); s1.addServiceComponent(sc1); - sc1.persist(); ServiceComponentHost sch1 = serviceComponentHostFactory.createNew(sc1, "h1"); sc1.addServiceComponentHost(sch1); sch1.persist(); @@ -733,14 +725,12 @@ public class ClusterTest { ServiceComponent scNN = serviceComponentFactory.createNew(s, "NAMENODE"); s.addServiceComponent(scNN); - scNN.persist(); ServiceComponentHost schNNH1 = serviceComponentHostFactory.createNew(scNN, "h1"); scNN.addServiceComponentHost(schNNH1); schNNH1.persist(); ServiceComponent scDN = serviceComponentFactory.createNew(s, "DATANODE"); s.addServiceComponent(scDN); - scDN.persist(); ServiceComponentHost scDNH1 = serviceComponentHostFactory.createNew(scDN, "h1"); scDN.addServiceComponentHost(scDNH1); scDNH1.persist(); @@ -766,14 +756,12 @@ public class ClusterTest { ServiceComponent scNN = serviceComponentFactory.createNew(s, "NAMENODE"); s.addServiceComponent(scNN); - scNN.persist(); ServiceComponentHost schNNH1 = serviceComponentHostFactory.createNew(scNN, "h1"); scNN.addServiceComponentHost(schNNH1); schNNH1.persist(); ServiceComponent scDN = serviceComponentFactory.createNew(s, "DATANODE"); s.addServiceComponent(scDN); - scDN.persist(); ServiceComponentHost scDNH1 = serviceComponentHostFactory.createNew(scDN, "h1"); scDN.addServiceComponentHost(scDNH1); scDNH1.persist(); @@ -805,14 +793,12 @@ public class ClusterTest { ServiceComponent scNN = serviceComponentFactory.createNew(s, "NAMENODE"); s.addServiceComponent(scNN); - scNN.persist(); ServiceComponentHost schNNH1 = serviceComponentHostFactory.createNew(scNN, "h1"); scNN.addServiceComponentHost(schNNH1); schNNH1.persist(); ServiceComponent scDN = serviceComponentFactory.createNew(s, "DATANODE"); s.addServiceComponent(scDN); - scDN.persist(); ServiceComponentHost scDNH1 = serviceComponentHostFactory.createNew(scDN, "h1"); scDN.addServiceComponentHost(scDNH1); scDNH1.persist(); @@ -845,14 +831,12 @@ public class ClusterTest { ServiceComponent scNN = serviceComponentFactory.createNew(sfHDFS, "NAMENODE"); sfHDFS.addServiceComponent(scNN); - scNN.persist(); ServiceComponentHost schNNH1 = serviceComponentHostFactory.createNew(scNN, "h1"); scNN.addServiceComponentHost(schNNH1); schNNH1.persist(); ServiceComponent scDN = serviceComponentFactory.createNew(sfHDFS, "DATANODE"); sfHDFS.addServiceComponent(scDN); - scDN.persist(); ServiceComponentHost scDNH1 = serviceComponentHostFactory.createNew(scDN, "h1"); scDN.addServiceComponentHost(scDNH1); scDNH1.persist(); @@ -862,7 +846,6 @@ public class ClusterTest { ServiceComponent scJT = serviceComponentFactory.createNew(sfMR, "JOBTRACKER"); sfMR.addServiceComponent(scJT); - scJT.persist(); ServiceComponentHost schJTH1 = serviceComponentHostFactory.createNew(scJT, "h1"); scJT.addServiceComponentHost(schJTH1); schJTH1.persist(); @@ -908,14 +891,12 @@ public class ClusterTest { ServiceComponent scNN = serviceComponentFactory.createNew(sfHDFS, "NAMENODE"); sfHDFS.addServiceComponent(scNN); - scNN.persist(); ServiceComponentHost schNNH1 = serviceComponentHostFactory.createNew(scNN, "h1"); scNN.addServiceComponentHost(schNNH1); schNNH1.persist(); ServiceComponent scDN = serviceComponentFactory.createNew(sfHDFS, "DATANODE"); sfHDFS.addServiceComponent(scDN); - scDN.persist(); ServiceComponentHost scDNH1 = serviceComponentHostFactory.createNew(scDN, "h1"); scDN.addServiceComponentHost(scDNH1); scDNH1.persist(); @@ -925,7 +906,6 @@ public class ClusterTest { ServiceComponent scJT = serviceComponentFactory.createNew(sfMR, "JOBTRACKER"); sfMR.addServiceComponent(scJT); - scJT.persist(); ServiceComponentHost schJTH1 = serviceComponentHostFactory.createNew(scJT, "h1"); scJT.addServiceComponentHost(schJTH1); schJTH1.persist(); @@ -972,14 +952,12 @@ public class ClusterTest { ServiceComponent scNN = serviceComponentFactory.createNew(sfHDFS, "NAMENODE"); sfHDFS.addServiceComponent(scNN); - scNN.persist(); ServiceComponentHost schNNH1 = serviceComponentHostFactory.createNew(scNN, "h1"); scNN.addServiceComponentHost(schNNH1); schNNH1.persist(); ServiceComponent scDN = serviceComponentFactory.createNew(sfHDFS, "DATANODE"); sfHDFS.addServiceComponent(scDN); - scDN.persist(); ServiceComponentHost scDNH1 = serviceComponentHostFactory.createNew(scDN, "h1"); scDN.addServiceComponentHost(scDNH1); scDNH1.persist(); @@ -989,7 +967,6 @@ public class ClusterTest { ServiceComponent scJT = serviceComponentFactory.createNew(sfMR, "JOBTRACKER"); sfMR.addServiceComponent(scJT); - scJT.persist(); ServiceComponentHost schJTH1 = serviceComponentHostFactory.createNew(scJT, "h1"); scJT.addServiceComponentHost(schJTH1); schJTH1.persist(); @@ -1172,8 +1149,6 @@ public class ClusterTest { Service hdfs = c1.addService("HDFS"); ServiceComponent nameNode = hdfs.addServiceComponent("NAMENODE"); - nameNode.persist(); - assertEquals(2, c1.getServices().size()); assertEquals(2, injector.getProvider(EntityManager.class).get(). http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a84715/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java index 1012534..3e526d9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java @@ -400,7 +400,6 @@ public class ClustersDeadlockTest { componentName); service.addServiceComponent(serviceComponent); serviceComponent.setDesiredState(State.INSTALLED); - serviceComponent.persist(); } return serviceComponent; http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a84715/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 94bd6d4..9e285c6 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 @@ -444,12 +444,9 @@ public class ClustersTest { Assert.assertNotNull(injector.getInstance(ClusterServiceDAO.class).findByClusterAndServiceNames(c1, "HDFS")); ServiceComponent nameNode = hdfs.addServiceComponent("NAMENODE"); - nameNode.persist(); ServiceComponent dataNode = hdfs.addServiceComponent("DATANODE"); - dataNode.persist(); ServiceComponent serviceCheckNode = hdfs.addServiceComponent("HDFS_CLIENT"); - serviceCheckNode.persist(); ServiceComponentHost nameNodeHost = nameNode.addServiceComponentHost(h1); nameNodeHost.persist(); http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a84715/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 9106ec3..fbed6e2 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 @@ -239,7 +239,6 @@ public class ConcurrentServiceConfigVersionTest { componentName); service.addServiceComponent(serviceComponent); serviceComponent.setDesiredState(State.INSTALLED); - serviceComponent.persist(); } return serviceComponent; http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a84715/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 4c87613..bb55597 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 @@ -268,7 +268,6 @@ public class ServiceComponentHostConcurrentWriteDeadlockTest { componentName); service.addServiceComponent(serviceComponent); serviceComponent.setDesiredState(State.INSTALLED); - serviceComponent.persist(); } return serviceComponent; http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a84715/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java index 080886e..48279af 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java @@ -190,7 +190,6 @@ public class ServiceComponentHostTest { } catch (ServiceComponentNotFoundException e) { sc = serviceComponentFactory.createNew(s, svcComponent); s.addServiceComponent(sc); - sc.persist(); } ServiceComponentHost impl = serviceComponentHostFactory.createNew(
