FAQ
Author: gopalv
Date: Tue Feb 24 06:29:19 2015
New Revision: 1661846

URL: http://svn.apache.org/r1661846
Log:
HIVE-9764: Update tez dependency in branch & fix build (Siddharth Seth via Gopal V)

Modified:
     hive/branches/llap/llap-server/src/java/org/apache/tez/dag/app/launcher/DaemonContainerLauncher.java
     hive/branches/llap/pom.xml

Modified: hive/branches/llap/llap-server/src/java/org/apache/tez/dag/app/launcher/DaemonContainerLauncher.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/llap-server/src/java/org/apache/tez/dag/app/launcher/DaemonContainerLauncher.java?rev=1661846&r1=1661845&r2=1661846&view=diff
==============================================================================
--- hive/branches/llap/llap-server/src/java/org/apache/tez/dag/app/launcher/DaemonContainerLauncher.java (original)
+++ hive/branches/llap/llap-server/src/java/org/apache/tez/dag/app/launcher/DaemonContainerLauncher.java Tue Feb 24 06:29:19 2015
@@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFac
  import org.apache.hadoop.conf.Configuration;
  import org.apache.hadoop.service.AbstractService;
  import org.apache.hadoop.yarn.api.ApplicationConstants;
+import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
  import org.apache.hadoop.yarn.api.records.ContainerId;
  import org.apache.hadoop.yarn.util.Clock;
  import org.apache.hadoop.hive.llap.daemon.LlapDaemonConfiguration;
@@ -64,6 +65,7 @@ public class DaemonContainerLauncher ext
    private final TaskAttemptListener tal;
    private final Map<String, LlapDaemonProtocolBlockingPB> proxyMap;
    private final int servicePort;
+ private final ApplicationAttemptId appAttemptId;
    private final Clock clock;


@@ -80,6 +82,7 @@ public class DaemonContainerLauncher ext
      ExecutorService localExecutor = Executors.newFixedThreadPool(numThreads,
          new ThreadFactoryBuilder().setNameFormat("DaemonCommunicator #%2d").build());
      executor = MoreExecutors.listeningDecorator(localExecutor);
+ this.appAttemptId = appContext.getApplicationAttemptId();
      this.context = appContext;
      this.tokenIdentifier = context.getApplicationID().toString();
      this.tal = tal;
@@ -107,7 +110,7 @@ public class DaemonContainerLauncher ext
          InetSocketAddress address = tal.getTaskCommunicator(launchEvent.getTaskCommId()).getAddress();
          ListenableFuture<Void> future = executor.submit(
              new SubmitCallable(getProxy(launchEvent.getNodeId().getHost()), launchEvent,
- tokenIdentifier, address.getHostName(), address.getPort()));
+ tokenIdentifier, appAttemptId, address.getHostName(), address.getPort()));
          Futures.addCallback(future, new SubmitCallback(launchEvent.getContainerId(),
              launchEvent.getContainer().getNodeId().getHost()));
          break;
@@ -130,13 +133,16 @@ public class DaemonContainerLauncher ext
      private final String amHost;
      private final int amPort;
      private final LlapDaemonProtocolBlockingPB daemonProxy;
+ private final ApplicationAttemptId appAttemptId;

      private SubmitCallable(LlapDaemonProtocolBlockingPB daemonProxy,
                             NMCommunicatorLaunchRequestEvent event, String tokenIdentifier,
+ ApplicationAttemptId appAttemptId,
                             String amHost, int amPort) {
        this.event = event;
        this.daemonProxy = daemonProxy;
        this.tokenIdentifier = tokenIdentifier;
+ this.appAttemptId = appAttemptId;
        this.amHost = amHost;
        this.amPort = amPort;
      }
@@ -147,9 +153,8 @@ public class DaemonContainerLauncher ext
        RunContainerRequestProto.Builder requestBuilder = RunContainerRequestProto.newBuilder();
        // Need the taskAttemptListenerAddress
        requestBuilder.setAmHost(amHost).setAmPort(amPort);
- requestBuilder.setAppAttemptNumber(event.getContainer().getId().getApplicationAttemptId().getAttemptId());
- requestBuilder.setApplicationIdString(
- event.getContainer().getId().getApplicationAttemptId().getApplicationId().toString());
+ requestBuilder.setAppAttemptNumber(appAttemptId.getAttemptId());
+ requestBuilder.setApplicationIdString(appAttemptId.getApplicationId().toString());
        requestBuilder.setTokenIdentifier(tokenIdentifier);
        requestBuilder.setContainerIdString(event.getContainer().getId().toString());
        requestBuilder.setCredentialsBinary(

Modified: hive/branches/llap/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/pom.xml?rev=1661846&r1=1661845&r2=1661846&view=diff
==============================================================================
--- hive/branches/llap/pom.xml (original)
+++ hive/branches/llap/pom.xml Tue Feb 24 06:29:19 2015
@@ -155,7 +155,7 @@
      <stax.version>1.0.1</stax.version>
      <slf4j.version>1.7.5</slf4j.version>
      <ST4.version>4.0.4</ST4.version>
- <tez.version>0.7.0-SNAPSHOT</tez.version>
+ <tez.version>0.7.0-TEZ-2003-SNAPSHOT</tez.version>
      <super-csv.version>2.2.0</super-csv.version>
      <spark.version>1.2.0</spark.version>
      <scala.binary.version>2.10</scala.binary.version>

Search Discussions

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupcommits @
categorieshive, hadoop
postedFeb 24, '15 at 6:29a
activeFeb 24, '15 at 6:29a
posts1
users1
websitehive.apache.org

1 user in discussion

Gopalv: 1 post

People

Translate

site design / logo © 2021 Grokbase