You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by pz...@apache.org on 2019/07/30 20:27:19 UTC
[knox] branch master updated: KNOX-1930 - CM discovery - JOBTRACKER
URLs not discovered
This is an automated email from the ASF dual-hosted git repository.
pzampino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 096e717 KNOX-1930 - CM discovery - JOBTRACKER URLs not discovered
096e717 is described below
commit 096e717dd4550a93ad0531d4d4010375d899de65
Author: pzampino <pz...@cloudera.com>
AuthorDate: Tue Jul 30 15:22:31 2019 -0400
KNOX-1930 - CM discovery - JOBTRACKER URLs not discovered
---
.../yarn/JobTrackerServiceModelGenerator.java | 53 ++++++++++++++++
.../ResourceManagerServiceModelGeneratorBase.java | 45 ++++++++++++++
.../cm/model/yarn/YarnUIServiceModelGenerator.java | 20 +-----
...way.topology.discovery.cm.ServiceModelGenerator | 1 +
.../cm/ClouderaManagerServiceDiscoveryTest.java | 72 +++++++++++++++++-----
5 files changed, 158 insertions(+), 33 deletions(-)
diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/JobTrackerServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/JobTrackerServiceModelGenerator.java
new file mode 100644
index 0000000..4d2f337
--- /dev/null
+++ b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/JobTrackerServiceModelGenerator.java
@@ -0,0 +1,53 @@
+/*
+ * 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.knox.gateway.topology.discovery.cm.model.yarn;
+
+import com.cloudera.api.swagger.client.ApiException;
+import com.cloudera.api.swagger.model.ApiConfigList;
+import com.cloudera.api.swagger.model.ApiRole;
+import com.cloudera.api.swagger.model.ApiService;
+import com.cloudera.api.swagger.model.ApiServiceConfig;
+import org.apache.knox.gateway.topology.discovery.cm.ServiceModel;
+
+import java.util.Locale;
+
+public class JobTrackerServiceModelGenerator extends ResourceManagerServiceModelGeneratorBase {
+
+ private static final String SERVICE = "JOBTRACKER";
+
+ @Override
+ public String getService() {
+ return SERVICE;
+ }
+
+ @Override
+ public ServiceModel.Type getModelType() {
+ return ServiceModel.Type.API;
+ }
+
+ @Override
+ public ServiceModel generateService(ApiService service,
+ ApiServiceConfig serviceConfig,
+ ApiRole role,
+ ApiConfigList roleConfig) throws ApiException {
+
+ String hostname = role.getHostRef().getHostname();
+ String port = getRoleConfigValue(roleConfig, "yarn_resourcemanager_address");
+
+ return createServiceModel(String.format(Locale.getDefault(), "rpc://%s:%s", hostname, port));
+ }
+}
diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/ResourceManagerServiceModelGeneratorBase.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/ResourceManagerServiceModelGeneratorBase.java
new file mode 100644
index 0000000..6ca7b59
--- /dev/null
+++ b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/ResourceManagerServiceModelGeneratorBase.java
@@ -0,0 +1,45 @@
+/*
+ * 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.knox.gateway.topology.discovery.cm.model.yarn;
+
+import com.cloudera.api.swagger.model.ApiConfigList;
+import com.cloudera.api.swagger.model.ApiRole;
+import com.cloudera.api.swagger.model.ApiService;
+import com.cloudera.api.swagger.model.ApiServiceConfig;
+import org.apache.knox.gateway.topology.discovery.cm.model.AbstractServiceModelGenerator;
+
+public abstract class ResourceManagerServiceModelGeneratorBase extends AbstractServiceModelGenerator {
+
+ protected static final String SERVICE_TYPE = "YARN";
+ protected static final String ROLE_TYPE = "RESOURCEMANAGER";
+
+ @Override
+ public String getServiceType() {
+ return SERVICE_TYPE;
+ }
+
+ @Override
+ public String getRoleType() {
+ return ROLE_TYPE;
+ }
+
+ @Override
+ public boolean handles(ApiService service, ApiServiceConfig serviceConfig, ApiRole role, ApiConfigList roleConfig) {
+ return getServiceType().equals(service.getType()) && getRoleType().equals(role.getType());
+ }
+
+}
diff --git a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/YarnUIServiceModelGenerator.java b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/YarnUIServiceModelGenerator.java
index 3f060c1..ec562c8 100644
--- a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/YarnUIServiceModelGenerator.java
+++ b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/yarn/YarnUIServiceModelGenerator.java
@@ -23,14 +23,11 @@ import com.cloudera.api.swagger.model.ApiRole;
import com.cloudera.api.swagger.model.ApiService;
import com.cloudera.api.swagger.model.ApiServiceConfig;
import org.apache.knox.gateway.topology.discovery.cm.ServiceModel;
-import org.apache.knox.gateway.topology.discovery.cm.model.AbstractServiceModelGenerator;
import java.util.Locale;
-public class YarnUIServiceModelGenerator extends AbstractServiceModelGenerator {
+public class YarnUIServiceModelGenerator extends ResourceManagerServiceModelGeneratorBase {
private static final String SERVICE = "YARNUI";
- private static final String SERVICE_TYPE = "YARN";
- private static final String ROLE_TYPE = "RESOURCEMANAGER";
@Override
public String getService() {
@@ -38,26 +35,11 @@ public class YarnUIServiceModelGenerator extends AbstractServiceModelGenerator {
}
@Override
- public String getServiceType() {
- return SERVICE_TYPE;
- }
-
- @Override
- public String getRoleType() {
- return ROLE_TYPE;
- }
-
- @Override
public ServiceModel.Type getModelType() {
return ServiceModel.Type.UI;
}
@Override
- public boolean handles(ApiService service, ApiServiceConfig serviceConfig, ApiRole role, ApiConfigList roleConfig) {
- return getServiceType().equals(service.getType()) && getRoleType().equals(role.getType());
- }
-
- @Override
public ServiceModel generateService(ApiService service,
ApiServiceConfig serviceConfig,
ApiRole role,
diff --git a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
index 4588f46..61397a8 100644
--- a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
+++ b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
@@ -27,6 +27,7 @@ org.apache.knox.gateway.topology.discovery.cm.model.hive.HiveServiceModelGenerat
org.apache.knox.gateway.topology.discovery.cm.model.hive.HiveOnTezServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.hue.HueServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.hue.HueLBServiceModelGenerator
+org.apache.knox.gateway.topology.discovery.cm.model.yarn.JobTrackerServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.livy.LivyServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.oozie.OozieServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.oozie.OozieUIServiceModelGenerator
diff --git a/gateway-discovery-cm/src/test/java/org/apache/knox/gateway/topology/discovery/cm/ClouderaManagerServiceDiscoveryTest.java b/gateway-discovery-cm/src/test/java/org/apache/knox/gateway/topology/discovery/cm/ClouderaManagerServiceDiscoveryTest.java
index 404569c..aa8d828 100644
--- a/gateway-discovery-cm/src/test/java/org/apache/knox/gateway/topology/discovery/cm/ClouderaManagerServiceDiscoveryTest.java
+++ b/gateway-discovery-cm/src/test/java/org/apache/knox/gateway/topology/discovery/cm/ClouderaManagerServiceDiscoveryTest.java
@@ -18,6 +18,7 @@ package org.apache.knox.gateway.topology.discovery.cm;
import com.cloudera.api.swagger.client.ApiException;
import com.cloudera.api.swagger.client.ApiResponse;
+import com.cloudera.api.swagger.model.ApiClusterRef;
import com.cloudera.api.swagger.model.ApiConfig;
import com.cloudera.api.swagger.model.ApiConfigList;
import com.cloudera.api.swagger.model.ApiHostRef;
@@ -49,6 +50,31 @@ import static org.junit.Assert.assertNotNull;
public class ClouderaManagerServiceDiscoveryTest {
@Test
+ public void testJobTrackerServiceDiscovery() {
+ final String hostName = "resourcemanager-host-1";
+ final String port = "8032";
+
+ Map<String,String> serviceProperties = new HashMap<>();
+ serviceProperties.put("hdfs_service", ""); // This is only necessary to satisfy code not covered by this test
+
+ // Configure the role
+ Map<String, String> roleProperties = new HashMap<>();
+ roleProperties.put("yarn_resourcemanager_address", port);
+
+ ServiceDiscovery.Cluster cluster = doTestDiscovery(hostName,
+ "YARN-1",
+ "YARN",
+ "YARN-1-RESOURCEMANAGER-12345",
+ "RESOURCEMANAGER",
+ serviceProperties,
+ roleProperties);
+ List<String> urls = cluster.getServiceURLs("JOBTRACKER");
+ assertNotNull(urls);
+ assertEquals(1, urls.size());
+ assertEquals("rpc://" + hostName + ":" + port, urls.get(0));
+ }
+
+ @Test
public void testAtlasDiscovery() {
doTestAtlasDiscovery(false);
}
@@ -752,25 +778,25 @@ public class ClouderaManagerServiceDiscoveryTest {
// Prepare the service list response for the cluster
ApiServiceList serviceList = EasyMock.createNiceMock(ApiServiceList.class);
EasyMock.expect(serviceList.getItems())
- .andReturn(Collections.singletonList(createMockApiService(serviceName, serviceType)))
+ .andReturn(Collections.singletonList(createMockApiService(serviceName, serviceType, clusterName)))
.anyTimes();
EasyMock.replay(serviceList);
mockClient.addResponse(ApiServiceList.class, new TestApiServiceListResponse(serviceList));
- // Prepare the Livy service config response for the cluster
- ApiServiceConfig hbase = createMockApiServiceConfig(serviceProperties);
- mockClient.addResponse(ApiServiceConfig.class, new TestApiServiceConfigResponse(hbase));
+ // Prepare the service config response for the cluster
+ ApiServiceConfig serviceConfig = createMockApiServiceConfig(serviceProperties);
+ mockClient.addResponse(ApiServiceConfig.class, new TestApiServiceConfigResponse(serviceConfig));
- // Prepare the Livy Server role
- ApiRole livyServerRole = createMockApiRole(roleName, roleType, hostName);
- ApiRoleList livyServerRoleList = EasyMock.createNiceMock(ApiRoleList.class);
- EasyMock.expect(livyServerRoleList.getItems()).andReturn(Collections.singletonList(livyServerRole)).anyTimes();
- EasyMock.replay(livyServerRoleList);
- mockClient.addResponse(ApiRoleList.class, new TestApiRoleListResponse(livyServerRoleList));
+ // Prepare the role
+ ApiRole role = createMockApiRole(roleName, roleType, hostName);
+ ApiRoleList roleList = EasyMock.createNiceMock(ApiRoleList.class);
+ EasyMock.expect(roleList.getItems()).andReturn(Collections.singletonList(role)).anyTimes();
+ EasyMock.replay(roleList);
+ mockClient.addResponse(ApiRoleList.class, new TestApiRoleListResponse(roleList));
- // Configure the Livy Server role
- ApiConfigList atlasServerRoleConfigList = createMockApiConfigList(roleProperties);
- mockClient.addResponse(ApiConfigList.class, new TestApiConfigListResponse(atlasServerRoleConfigList));
+ // Configure the role
+ ApiConfigList roleConfigList = createMockApiConfigList(roleProperties);
+ mockClient.addResponse(ApiConfigList.class, new TestApiConfigListResponse(roleConfigList));
// Invoke the service discovery
ClouderaManagerServiceDiscovery cmsd = new ClouderaManagerServiceDiscovery(true);
@@ -794,10 +820,15 @@ public class ClouderaManagerServiceDiscoveryTest {
return config;
}
- private static ApiService createMockApiService(String name, String type) {
+ private static ApiService createMockApiService(String name, String type, String clusterName) {
ApiService s = EasyMock.createNiceMock(ApiService.class);
EasyMock.expect(s.getName()).andReturn(name).anyTimes();
EasyMock.expect(s.getType()).andReturn(type).anyTimes();
+
+ ApiClusterRef clusterRef = EasyMock.createNiceMock(ApiClusterRef.class);
+ EasyMock.expect(clusterRef.getClusterName()).andReturn(clusterName).anyTimes();
+ EasyMock.replay(clusterRef);
+ EasyMock.expect(s.getClusterRef()).andReturn(clusterRef).anyTimes();
EasyMock.replay(s);
return s;
}
@@ -909,4 +940,17 @@ public class ClouderaManagerServiceDiscoveryTest {
}
}
+ private static final class ApiClusterRefExt extends ApiClusterRef {
+ private String name;
+
+ ApiClusterRefExt(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String getClusterName() {
+ return name;
+ }
+ }
+
}