commit b9076151e9c269970d1abfd76e8264bd5f744a2b Author: David Lavati Date: Wed Jul 10 13:25:53 2019 +0200 HIVE-21569 Bump guava version to 28.1-jre Change-Id: Ia3a04813552f024dcca710aa5811375410d63de0 diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index 7d5c3f4ea1..36996977f3 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -29,7 +29,7 @@ .. - 16.0.1 + 28.1-jre diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml index 05692c7a6c..61b5235f02 100644 --- a/itests/qtest-druid/pom.xml +++ b/itests/qtest-druid/pom.xml @@ -41,7 +41,7 @@ 1.19.3 9.4.10.v20180503 10.11.1.1 - 16.0.1 + 28.1-jre 4.1.0 2.0.0 1.7.25 diff --git a/llap-common/src/java/org/apache/hadoop/hive/llap/AsyncPbRpcProxy.java b/llap-common/src/java/org/apache/hadoop/hive/llap/AsyncPbRpcProxy.java index ad39963614..a9ab1f6ee4 100644 --- a/llap-common/src/java/org/apache/hadoop/hive/llap/AsyncPbRpcProxy.java +++ b/llap-common/src/java/org/apache/hadoop/hive/llap/AsyncPbRpcProxy.java @@ -171,7 +171,7 @@ public void shutdown() { CallableRequest request, LlapNodeId nodeId) { ListenableFuture future = executor.submit(request); Futures.addCallback(future, new ResponseCallback( - request.getCallback(), nodeId, this)); + request.getCallback(), nodeId, this), MoreExecutors.directExecutor()); } @VisibleForTesting @@ -283,7 +283,7 @@ public void onFailure(Throwable t) { LOG.warn("RequestManager shutdown with error", t); } } - }); + }, MoreExecutors.directExecutor()); } @Override diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java index 088a5f33c0..a49920eeac 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/AMReporter.java @@ -174,7 +174,7 @@ public void onFailure(Throwable t) { Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), t); } } - }); + }, MoreExecutors.directExecutor()); // TODO: why is this needed? we could just save the host and port? nodeId = LlapNodeId.getInstance(localAddress.get().getHostName(), localAddress.get().getPort()); LOG.info("AMReporter running with DaemonId: {}, NodeId: {}", daemonId, nodeId); @@ -274,7 +274,7 @@ public void onFailure(Throwable t) { LOG.warn("Failed to send taskKilled for {}. The attempt will likely time out.", taskAttemptId); } - }); + }, MoreExecutors.directExecutor()); } public void queryComplete(QueryIdentifier queryIdentifier) { @@ -342,7 +342,7 @@ public void onFailure(Throwable t) { amNodeInfo.amNodeId, currentQueryIdentifier, t); queryFailedHandler.queryFailed(currentQueryIdentifier); } - }); + }, MoreExecutors.directExecutor()); } } } catch (InterruptedException e) { diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java index 33ade55ee1..848c42a750 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapTaskReporter.java @@ -128,7 +128,7 @@ public synchronized void registerTask(RuntimeTask task, sendCounterInterval, maxEventsToGet, requestCounter, containerIdStr, initialEvent, fragmentRequestId, wmCounters); ListenableFuture future = heartbeatExecutor.submit(currentCallable); - Futures.addCallback(future, new HeartbeatCallback(errorReporter)); + Futures.addCallback(future, new HeartbeatCallback(errorReporter), MoreExecutors.directExecutor()); } /** diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java index 93b59dcb4e..15468e3e08 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskExecutorService.java @@ -186,7 +186,7 @@ public TaskExecutorService(int numExecutors, int waitQueueSize, executionCompletionExecutorService = MoreExecutors.listeningDecorator( executionCompletionExecutorServiceRaw); ListenableFuture future = waitQueueExecutorService.submit(new WaitQueueWorker()); - Futures.addCallback(future, new WaitQueueWorkerCallback()); + Futures.addCallback(future, new WaitQueueWorkerCallback(), MoreExecutors.directExecutor()); } /** diff --git a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java index 2ecb7a2830..f04272a5a7 100644 --- a/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java +++ b/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java @@ -799,15 +799,17 @@ public void run() { }, 0, 10000L, TimeUnit.MILLISECONDS); nodeEnablerFuture = nodeEnabledExecutor.submit(nodeEnablerCallable); - Futures.addCallback(nodeEnablerFuture, new LoggingFutureCallback("NodeEnablerThread", LOG)); + Futures.addCallback(nodeEnablerFuture, new LoggingFutureCallback("NodeEnablerThread", LOG), + MoreExecutors.directExecutor()); delayedTaskSchedulerFuture = delayedTaskSchedulerExecutor.submit(delayedTaskSchedulerCallable); Futures.addCallback(delayedTaskSchedulerFuture, - new LoggingFutureCallback("DelayedTaskSchedulerThread", LOG)); + new LoggingFutureCallback("DelayedTaskSchedulerThread", LOG), MoreExecutors.directExecutor()); schedulerFuture = schedulerExecutor.submit(schedulerCallable); - Futures.addCallback(schedulerFuture, new LoggingFutureCallback("SchedulerThread", LOG)); + Futures.addCallback(schedulerFuture, new LoggingFutureCallback("SchedulerThread", LOG), + MoreExecutors.directExecutor()); registry.start(); registry.registerStateChangeListener(new NodeStateChangeListener()); diff --git a/pom.xml b/pom.xml index ba87106c6a..b8840e009f 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 0.1.2 0.14.0-incubating 1.2.0-3f79e055 - 19.0 + 28.1-jre 2.4.11 1.3.166 3.1.0 diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManager.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManager.java index 37c3714017..671db101d0 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManager.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManager.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hive.ql.exec.tez; +import com.google.common.util.concurrent.*; import org.apache.hadoop.hive.metastore.api.WMPoolSchedulingPolicy; import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils; @@ -24,11 +25,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.math.DoubleMath; -import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.SettableFuture; -import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.io.IOException; import java.util.ArrayList; @@ -1102,7 +1098,7 @@ private static int transferSessionsToDestroy(Collection source, } private void failOnFutureFailure(ListenableFuture future) { - Futures.addCallback(future, FATAL_ERROR_CALLBACK); + Futures.addCallback(future, FATAL_ERROR_CALLBACK, MoreExecutors.directExecutor()); } private void queueGetRequestOnMasterThread( @@ -1936,7 +1932,7 @@ public SessionInitContext(SettableFuture future, public void start() throws Exception { ListenableFuture getFuture = tezAmPool.getSessionAsync(); - Futures.addCallback(getFuture, this); + Futures.addCallback(getFuture, this, MoreExecutors.directExecutor()); } @Override @@ -1990,7 +1986,7 @@ public void onSuccess(WmTezSession session) { case GETTING: { ListenableFuture waitFuture = session.waitForAmRegistryAsync( amRegistryTimeoutMs, timeoutPool); - Futures.addCallback(waitFuture, this); + Futures.addCallback(waitFuture, this, MoreExecutors.directExecutor()); break; } case WAITING_FOR_REGISTRY: { diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java index f5ab981f26..34030af78e 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/SampleTezSessionState.java @@ -19,10 +19,8 @@ package org.apache.hadoop.hive.ql.exec.tez; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.SettableFuture; +import com.google.common.util.concurrent.*; + import java.io.IOException; import java.util.concurrent.ScheduledExecutorService; import javax.security.auth.login.LoginException; @@ -128,7 +126,7 @@ public void onSuccess(Boolean result) { public void onFailure(Throwable t) { future.setException(t); } - }); + }, MoreExecutors.directExecutor()); return future; } diff --git a/standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java b/standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java index 101d6759c5..7dafcfbae3 100644 --- a/standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java +++ b/standalone-metastore/metastore-tools/tools-common/src/main/java/org/apache/hadoop/hive/metastore/tools/Util.java @@ -451,9 +451,9 @@ Partition build() { HostAndPort hp = HostAndPort.fromString(host) .withDefaultPort(port); - LOG.info("Connecting to {}:{}", hp.getHostText(), hp.getPort()); + LOG.info("Connecting to {}:{}", hp.getHost(), hp.getPort()); - return new URI(THRIFT_SCHEMA, null, hp.getHostText(), hp.getPort(), + return new URI(THRIFT_SCHEMA, null, hp.getHost(), hp.getPort(), null, null, null); } diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 0b974ed25c..2e1c0dc269 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -81,7 +81,7 @@ 0.1.2 3.1.0 - 19.0 + 28.1-jre 3.1.0 2.6.1 2.9.9