You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/09/03 22:38:32 UTC
ambari git commit: AMBARI-12984. Alert from Ambari when cluster not
finalized after HDFS upgrade - unit test fixes (dgrinenko via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 4ff26efb1 -> bca624057
AMBARI-12984. Alert from Ambari when cluster not finalized after HDFS upgrade - unit test fixes (dgrinenko via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bca62405
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bca62405
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bca62405
Branch: refs/heads/trunk
Commit: bca624057e9a359c35d20a4600ceae3b486d6353
Parents: 4ff26ef
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Sep 3 13:38:04 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Sep 3 13:38:04 2015 -0700
----------------------------------------------------------------------
.../server/api/services/AmbariMetaInfoTest.java | 14 +++++++-------
.../server/metadata/AgentAlertDefinitionsTest.java | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bca62405/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 14c66a2..86ff0c9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -1736,7 +1736,7 @@ public class AmbariMetaInfoTest {
AlertDefinitionDAO dao = injector.getInstance(AlertDefinitionDAO.class);
List<AlertDefinitionEntity> definitions = dao.findAll(clusterId);
- assertEquals(9, definitions.size());
+ assertEquals(10, definitions.size());
// figure out how many of these alerts were merged into from the
// non-stack alerts.json
@@ -1749,7 +1749,7 @@ public class AmbariMetaInfoTest {
}
assertEquals(1, hostAlertCount);
- assertEquals(8, definitions.size() - hostAlertCount);
+ assertEquals(9, definitions.size() - hostAlertCount);
for (AlertDefinitionEntity definition : definitions) {
definition.setScheduleInterval(28);
@@ -1759,7 +1759,7 @@ public class AmbariMetaInfoTest {
metaInfo.reconcileAlertDefinitions(clusters);
definitions = dao.findAll();
- assertEquals(9, definitions.size());
+ assertEquals(10, definitions.size());
for (AlertDefinitionEntity definition : definitions) {
assertEquals(28, definition.getScheduleInterval().intValue());
@@ -1768,7 +1768,7 @@ public class AmbariMetaInfoTest {
// find all enabled for the cluster should find 6 (the ones from HDFS;
// it will not find the agent alert since it's not bound to the cluster)
definitions = dao.findAllEnabled(cluster.getClusterId());
- assertEquals(8, definitions.size());
+ assertEquals(9, definitions.size());
// create new definition
AlertDefinitionEntity entity = new AlertDefinitionEntity();
@@ -1787,19 +1787,19 @@ public class AmbariMetaInfoTest {
// verify the new definition is found (6 HDFS + 1 new one)
definitions = dao.findAllEnabled(cluster.getClusterId());
- assertEquals(9, definitions.size());
+ assertEquals(10, definitions.size());
// reconcile, which should disable our bad definition
metaInfo.reconcileAlertDefinitions(clusters);
// find all enabled for the cluster should find 6
definitions = dao.findAllEnabled(cluster.getClusterId());
- assertEquals(8, definitions.size());
+ assertEquals(9, definitions.size());
// find all should find 6 HDFS + 1 disabled + 1 agent alert + 2 server
// alerts
definitions = dao.findAll();
- assertEquals(10, definitions.size());
+ assertEquals(11, definitions.size());
entity = dao.findById(entity.getDefinitionId());
assertFalse(entity.getEnabled());
http://git-wip-us.apache.org/repos/asf/ambari/blob/bca62405/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java
index 9d58b94..80ab0fe 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java
@@ -66,7 +66,7 @@ public class AgentAlertDefinitionsTest {
public void testLoadingServertAlerts() {
AmbariServiceAlertDefinitions ambariServiceAlertDefinitions = m_injector.getInstance(AmbariServiceAlertDefinitions.class);
List<AlertDefinition> definitions = ambariServiceAlertDefinitions.getServerDefinitions();
- Assert.assertEquals(2, definitions.size());
+ Assert.assertEquals(3, definitions.size());
for (AlertDefinition definition : definitions) {
Assert.assertEquals(Components.AMBARI_SERVER.name(),