You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/07/27 10:49:25 UTC
[1/2] ambari git commit: AMBARI-12524. RU: prerequisites have a
couple issues (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 104c0065e -> 2b53f2aba
refs/heads/trunk 808eef457 -> bdcdb4b99
AMBARI-12524. RU: prerequisites have a couple issues (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bdcdb4b9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bdcdb4b9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bdcdb4b9
Branch: refs/heads/trunk
Commit: bdcdb4b99f500bc6b6a0ff1f4a268066a13383e1
Parents: 808eef4
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Jul 27 11:47:25 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Jul 27 11:47:25 2015 +0300
----------------------------------------------------------------------
.../checks/HiveMultipleMetastoreCheck.java | 2 +
.../checks/HiveMultipleMetastoreCheckTest.java | 154 +++++++++++++++++++
.../checks/TestHiveMultipleMetastoreCheck.java | 124 ---------------
3 files changed, 156 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdcdb4b9/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
index 5b3e2a0..c387a4b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
@@ -78,10 +78,12 @@ public class HiveMultipleMetastoreCheck extends AbstractCheckDescriptor {
Map<String, ServiceComponentHost> metastores = metastore.getServiceComponentHosts();
if (metastores.size() < 2) {
+ prerequisiteCheck.getFailedOn().add("HIVE");
prerequisiteCheck.setStatus(PrereqCheckStatus.WARNING);
prerequisiteCheck.setFailReason(getFailReason(prerequisiteCheck, request));
}
} catch (ServiceComponentNotFoundException scnfe) {
+ prerequisiteCheck.getFailedOn().add("HIVE");
prerequisiteCheck.setStatus(PrereqCheckStatus.WARNING);
prerequisiteCheck.setFailReason(getFailReason(prerequisiteCheck, request));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdcdb4b9/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
new file mode 100644
index 0000000..c74277c
--- /dev/null
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
@@ -0,0 +1,154 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.checks;
+
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Service;
+import org.apache.ambari.server.state.ServiceComponent;
+import org.apache.ambari.server.state.ServiceComponentHost;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import com.google.inject.Provider;
+
+/**
+ * Tests {@link HiveMultipleMetastoreCheck}
+ */
+public class HiveMultipleMetastoreCheckTest {
+ private final Clusters m_clusters = Mockito.mock(Clusters.class);
+ private final HiveMultipleMetastoreCheck m_check = new HiveMultipleMetastoreCheck();
+
+ /**
+ *
+ */
+ @Before
+ public void setup() {
+ m_check.clustersProvider = new Provider<Clusters>() {
+
+ @Override
+ public Clusters get() {
+ return m_clusters;
+ }
+ };
+ }
+
+ /**
+ * Tests that the check is applicable when hive is installed.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testIsApplicable() throws Exception {
+ final Cluster cluster = Mockito.mock(Cluster.class);
+
+ Mockito.when(cluster.getClusterId()).thenReturn(1L);
+ Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
+ Map<String, Service> services = new HashMap<String, Service>();
+ Mockito.when(cluster.getServices()).thenReturn(services);
+
+ services.put("HDFS", Mockito.mock(Service.class));
+
+ PrereqCheckRequest request = new PrereqCheckRequest("cluster");
+ request.setRepositoryVersion("2.3.0.0");
+
+ // HIVE not installed
+ Assert.assertFalse(m_check.isApplicable(request));
+
+ // install HIVE
+ services.put("HIVE", Mockito.mock(Service.class));
+
+ // HIVE installed
+ Assert.assertTrue(m_check.isApplicable(request));
+ }
+
+ /**
+ * Tests that the warning is correctly tripped when there are not enough
+ * metastores.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testPerform() throws Exception {
+ final Cluster cluster = Mockito.mock(Cluster.class);
+ Service hive = Mockito.mock(Service.class);
+ ServiceComponent metastore = Mockito.mock(ServiceComponent.class);
+
+ Mockito.when(cluster.getClusterId()).thenReturn(1L);
+ Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
+ Mockito.when(cluster.getService("HIVE")).thenReturn(hive);
+
+ Mockito.when(hive.getServiceComponent("HIVE_METASTORE")).thenReturn(metastore);
+
+ Map<String, ServiceComponentHost> metastores = new HashMap<String, ServiceComponentHost>();
+ Mockito.when(metastore.getServiceComponentHosts()).thenReturn(metastores);
+
+ PrerequisiteCheck check = new PrerequisiteCheck(null, null);
+ PrereqCheckRequest request = new PrereqCheckRequest("cluster");
+ request.setRepositoryVersion("2.3.0.0");
+ m_check.perform(check, request);
+
+ Assert.assertEquals(PrereqCheckStatus.WARNING, check.getStatus());
+
+ metastores.put("c6401", Mockito.mock(ServiceComponentHost.class));
+ metastores.put("c6402", Mockito.mock(ServiceComponentHost.class));
+
+ check = new PrerequisiteCheck(null, null);
+ m_check.perform(check, request);
+
+ Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
+ }
+
+ @Test
+ public void testPerformFail() throws Exception{
+ final Cluster cluster = Mockito.mock(Cluster.class);
+ final LinkedHashSet<String> failedOnExpected = new LinkedHashSet<String>();
+ Service hive = Mockito.mock(Service.class);
+ ServiceComponent metastore = Mockito.mock(ServiceComponent.class);
+ Map<String, ServiceComponentHost> metastores = new HashMap<String, ServiceComponentHost>();
+
+ failedOnExpected.add("HIVE");
+
+ Mockito.when(cluster.getClusterId()).thenReturn(1L);
+ Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
+ Mockito.when(cluster.getService("HIVE")).thenReturn(hive);
+ Mockito.when(hive.getServiceComponent("HIVE_METASTORE")).thenReturn(metastore);
+ Mockito.when(metastore.getServiceComponentHosts()).thenReturn(metastores);
+
+ PrerequisiteCheck check = new PrerequisiteCheck(null, null);
+ PrereqCheckRequest request = new PrereqCheckRequest("cluster");
+ request.setRepositoryVersion("2.3.0.0");
+ m_check.perform(check, request);
+
+ Assert.assertEquals(PrereqCheckStatus.WARNING, check.getStatus());
+
+ check = new PrerequisiteCheck(null, null);
+ m_check.perform(check, request);
+ Assert.assertEquals(failedOnExpected, check.getFailedOn());
+ Assert.assertEquals(PrereqCheckStatus.WARNING, check.getStatus());
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdcdb4b9/ambari-server/src/test/java/org/apache/ambari/server/checks/TestHiveMultipleMetastoreCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/TestHiveMultipleMetastoreCheck.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/TestHiveMultipleMetastoreCheck.java
deleted file mode 100644
index ab8e5bd..0000000
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/TestHiveMultipleMetastoreCheck.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ambari.server.checks;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.ambari.server.controller.PrereqCheckRequest;
-import org.apache.ambari.server.state.Cluster;
-import org.apache.ambari.server.state.Clusters;
-import org.apache.ambari.server.state.Service;
-import org.apache.ambari.server.state.ServiceComponent;
-import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.ambari.server.state.stack.PrereqCheckStatus;
-import org.apache.ambari.server.state.stack.PrerequisiteCheck;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import com.google.inject.Provider;
-
-/**
- * Tests {@link HiveMultipleMetastoreCheck}
- */
-public class TestHiveMultipleMetastoreCheck {
- private final Clusters m_clusters = Mockito.mock(Clusters.class);
- private final HiveMultipleMetastoreCheck m_check = new HiveMultipleMetastoreCheck();
-
- /**
- *
- */
- @Before
- public void setup() {
- m_check.clustersProvider = new Provider<Clusters>() {
-
- @Override
- public Clusters get() {
- return m_clusters;
- }
- };
- }
-
- /**
- * Tests that the check is applicable when hive is installed.
- *
- * @throws Exception
- */
- @Test
- public void testIsApplicable() throws Exception {
- final Cluster cluster = Mockito.mock(Cluster.class);
-
- Mockito.when(cluster.getClusterId()).thenReturn(1L);
- Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
- Map<String, Service> services = new HashMap<String, Service>();
- Mockito.when(cluster.getServices()).thenReturn(services);
-
- services.put("HDFS", Mockito.mock(Service.class));
-
- PrereqCheckRequest request = new PrereqCheckRequest("cluster");
- request.setRepositoryVersion("2.3.0.0");
-
- // HIVE not installed
- Assert.assertFalse(m_check.isApplicable(request));
-
- // install HIVE
- services.put("HIVE", Mockito.mock(Service.class));
-
- // HIVE installed
- Assert.assertTrue(m_check.isApplicable(request));
- }
-
- /**
- * Tests that the warning is correctly tripped when there are not enough
- * metastores.
- *
- * @throws Exception
- */
- @Test
- public void testPerform() throws Exception {
- final Cluster cluster = Mockito.mock(Cluster.class);
- Service hive = Mockito.mock(Service.class);
- ServiceComponent metastore = Mockito.mock(ServiceComponent.class);
-
- Mockito.when(cluster.getClusterId()).thenReturn(1L);
- Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
- Mockito.when(cluster.getService("HIVE")).thenReturn(hive);
-
- Mockito.when(hive.getServiceComponent("HIVE_METASTORE")).thenReturn(metastore);
-
- Map<String, ServiceComponentHost> metastores = new HashMap<String, ServiceComponentHost>();
- Mockito.when(metastore.getServiceComponentHosts()).thenReturn(metastores);
-
- PrerequisiteCheck check = new PrerequisiteCheck(null, null);
- PrereqCheckRequest request = new PrereqCheckRequest("cluster");
- request.setRepositoryVersion("2.3.0.0");
- m_check.perform(check, request);
-
- Assert.assertEquals(PrereqCheckStatus.WARNING, check.getStatus());
-
- metastores.put("c6401", Mockito.mock(ServiceComponentHost.class));
- metastores.put("c6402", Mockito.mock(ServiceComponentHost.class));
-
- check = new PrerequisiteCheck(null, null);
- m_check.perform(check, request);
-
- Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
- }
-}
[2/2] ambari git commit: AMBARI-12524. RU: prerequisites have a
couple issues (dlysnichenko)
Posted by dm...@apache.org.
AMBARI-12524. RU: prerequisites have a couple issues (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b53f2ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b53f2ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b53f2ab
Branch: refs/heads/branch-2.1
Commit: 2b53f2aba11f57cfe73a9745c6b4c4125344caf6
Parents: 104c006
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Jul 27 11:47:25 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Jul 27 11:49:36 2015 +0300
----------------------------------------------------------------------
.../checks/HiveMultipleMetastoreCheck.java | 2 +
.../checks/HiveMultipleMetastoreCheckTest.java | 154 +++++++++++++++++++
.../checks/TestHiveMultipleMetastoreCheck.java | 124 ---------------
3 files changed, 156 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b53f2ab/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
index 5b3e2a0..c387a4b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheck.java
@@ -78,10 +78,12 @@ public class HiveMultipleMetastoreCheck extends AbstractCheckDescriptor {
Map<String, ServiceComponentHost> metastores = metastore.getServiceComponentHosts();
if (metastores.size() < 2) {
+ prerequisiteCheck.getFailedOn().add("HIVE");
prerequisiteCheck.setStatus(PrereqCheckStatus.WARNING);
prerequisiteCheck.setFailReason(getFailReason(prerequisiteCheck, request));
}
} catch (ServiceComponentNotFoundException scnfe) {
+ prerequisiteCheck.getFailedOn().add("HIVE");
prerequisiteCheck.setStatus(PrereqCheckStatus.WARNING);
prerequisiteCheck.setFailReason(getFailReason(prerequisiteCheck, request));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b53f2ab/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
new file mode 100644
index 0000000..c74277c
--- /dev/null
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/HiveMultipleMetastoreCheckTest.java
@@ -0,0 +1,154 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.checks;
+
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Service;
+import org.apache.ambari.server.state.ServiceComponent;
+import org.apache.ambari.server.state.ServiceComponentHost;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import com.google.inject.Provider;
+
+/**
+ * Tests {@link HiveMultipleMetastoreCheck}
+ */
+public class HiveMultipleMetastoreCheckTest {
+ private final Clusters m_clusters = Mockito.mock(Clusters.class);
+ private final HiveMultipleMetastoreCheck m_check = new HiveMultipleMetastoreCheck();
+
+ /**
+ *
+ */
+ @Before
+ public void setup() {
+ m_check.clustersProvider = new Provider<Clusters>() {
+
+ @Override
+ public Clusters get() {
+ return m_clusters;
+ }
+ };
+ }
+
+ /**
+ * Tests that the check is applicable when hive is installed.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testIsApplicable() throws Exception {
+ final Cluster cluster = Mockito.mock(Cluster.class);
+
+ Mockito.when(cluster.getClusterId()).thenReturn(1L);
+ Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
+ Map<String, Service> services = new HashMap<String, Service>();
+ Mockito.when(cluster.getServices()).thenReturn(services);
+
+ services.put("HDFS", Mockito.mock(Service.class));
+
+ PrereqCheckRequest request = new PrereqCheckRequest("cluster");
+ request.setRepositoryVersion("2.3.0.0");
+
+ // HIVE not installed
+ Assert.assertFalse(m_check.isApplicable(request));
+
+ // install HIVE
+ services.put("HIVE", Mockito.mock(Service.class));
+
+ // HIVE installed
+ Assert.assertTrue(m_check.isApplicable(request));
+ }
+
+ /**
+ * Tests that the warning is correctly tripped when there are not enough
+ * metastores.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testPerform() throws Exception {
+ final Cluster cluster = Mockito.mock(Cluster.class);
+ Service hive = Mockito.mock(Service.class);
+ ServiceComponent metastore = Mockito.mock(ServiceComponent.class);
+
+ Mockito.when(cluster.getClusterId()).thenReturn(1L);
+ Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
+ Mockito.when(cluster.getService("HIVE")).thenReturn(hive);
+
+ Mockito.when(hive.getServiceComponent("HIVE_METASTORE")).thenReturn(metastore);
+
+ Map<String, ServiceComponentHost> metastores = new HashMap<String, ServiceComponentHost>();
+ Mockito.when(metastore.getServiceComponentHosts()).thenReturn(metastores);
+
+ PrerequisiteCheck check = new PrerequisiteCheck(null, null);
+ PrereqCheckRequest request = new PrereqCheckRequest("cluster");
+ request.setRepositoryVersion("2.3.0.0");
+ m_check.perform(check, request);
+
+ Assert.assertEquals(PrereqCheckStatus.WARNING, check.getStatus());
+
+ metastores.put("c6401", Mockito.mock(ServiceComponentHost.class));
+ metastores.put("c6402", Mockito.mock(ServiceComponentHost.class));
+
+ check = new PrerequisiteCheck(null, null);
+ m_check.perform(check, request);
+
+ Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
+ }
+
+ @Test
+ public void testPerformFail() throws Exception{
+ final Cluster cluster = Mockito.mock(Cluster.class);
+ final LinkedHashSet<String> failedOnExpected = new LinkedHashSet<String>();
+ Service hive = Mockito.mock(Service.class);
+ ServiceComponent metastore = Mockito.mock(ServiceComponent.class);
+ Map<String, ServiceComponentHost> metastores = new HashMap<String, ServiceComponentHost>();
+
+ failedOnExpected.add("HIVE");
+
+ Mockito.when(cluster.getClusterId()).thenReturn(1L);
+ Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
+ Mockito.when(cluster.getService("HIVE")).thenReturn(hive);
+ Mockito.when(hive.getServiceComponent("HIVE_METASTORE")).thenReturn(metastore);
+ Mockito.when(metastore.getServiceComponentHosts()).thenReturn(metastores);
+
+ PrerequisiteCheck check = new PrerequisiteCheck(null, null);
+ PrereqCheckRequest request = new PrereqCheckRequest("cluster");
+ request.setRepositoryVersion("2.3.0.0");
+ m_check.perform(check, request);
+
+ Assert.assertEquals(PrereqCheckStatus.WARNING, check.getStatus());
+
+ check = new PrerequisiteCheck(null, null);
+ m_check.perform(check, request);
+ Assert.assertEquals(failedOnExpected, check.getFailedOn());
+ Assert.assertEquals(PrereqCheckStatus.WARNING, check.getStatus());
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b53f2ab/ambari-server/src/test/java/org/apache/ambari/server/checks/TestHiveMultipleMetastoreCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/TestHiveMultipleMetastoreCheck.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/TestHiveMultipleMetastoreCheck.java
deleted file mode 100644
index ab8e5bd..0000000
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/TestHiveMultipleMetastoreCheck.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ambari.server.checks;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.ambari.server.controller.PrereqCheckRequest;
-import org.apache.ambari.server.state.Cluster;
-import org.apache.ambari.server.state.Clusters;
-import org.apache.ambari.server.state.Service;
-import org.apache.ambari.server.state.ServiceComponent;
-import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.ambari.server.state.stack.PrereqCheckStatus;
-import org.apache.ambari.server.state.stack.PrerequisiteCheck;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import com.google.inject.Provider;
-
-/**
- * Tests {@link HiveMultipleMetastoreCheck}
- */
-public class TestHiveMultipleMetastoreCheck {
- private final Clusters m_clusters = Mockito.mock(Clusters.class);
- private final HiveMultipleMetastoreCheck m_check = new HiveMultipleMetastoreCheck();
-
- /**
- *
- */
- @Before
- public void setup() {
- m_check.clustersProvider = new Provider<Clusters>() {
-
- @Override
- public Clusters get() {
- return m_clusters;
- }
- };
- }
-
- /**
- * Tests that the check is applicable when hive is installed.
- *
- * @throws Exception
- */
- @Test
- public void testIsApplicable() throws Exception {
- final Cluster cluster = Mockito.mock(Cluster.class);
-
- Mockito.when(cluster.getClusterId()).thenReturn(1L);
- Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
- Map<String, Service> services = new HashMap<String, Service>();
- Mockito.when(cluster.getServices()).thenReturn(services);
-
- services.put("HDFS", Mockito.mock(Service.class));
-
- PrereqCheckRequest request = new PrereqCheckRequest("cluster");
- request.setRepositoryVersion("2.3.0.0");
-
- // HIVE not installed
- Assert.assertFalse(m_check.isApplicable(request));
-
- // install HIVE
- services.put("HIVE", Mockito.mock(Service.class));
-
- // HIVE installed
- Assert.assertTrue(m_check.isApplicable(request));
- }
-
- /**
- * Tests that the warning is correctly tripped when there are not enough
- * metastores.
- *
- * @throws Exception
- */
- @Test
- public void testPerform() throws Exception {
- final Cluster cluster = Mockito.mock(Cluster.class);
- Service hive = Mockito.mock(Service.class);
- ServiceComponent metastore = Mockito.mock(ServiceComponent.class);
-
- Mockito.when(cluster.getClusterId()).thenReturn(1L);
- Mockito.when(m_clusters.getCluster("cluster")).thenReturn(cluster);
- Mockito.when(cluster.getService("HIVE")).thenReturn(hive);
-
- Mockito.when(hive.getServiceComponent("HIVE_METASTORE")).thenReturn(metastore);
-
- Map<String, ServiceComponentHost> metastores = new HashMap<String, ServiceComponentHost>();
- Mockito.when(metastore.getServiceComponentHosts()).thenReturn(metastores);
-
- PrerequisiteCheck check = new PrerequisiteCheck(null, null);
- PrereqCheckRequest request = new PrereqCheckRequest("cluster");
- request.setRepositoryVersion("2.3.0.0");
- m_check.perform(check, request);
-
- Assert.assertEquals(PrereqCheckStatus.WARNING, check.getStatus());
-
- metastores.put("c6401", Mockito.mock(ServiceComponentHost.class));
- metastores.put("c6402", Mockito.mock(ServiceComponentHost.class));
-
- check = new PrerequisiteCheck(null, null);
- m_check.perform(check, request);
-
- Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
- }
-}