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 789641e..8ec6668 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 @@ -66,7 +66,6 @@ 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; @@ -93,7 +92,6 @@ private final LlapRegistryService registry; private final LlapWebServices webServices; private final AtomicLong numSubmissions = new AtomicLong(0); - private final JvmPauseMonitor pauseMonitor; private final ObjectName llapDaemonInfoBean; private final LlapDaemonExecutorMetrics metrics; private final FunctionLocalizer fnLocalizer; @@ -226,8 +224,6 @@ public LlapDaemon(Configuration daemonConf, int numExecutors, long executorMemor // Initialize the metrics system LlapMetricsSystem.initialize("LlapDaemon"); - this.pauseMonitor = new JvmPauseMonitor(daemonConf); - pauseMonitor.start(); String displayName = "LlapDaemonExecutorMetrics-" + hostName; String sessionId = MetricsUtils.getUUID(); daemonConf.set("llap.daemon.metrics.sessionid", sessionId); @@ -250,7 +246,6 @@ public LlapDaemon(Configuration daemonConf, int numExecutors, long executorMemor 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); @@ -408,10 +403,6 @@ public void shutdown() { } } - if (pauseMonitor != null) { - pauseMonitor.stop(); - } - if (metrics != null) { LlapMetricsSystem.shutdown(); } diff --git llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java index b1240aa..f4a72a0 100644 --- llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java +++ llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java @@ -67,7 +67,6 @@ 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; @@ -198,7 +197,6 @@ public int compare(Priority o1, Priority o2) { StatsPerDag dagStats = new StatsPerDag(); private final LlapTaskSchedulerMetrics metrics; - private final JvmPauseMonitor pauseMonitor; public LlapTaskSchedulerService(TaskSchedulerContext taskSchedulerContext) { this(taskSchedulerContext, new MonotonicClock(), true); @@ -274,8 +272,6 @@ public LlapTaskSchedulerService(TaskSchedulerContext taskSchedulerContext, Clock if (initMetrics && !conf.getBoolean(ConfVars.HIVE_IN_TEST.varname, false)) { // Initialize the metrics system LlapMetricsSystem.initialize("LlapTaskScheduler"); - this.pauseMonitor = new JvmPauseMonitor(conf); - pauseMonitor.start(); String displayName = "LlapTaskSchedulerMetrics-" + MetricsUtils.getHostName(); String sessionId = conf.get("llap.daemon.metrics.sessionid"); // TODO: Not sure about the use of this. Should we instead use workerIdentity as sessionId? @@ -283,10 +279,8 @@ public LlapTaskSchedulerService(TaskSchedulerContext taskSchedulerContext, Clock 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; } LOG.info("Running with configuration: " + "memoryPerInstance=" + memoryPerInstance @@ -438,10 +432,6 @@ public void shutdown() { registry.stop(); } - if (pauseMonitor != null) { - pauseMonitor.stop(); - } - if (metrics != null) { LlapMetricsSystem.shutdown(); }