diff --git llap-client/pom.xml llap-client/pom.xml index b7b5803..4669b6f 100644 --- llap-client/pom.xml +++ llap-client/pom.xml @@ -128,6 +128,12 @@ org.apache.hadoop + hadoop-yarn-registry + ${hadoop-23.version} + true + + + org.apache.hadoop hadoop-hdfs ${hadoop-23.version} test diff --git llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/ServiceInstance.java llap-client/src/java/org/apache/hadoop/hive/llap/registry/ServiceInstance.java similarity index 96% rename from llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/ServiceInstance.java rename to llap-client/src/java/org/apache/hadoop/hive/llap/registry/ServiceInstance.java index f0f22aa..f116de4 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/ServiceInstance.java +++ llap-client/src/java/org/apache/hadoop/hive/llap/registry/ServiceInstance.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hive.llap.daemon.registry; +package org.apache.hadoop.hive.llap.registry; import java.util.Map; diff --git llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/ServiceInstanceSet.java llap-client/src/java/org/apache/hadoop/hive/llap/registry/ServiceInstanceSet.java similarity index 96% rename from llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/ServiceInstanceSet.java rename to llap-client/src/java/org/apache/hadoop/hive/llap/registry/ServiceInstanceSet.java index 7ab36d4..388b5f3 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/ServiceInstanceSet.java +++ llap-client/src/java/org/apache/hadoop/hive/llap/registry/ServiceInstanceSet.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hive.llap.daemon.registry; +package org.apache.hadoop.hive.llap.registry; import java.io.IOException; import java.util.Map; diff --git llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/ServiceRegistry.java llap-client/src/java/org/apache/hadoop/hive/llap/registry/ServiceRegistry.java similarity index 96% rename from llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/ServiceRegistry.java rename to llap-client/src/java/org/apache/hadoop/hive/llap/registry/ServiceRegistry.java index a0f9aac..d3fb517 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/ServiceRegistry.java +++ llap-client/src/java/org/apache/hadoop/hive/llap/registry/ServiceRegistry.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hive.llap.daemon.registry; +package org.apache.hadoop.hive.llap.registry; import java.io.IOException; diff --git llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/impl/LlapFixedRegistryImpl.java llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapFixedRegistryImpl.java similarity index 96% rename from llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/impl/LlapFixedRegistryImpl.java rename to llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapFixedRegistryImpl.java index 57aa1e7..bdf19ec 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/impl/LlapFixedRegistryImpl.java +++ llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapFixedRegistryImpl.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hive.llap.daemon.registry.impl; +package org.apache.hadoop.hive.llap.registry.impl; import java.io.IOException; import java.net.InetAddress; @@ -25,9 +25,9 @@ import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.llap.configuration.LlapConfiguration; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceInstance; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceInstanceSet; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceRegistry; +import org.apache.hadoop.hive.llap.registry.ServiceInstance; +import org.apache.hadoop.hive.llap.registry.ServiceInstanceSet; +import org.apache.hadoop.hive.llap.registry.ServiceRegistry; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.yarn.api.records.Resource; diff --git llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/impl/LlapRegistryService.java llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapRegistryService.java similarity index 92% rename from llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/impl/LlapRegistryService.java rename to llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapRegistryService.java index d3647d0..d3904fe 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/impl/LlapRegistryService.java +++ llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapRegistryService.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hive.llap.daemon.registry.impl; +package org.apache.hadoop.hive.llap.registry.impl; import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.llap.configuration.LlapConfiguration; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceInstanceSet; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceRegistry; +import org.apache.hadoop.hive.llap.registry.ServiceInstanceSet; +import org.apache.hadoop.hive.llap.registry.ServiceRegistry; import org.apache.hadoop.service.AbstractService; import org.apache.log4j.Logger; diff --git llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/impl/LlapYarnRegistryImpl.java llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapYarnRegistryImpl.java similarity index 96% rename from llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/impl/LlapYarnRegistryImpl.java rename to llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapYarnRegistryImpl.java index cb1b1d0..8336fdd 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/registry/impl/LlapYarnRegistryImpl.java +++ llap-client/src/java/org/apache/hadoop/hive/llap/registry/impl/LlapYarnRegistryImpl.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hive.llap.daemon.registry.impl; +package org.apache.hadoop.hive.llap.registry.impl; import java.io.IOException; import java.net.InetAddress; @@ -33,9 +33,9 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.llap.configuration.LlapConfiguration; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceInstance; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceInstanceSet; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceRegistry; +import org.apache.hadoop.hive.llap.registry.ServiceInstance; +import org.apache.hadoop.hive.llap.registry.ServiceInstanceSet; +import org.apache.hadoop.hive.llap.registry.ServiceRegistry; import org.apache.hadoop.registry.client.api.RegistryOperationsFactory; import org.apache.hadoop.registry.client.binding.RegistryPathUtils; import org.apache.hadoop.registry.client.binding.RegistryTypeUtils; @@ -49,7 +49,6 @@ import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.log4j.Logger; -import org.apache.tez.dag.api.TezUncheckedException; import org.apache.zookeeper.CreateMode; import com.google.common.base.Preconditions; @@ -134,9 +133,9 @@ public Endpoint getServicesEndpoint() { serviceURL = new URL(scheme, hostname, servicePort, ""); return RegistryTypeUtils.webEndpoint("services", serviceURL.toURI()); } catch (MalformedURLException e) { - throw new TezUncheckedException(e); + throw new RuntimeException(e); } catch (URISyntaxException e) { - throw new TezUncheckedException("llap service URI for " + hostname + " is invalid", e); + throw new RuntimeException("llap service URI for " + hostname + " is invalid", e); } } diff --git llap-server/pom.xml llap-server/pom.xml index dd8dd7b..0f0ce0b 100644 --- llap-server/pom.xml +++ llap-server/pom.xml @@ -165,12 +165,6 @@ test - org.apache.hadoop - hadoop-yarn-registry - ${hadoop-23.version} - true - - org.apache.tez tez-runtime-internals ${tez.version} diff --git llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java index 6f75001..98b1ccd 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hive.llap.configuration.LlapConfiguration; import org.apache.hadoop.hive.llap.daemon.ContainerRunner; import org.apache.hadoop.hive.llap.daemon.QueryFailedHandler; -import org.apache.hadoop.hive.llap.daemon.registry.impl.LlapRegistryService; +import org.apache.hadoop.hive.llap.registry.impl.LlapRegistryService; import org.apache.hadoop.hive.llap.daemon.rpc.LlapDaemonProtocolProtos.QueryCompleteRequestProto; import org.apache.hadoop.hive.llap.daemon.rpc.LlapDaemonProtocolProtos.SourceStateUpdatedRequestProto; import org.apache.hadoop.hive.llap.daemon.rpc.LlapDaemonProtocolProtos.SubmitWorkRequestProto; diff --git llap-server/src/java/org/apache/tez/dag/app/rm/LlapTaskSchedulerService.java llap-server/src/java/org/apache/tez/dag/app/rm/LlapTaskSchedulerService.java index 7fb9a99..6fd01f9 100644 --- llap-server/src/java/org/apache/tez/dag/app/rm/LlapTaskSchedulerService.java +++ llap-server/src/java/org/apache/tez/dag/app/rm/LlapTaskSchedulerService.java @@ -51,9 +51,9 @@ import com.google.common.util.concurrent.Futures; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.llap.configuration.LlapConfiguration; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceInstance; -import org.apache.hadoop.hive.llap.daemon.registry.ServiceInstanceSet; -import org.apache.hadoop.hive.llap.daemon.registry.impl.LlapRegistryService; +import org.apache.hadoop.hive.llap.registry.ServiceInstance; +import org.apache.hadoop.hive.llap.registry.ServiceInstanceSet; +import org.apache.hadoop.hive.llap.registry.impl.LlapRegistryService; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.NodeId; diff --git llap-server/src/test/org/apache/tez/dag/app/rm/TestLlapTaskSchedulerService.java llap-server/src/test/org/apache/tez/dag/app/rm/TestLlapTaskSchedulerService.java index 2f93266..23724a4 100644 --- llap-server/src/test/org/apache/tez/dag/app/rm/TestLlapTaskSchedulerService.java +++ llap-server/src/test/org/apache/tez/dag/app/rm/TestLlapTaskSchedulerService.java @@ -34,7 +34,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.llap.configuration.LlapConfiguration; -import org.apache.hadoop.hive.llap.daemon.registry.impl.LlapFixedRegistryImpl; +import org.apache.hadoop.hive.llap.registry.impl.LlapFixedRegistryImpl; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.Container;