You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/01/21 16:38:45 UTC
[1/2] git commit: AMBARI-4362 - Start Hadoop Cluster Service task
fails if only one host component was stopped before
Updated Branches:
refs/heads/trunk 9ae8a0dfe -> b84b0732a
AMBARI-4362 - Start Hadoop Cluster Service task fails if only one host component was stopped before
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e41b89cb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e41b89cb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e41b89cb
Branch: refs/heads/trunk
Commit: e41b89cbdd6be9935d223f501284f8d0a078909b
Parents: 9ae8a0d
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Mon Jan 20 16:54:09 2014 +0200
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Tue Jan 21 17:24:35 2014 +0200
----------------------------------------------------------------------
.../apache/ambari/msi/ClusterDefinition.java | 8 +-
.../ambari/msi/ClusterDefinitionTest.java | 170 ++++++++++++++++++-
2 files changed, 174 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e41b89cb/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java
index 364889b..3e95ebd 100644
--- a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java
+++ b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java
@@ -283,8 +283,8 @@ public class ClusterDefinition {
state.equals("INSTALLED") ? StateProvider.State.Stopped : StateProvider.State.Unknown;
int requestId = -1;
-
- if (s != StateProvider.State.Unknown) {
+ // if the state is already set to the desired state or state is unknown then skip it
+ if (s != StateProvider.State.Unknown && !state.equals(getServiceState(serviceName))) {
Map<String, Set<String>> serviceHostComponents = hostComponents.get(serviceName);
if (serviceHostComponents != null) {
@@ -293,6 +293,7 @@ public class ClusterDefinition {
Set<String> componentNames = entry.getValue();
for (String componentName : componentNames) {
+ if(state.equals(getHostComponentState(hostName, componentName))) continue;
requestId = recordProcess(stateProvider.setRunningState(hostName, componentName, s), requestId,
"Set service " + serviceName + " state to " + s);
}
@@ -356,6 +357,7 @@ public class ClusterDefinition {
for (String name : componentNames) {
if (name.equals(componentName)) {
+ if(state.equals(getHostComponentState(hostName, componentName))) continue;
requestId = recordProcess(stateProvider.setRunningState(hostName, componentName, s), requestId,
"Set component " + componentName + " state to " + s);
}
@@ -394,7 +396,7 @@ public class ClusterDefinition {
int requestId = -1;
- if (s != StateProvider.State.Unknown) {
+ if (s != StateProvider.State.Unknown && !state.equals(getHostComponentState(hostName, componentName))) {
requestId = recordProcess(stateProvider.setRunningState(hostName, componentName, s), -1,
"Set host component " + componentName + " state to " + s);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e41b89cb/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java b/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java
index 848c90f..c048df2 100644
--- a/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java
+++ b/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java
@@ -18,13 +18,16 @@
package org.apache.ambari.msi;
+import org.apache.ambari.scom.ClusterDefinitionProvider;
+import org.apache.ambari.scom.HostInfoProvider;
import org.apache.ambari.scom.TestClusterDefinitionProvider;
import org.apache.ambari.scom.TestHostInfoProvider;
import org.junit.Assert;
import org.junit.Test;
-
import java.util.Set;
+import static org.easymock.EasyMock.*;
+
/**
*/
public class ClusterDefinitionTest {
@@ -115,4 +118,169 @@ public class ClusterDefinitionTest {
Assert.assertTrue(hostComponents.contains("DATANODE"));
}
+
+ @Test
+ public void testSetServiceState_IfStateAlreadySetToDesired() {
+ StateProvider mockStateProvider = createStrictMock(StateProvider.class);
+ ClusterDefinitionProvider mockClusterDefinitionProvider = createStrictMock(ClusterDefinitionProvider.class);
+ HostInfoProvider mockHostInfoProvider = createStrictMock(HostInfoProvider.class);
+
+ TestClusterDefinitionProvider testClusterDefinitionProvider = new TestClusterDefinitionProvider();
+
+ expect(mockClusterDefinitionProvider.getClusterName()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getVersionId()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getInputStream()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Running).times(5);
+
+ replay(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+
+ ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
+ Assert.assertEquals(-1, clusterDefinition.setServiceState("HDFS", "STARTED"));
+
+ verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+ }
+
+ @Test
+ public void testSetServiceState_IfStateUnknown() {
+ StateProvider mockStateProvider = createStrictMock(StateProvider.class);
+ ClusterDefinitionProvider mockClusterDefinitionProvider = createStrictMock(ClusterDefinitionProvider.class);
+ HostInfoProvider mockHostInfoProvider = createStrictMock(HostInfoProvider.class);
+
+ TestClusterDefinitionProvider testClusterDefinitionProvider = new TestClusterDefinitionProvider();
+
+ expect(mockClusterDefinitionProvider.getClusterName()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getVersionId()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getInputStream()).andDelegateTo(testClusterDefinitionProvider);
+
+ replay(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+
+ ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
+ Assert.assertEquals(-1, clusterDefinition.setServiceState("HDFS", "UNKNOWN"));
+
+ verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+ }
+
+ @Test
+ public void testSetServiceState_FromInstalledToStarted() {
+ StateProvider mockStateProvider = createStrictMock(StateProvider.class);
+ ClusterDefinitionProvider mockClusterDefinitionProvider = createStrictMock(ClusterDefinitionProvider.class);
+ HostInfoProvider mockHostInfoProvider = createStrictMock(HostInfoProvider.class);
+
+ TestClusterDefinitionProvider testClusterDefinitionProvider = new TestClusterDefinitionProvider();
+
+ expect(mockClusterDefinitionProvider.getClusterName()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getVersionId()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getInputStream()).andDelegateTo(testClusterDefinitionProvider);
+ //checking if a service state already set
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Stopped);
+ //checking if a component state not set yet
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Stopped);
+ expect(mockStateProvider.setRunningState(anyObject(String.class), anyObject(String.class), eq(StateProvider.State.Running))).andReturn(null);
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Stopped);
+ expect(mockStateProvider.setRunningState(anyObject(String.class), anyObject(String.class), eq(StateProvider.State.Running))).andReturn(null);
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Stopped);
+ expect(mockStateProvider.setRunningState(anyObject(String.class), anyObject(String.class), eq(StateProvider.State.Running))).andReturn(null);
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Stopped);
+ expect(mockStateProvider.setRunningState(anyObject(String.class), anyObject(String.class), eq(StateProvider.State.Running))).andReturn(null);
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Stopped);
+ expect(mockStateProvider.setRunningState(anyObject(String.class), anyObject(String.class), eq(StateProvider.State.Running))).andReturn(null);
+
+ replay(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+
+ ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
+ Assert.assertEquals(1, clusterDefinition.setServiceState("HDFS", "STARTED"));
+
+ verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+ }
+
+ @Test
+ public void testSetServiceStateFromInstalledToStartedWhenOneOfTheComponentsAlreadyStarted() {
+ StateProvider mockStateProvider = createStrictMock(StateProvider.class);
+ ClusterDefinitionProvider mockClusterDefinitionProvider = createStrictMock(ClusterDefinitionProvider.class);
+ HostInfoProvider mockHostInfoProvider = createStrictMock(HostInfoProvider.class);
+
+ TestClusterDefinitionProvider testClusterDefinitionProvider = new TestClusterDefinitionProvider();
+
+ expect(mockClusterDefinitionProvider.getClusterName()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getVersionId()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getInputStream()).andDelegateTo(testClusterDefinitionProvider);
+ //checking if a service state already set
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Stopped);
+ //checking if a component state not set yet
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Running).times(4);
+ expect(mockStateProvider.getRunningState(anyObject(String.class), anyObject(String.class))).andReturn(StateProvider.State.Stopped);
+ expect(mockStateProvider.setRunningState(anyObject(String.class), anyObject(String.class), eq(StateProvider.State.Running))).andReturn(null);
+
+ replay(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+
+ ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
+ Assert.assertEquals(1, clusterDefinition.setServiceState("HDFS", "STARTED"));
+
+ verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+ }
+
+ @Test
+ public void testSetHostComponentState_IfStateUnknown() {
+ StateProvider mockStateProvider = createStrictMock(StateProvider.class);
+ ClusterDefinitionProvider mockClusterDefinitionProvider = createStrictMock(ClusterDefinitionProvider.class);
+ HostInfoProvider mockHostInfoProvider = createStrictMock(HostInfoProvider.class);
+
+ TestClusterDefinitionProvider testClusterDefinitionProvider = new TestClusterDefinitionProvider();
+
+ expect(mockClusterDefinitionProvider.getClusterName()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getVersionId()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getInputStream()).andDelegateTo(testClusterDefinitionProvider);
+
+ replay(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+
+ ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
+ Assert.assertEquals(-1, clusterDefinition.setHostComponentState("hostName", "DATANODE", "UNKNOWN"));
+
+ verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+ }
+
+ @Test
+ public void testSetHostComponentState_IfStateAlreadySetToDesired() {
+ StateProvider mockStateProvider = createStrictMock(StateProvider.class);
+ ClusterDefinitionProvider mockClusterDefinitionProvider = createStrictMock(ClusterDefinitionProvider.class);
+ HostInfoProvider mockHostInfoProvider = createStrictMock(HostInfoProvider.class);
+
+ TestClusterDefinitionProvider testClusterDefinitionProvider = new TestClusterDefinitionProvider();
+
+ expect(mockClusterDefinitionProvider.getClusterName()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getVersionId()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getInputStream()).andDelegateTo(testClusterDefinitionProvider);
+
+ expect(mockStateProvider.getRunningState(isA(String.class), isA(String.class))).andReturn(StateProvider.State.Running);
+
+ replay(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+
+ ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
+ Assert.assertEquals(-1, clusterDefinition.setHostComponentState("hostName", "DATANODE", "STARTED"));
+
+ verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+ }
+
+ @Test
+ public void testSetHostComponentState_FromInstalledToStarted() {
+ StateProvider mockStateProvider = createStrictMock(StateProvider.class);
+ ClusterDefinitionProvider mockClusterDefinitionProvider = createStrictMock(ClusterDefinitionProvider.class);
+ HostInfoProvider mockHostInfoProvider = createStrictMock(HostInfoProvider.class);
+
+ TestClusterDefinitionProvider testClusterDefinitionProvider = new TestClusterDefinitionProvider();
+
+ expect(mockClusterDefinitionProvider.getClusterName()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getVersionId()).andDelegateTo(testClusterDefinitionProvider);
+ expect(mockClusterDefinitionProvider.getInputStream()).andDelegateTo(testClusterDefinitionProvider);
+
+ expect(mockStateProvider.getRunningState(isA(String.class), isA(String.class))).andReturn(StateProvider.State.Stopped);
+ expect(mockStateProvider.setRunningState(anyObject(String.class), anyObject(String.class), eq(StateProvider.State.Running))).andReturn(null);
+
+ replay(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+
+ ClusterDefinition clusterDefinition = new ClusterDefinition(mockStateProvider, mockClusterDefinitionProvider, mockHostInfoProvider);
+ Assert.assertEquals(1, clusterDefinition.setHostComponentState("hostName", "DATANODE", "STARTED"));
+
+ verify(mockClusterDefinitionProvider, mockHostInfoProvider, mockStateProvider);
+ }
}
[2/2] git commit: AMBARI-4363 - support the new version of Ambari
Server
Posted by ab...@apache.org.
AMBARI-4363 - support the new version of Ambari Server
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b84b0732
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b84b0732
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b84b0732
Branch: refs/heads/trunk
Commit: b84b0732aa09092721a27e9bc701e5926e21a227
Parents: e41b89c
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Mon Jan 20 16:59:30 2014 +0200
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Tue Jan 21 17:24:36 2014 +0200
----------------------------------------------------------------------
.../org/apache/ambari/scom/AmbariServer.java | 20 +++++++++-----------
.../apache/ambari/scom/SQLProviderModule.java | 8 ++++----
.../ambari/scom/SQLPropertyProviderTest.java | 12 ++++++------
3 files changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b84b0732/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
index 9c0b420..c43d826 100644
--- a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
+++ b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
@@ -385,21 +385,19 @@ public class AmbariServer {
databaseDriver = configuration.getLocalDatabaseUrl();
databaseUrl = Configuration.JDBC_LOCAL_DRIVER;
- } else {
- databaseDriver = configuration.getDatabaseDriver();
- databaseUrl = configuration.getDatabaseUrl();
-
+ }
+ else {
if (persistenceType == PersistenceType.IN_MEMORY) {
- if(databaseDriver == null){
- databaseDriver = Configuration.JDBC_IN_MEMROY_DRIVER;
- }
- if (databaseUrl == null) {
- databaseUrl = Configuration.JDBC_IN_MEMORY_URL;
- }
+ databaseDriver = Configuration.JDBC_IN_MEMROY_DRIVER;
+ databaseUrl = Configuration.JDBC_IN_MEMORY_URL;
+ }
+ else {
+ databaseDriver = configuration.getDatabaseDriver();
+ databaseUrl = configuration.getDatabaseUrl();
}
}
- if (databaseDriver != null && databaseUrl != null) {
+ if (databaseDriver != null && databaseUrl != null) {
properties.setProperty("javax.persistence.jdbc.url", databaseUrl);
properties.setProperty("javax.persistence.jdbc.driver", databaseDriver);
http://git-wip-us.apache.org/repos/asf/ambari/blob/b84b0732/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
index b51f97a..82217c8 100644
--- a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
+++ b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java
@@ -104,7 +104,7 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
case Component:
providers.add(new JMXPropertyProvider(
- PropertyHelper.getJMXPropertyIds(type, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getJMXPropertyIds(type),
urlStreamProvider,
this,
PropertyHelper.getPropertyId("ServiceComponentInfo", "cluster_name"),
@@ -114,7 +114,7 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
Collections.singleton("STARTED")));
providers.add(new SQLPropertyProvider(
- PropertyHelper.getGangliaPropertyIds(type, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getGangliaPropertyIds(type),
this,
PropertyHelper.getPropertyId("ServiceComponentInfo", "cluster_name"),
null,
@@ -124,7 +124,7 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
case HostComponent:
providers.add(new JMXPropertyProvider(
- PropertyHelper.getJMXPropertyIds(type, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getJMXPropertyIds(type),
urlStreamProvider,
this,
PropertyHelper.getPropertyId("HostRoles", "cluster_name"),
@@ -134,7 +134,7 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
Collections.singleton("STARTED")));
providers.add(new SQLPropertyProvider(
- PropertyHelper.getGangliaPropertyIds(type, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getGangliaPropertyIds(type),
this,
PropertyHelper.getPropertyId("HostRoles", "cluster_name"),
PropertyHelper.getPropertyId("HostRoles", "host_name"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/b84b0732/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/scom/SQLPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/scom/SQLPropertyProviderTest.java b/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/scom/SQLPropertyProviderTest.java
index 7b18957..d0298f3 100644
--- a/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/scom/SQLPropertyProviderTest.java
+++ b/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/scom/SQLPropertyProviderTest.java
@@ -85,7 +85,7 @@ public class SQLPropertyProviderTest {
replay(connectionFactory, connection, statement, resultSet);
SQLPropertyProvider provider = new SQLPropertyProvider(
- PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
new TestHostInfoProvider(),
CLUSTER_NAME_PROPERTY_ID,
HOST_NAME_PROPERTY_ID,
@@ -151,7 +151,7 @@ public class SQLPropertyProviderTest {
TestHostInfoProvider hostProvider = new TestHostInfoProvider();
SQLPropertyProvider provider = new SQLPropertyProvider(
- PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
hostProvider,
CLUSTER_NAME_PROPERTY_ID,
HOST_NAME_PROPERTY_ID,
@@ -217,7 +217,7 @@ public class SQLPropertyProviderTest {
TestHostInfoProvider hostProvider = new TestHostInfoProvider();
SQLPropertyProvider provider = new SQLPropertyProvider(
- PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
hostProvider,
CLUSTER_NAME_PROPERTY_ID,
HOST_NAME_PROPERTY_ID,
@@ -278,7 +278,7 @@ public class SQLPropertyProviderTest {
TestHostInfoProvider hostProvider = new TestHostInfoProvider();
SQLPropertyProvider provider = new SQLPropertyProvider(
- PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
hostProvider,
CLUSTER_NAME_PROPERTY_ID,
null,
@@ -336,7 +336,7 @@ public class SQLPropertyProviderTest {
replay(connectionFactory, connection, statement, resultSet);
SQLPropertyProvider provider = new SQLPropertyProvider(
- PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
new TestHostInfoProvider(),
CLUSTER_NAME_PROPERTY_ID,
HOST_NAME_PROPERTY_ID,
@@ -397,7 +397,7 @@ public class SQLPropertyProviderTest {
replay(connectionFactory, connection, statement, resultSet);
SQLPropertyProvider provider = new SQLPropertyProvider(
- PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+ PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
new TestHostInfoProvider(),
CLUSTER_NAME_PROPERTY_ID,
HOST_NAME_PROPERTY_ID,