hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject hive git commit: HIVE-15621 : Use Hive's own JvmPauseMonitor instead of Hadoop's in LLAP (Wei Zheng, reviewed by Sergey Shelukhin)
Date Fri, 20 Jan 2017 18:24:30 GMT
Repository: hive
Updated Branches:
  refs/heads/master 7c616fb4c -> 10ec33f1e


HIVE-15621 : Use Hive's own JvmPauseMonitor instead of Hadoop's in LLAP (Wei Zheng, reviewed
by Sergey Shelukhin)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/10ec33f1
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/10ec33f1
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/10ec33f1

Branch: refs/heads/master
Commit: 10ec33f1e067a69d734a0b22c7e918f3ade015a5
Parents: 7c616fb
Author: Wei Zheng <weiz@apache.org>
Authored: Fri Jan 20 10:24:32 2017 -0800
Committer: Wei Zheng <weiz@apache.org>
Committed: Fri Jan 20 10:24:32 2017 -0800

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java  | 3 +--
 .../hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/10ec33f1/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java
b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java
index 789641e..519bfbd 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/LlapDaemon.java
@@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import javax.management.ObjectName;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.common.JvmPauseMonitor;
 import org.apache.hadoop.hive.common.LogUtils;
 import org.apache.hadoop.hive.common.UgiFactory;
 import org.apache.hadoop.hive.conf.HiveConf;
@@ -66,7 +67,6 @@ import org.apache.hadoop.metrics2.util.MBeans;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.service.CompositeService;
 import org.apache.hadoop.util.ExitUtil;
-import org.apache.hadoop.util.JvmPauseMonitor;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.yarn.api.ApplicationConstants;
 import org.apache.hadoop.yarn.util.ConverterUtils;
@@ -250,7 +250,6 @@ public class LlapDaemon extends CompositeService implements ContainerRunner,
Lla
     this.metrics.setCacheMemoryPerInstance(ioMemoryBytes);
     this.metrics.setJvmMaxMemory(maxJvmMemory);
     this.metrics.setWaitQueueSize(waitQueueSize);
-    metrics.getJvmMetrics().setPauseMonitor(pauseMonitor);
     this.llapDaemonInfoBean = MBeans.register("LlapDaemon", "LlapDaemonInfo", this);
     LOG.info("Started LlapMetricsSystem with displayName: " + displayName +
         " sessionId: " + sessionId);

http://git-wip-us.apache.org/repos/asf/hive/blob/10ec33f1/llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java
----------------------------------------------------------------------
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 b1240aa..ff7140d 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
@@ -56,6 +56,7 @@ import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.Futures;
 import org.apache.commons.lang.mutable.MutableInt;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.common.JvmPauseMonitor;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hadoop.hive.llap.metrics.LlapMetricsSystem;
@@ -67,7 +68,6 @@ import org.apache.hadoop.hive.llap.registry.impl.LlapRegistryService;
 import org.apache.hadoop.hive.llap.tezplugins.helpers.MonotonicClock;
 import org.apache.hadoop.hive.llap.tezplugins.scheduler.LoggingFutureCallback;
 import org.apache.hadoop.hive.llap.tezplugins.metrics.LlapTaskSchedulerMetrics;
-import org.apache.hadoop.util.JvmPauseMonitor;
 import org.apache.hadoop.yarn.api.records.Container;
 import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.api.records.NodeId;
@@ -283,7 +283,6 @@ public class LlapTaskSchedulerService extends TaskScheduler {
       this.metrics.setNumExecutors(executorsPerInstance);
       this.metrics.setMemoryPerInstance(memoryPerInstance * 1024L * 1024L);
       this.metrics.setCpuCoresPerInstance(coresPerExecutor);
-      this.metrics.getJvmMetrics().setPauseMonitor(pauseMonitor);
     } else {
       this.metrics = null;
       this.pauseMonitor = null;


Mime
View raw message