[5/6] hadoop git commit: YARN-6608. Backport all SLS improvements from trunk to branch-2. (Carlo Curino via wangda)

[wangda]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d894f910/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
index f40f47d..f999dce 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
@@ -31,60 +31,77 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.Collections;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapreduce.TaskType;
+import org.apache.hadoop.metrics2.source.JvmMetrics;
 import org.apache.hadoop.tools.rumen.JobTraceReader;
 import org.apache.hadoop.tools.rumen.LoggedJob;
 import org.apache.hadoop.tools.rumen.LoggedTask;
 import org.apache.hadoop.tools.rumen.LoggedTaskAttempt;
+import org.apache.hadoop.tools.rumen.TaskAttemptInfo;
 import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
 import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.api.records.NodeState;
+import org.apache.hadoop.yarn.api.records.ReservationId;
 import org.apache.hadoop.yarn.api.records.Resource;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+import 
org.apache.hadoop.yarn.server.resourcemanager.amlauncher.ApplicationMasterLauncher;
 import 
org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy;
 import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
-import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
 import org.apache.hadoop.yarn.sls.appmaster.AMSimulator;
 import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
 import org.apache.hadoop.yarn.sls.nodemanager.NMSimulator;
-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
-import org.apache.hadoop.yarn.sls.scheduler.ResourceSchedulerWrapper;
+import org.apache.hadoop.yarn.sls.resourcemanager.MockAMLauncher;
 import org.apache.hadoop.yarn.sls.scheduler.SLSCapacityScheduler;
 import org.apache.hadoop.yarn.sls.scheduler.TaskRunner;
+import org.apache.hadoop.yarn.sls.scheduler.SLSFairScheduler;
+import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
 import org.apache.hadoop.yarn.sls.scheduler.SchedulerWrapper;
+import org.apache.hadoop.yarn.sls.synthetic.SynthJob;
+import org.apache.hadoop.yarn.sls.synthetic.SynthTraceJobProducer;
 import org.apache.hadoop.yarn.sls.utils.SLSUtils;
+import org.apache.hadoop.yarn.util.UTCClock;
 import org.apache.hadoop.yarn.util.resource.Resources;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Private
 @Unstable
-public class SLSRunner {
+public class SLSRunner extends Configured implements Tool {
   // RM, Runner
   private ResourceManager rm;
   private static TaskRunner runner = new TaskRunner();
   private String[] inputTraces;
-  private Configuration conf;
   private Map queueAppNumMap;
-  
+
   // NM simulator
   private HashMap nmMap;
   private int nmMemoryMB, nmVCores;
   private String nodeFile;
-  
+
   // AM simulator
   private int AM_ID;
   private Map amMap;
@@ -99,49 +116,92 @@ public class SLSRunner {
   // other simulation information
   private int numNMs, numRacks, numAMs, numTasks;
   private long maxRuntime;
-  public final static Map simulateInfoMap =
+
+  private final static Map simulateInfoMap =
   new HashMap();
 
   // logger
   public final static Logger LOG = 

[1/6] hadoop git commit: YARN-6608. Backport all SLS improvements from trunk to branch-2. (Carlo Curino via wangda)

[wangda]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 5e7491d53 -> d894f910d


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d894f910/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/TestMetricsInvariantChecker.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/TestMetricsInvariantChecker.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/TestMetricsInvariantChecker.java
new file mode 100644
index 000..35cf1e4
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/TestMetricsInvariantChecker.java
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.metrics2.MetricsSystem;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+import org.apache.hadoop.metrics2.source.JvmMetrics;
+import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
+import org.apache.log4j.Logger;
+import org.junit.Before;
+import org.junit.Test;
+
+import static junit.framework.TestCase.fail;
+
+/**
+ * This class tests the {@code MetricsInvariantChecker} by running it multiple
+ * time and reporting the time it takes to execute, as well as verifying that
+ * the invariant throws in case the invariants are not respected.
+ */
+public class TestMetricsInvariantChecker {
+  public final static Logger LOG =
+  Logger.getLogger(TestMetricsInvariantChecker.class);
+
+  private MetricsSystem metricsSystem;
+  private MetricsInvariantChecker ic;
+  private Configuration conf;
+
+  @Before
+  public void setup() {
+this.metricsSystem = DefaultMetricsSystem.instance();
+JvmMetrics.initSingleton("ResourceManager", null);
+this.ic = new MetricsInvariantChecker();
+this.conf = new Configuration();
+conf.set(MetricsInvariantChecker.INVARIANTS_FILE,
+"src/test/resources/invariants.txt");
+conf.setBoolean(MetricsInvariantChecker.THROW_ON_VIOLATION, true);
+ic.init(conf, null, null);
+  }
+
+  @Test(timeout = 5000)
+  public void testManyRuns() {
+
+QueueMetrics qm =
+QueueMetrics.forQueue(metricsSystem, "root", null, false, conf);
+qm.setAvailableResourcesToQueue(Resource.newInstance(1, 1));
+
+int numIterations = 1000;
+long start = System.currentTimeMillis();
+for (int i = 0; i < numIterations; i++) {
+  ic.editSchedule();
+}
+long end = System.currentTimeMillis();
+
+System.out.println("Runtime per iteration (avg of " + numIterations
++ " iterations): " + (end - start) + " tot time");
+
+  }
+
+  @Test
+  public void testViolation() {
+
+// create a "wrong" condition in which the invariants are not respected
+QueueMetrics qm =
+QueueMetrics.forQueue(metricsSystem, "root", null, false, conf);
+qm.setAvailableResourcesToQueue(Resource.newInstance(-1, -1));
+
+// test with throwing exception turned on
+try {
+  ic.editSchedule();
+  fail();
+} catch (InvariantViolationException i) {
+  // expected
+}
+
+// test log-only mode
+conf.setBoolean(MetricsInvariantChecker.THROW_ON_VIOLATION, false);
+ic.init(conf, null, null);
+ic.editSchedule();
+
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d894f910/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/invariants.txt
--
diff --git 

[4/6] hadoop git commit: YARN-6608. Backport all SLS improvements from trunk to branch-2. (Carlo Curino via wangda)

[wangda]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d894f910/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
index 3b539fa..420a1c9 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
@@ -18,16 +18,17 @@
 
 package org.apache.hadoop.yarn.sls.scheduler;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair
-.FSAppAttempt;
+import org.apache.hadoop.yarn.api.records.ApplicationId;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSAppAttempt;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue;
 import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.Schedulable;
+import org.apache.hadoop.yarn.sls.SLSRunner;
 
 import com.codahale.metrics.Gauge;
-import org.apache.hadoop.yarn.sls.SLSRunner;
 
 @Private
 @Unstable
@@ -37,114 +38,131 @@ public class FairSchedulerMetrics extends 
SchedulerMetrics {
   private int totalVCores = Integer.MAX_VALUE;
   private boolean maxReset = false;
 
+  @VisibleForTesting
+  public enum Metric {
+DEMAND("demand"),
+USAGE("usage"),
+MINSHARE("minshare"),
+MAXSHARE("maxshare"),
+FAIRSHARE("fairshare");
+
+private String value;
+
+Metric(String value) {
+  this.value = value;
+}
+
+@VisibleForTesting
+public String getValue() {
+  return value;
+}
+  }
+
   public FairSchedulerMetrics() {
 super();
-appTrackedMetrics.add("demand.memory");
-appTrackedMetrics.add("demand.vcores");
-appTrackedMetrics.add("usage.memory");
-appTrackedMetrics.add("usage.vcores");
-appTrackedMetrics.add("minshare.memory");
-appTrackedMetrics.add("minshare.vcores");
-appTrackedMetrics.add("maxshare.memory");
-appTrackedMetrics.add("maxshare.vcores");
-appTrackedMetrics.add("fairshare.memory");
-appTrackedMetrics.add("fairshare.vcores");
-queueTrackedMetrics.add("demand.memory");
-queueTrackedMetrics.add("demand.vcores");
-queueTrackedMetrics.add("usage.memory");
-queueTrackedMetrics.add("usage.vcores");
-queueTrackedMetrics.add("minshare.memory");
-queueTrackedMetrics.add("minshare.vcores");
-queueTrackedMetrics.add("maxshare.memory");
-queueTrackedMetrics.add("maxshare.vcores");
-queueTrackedMetrics.add("fairshare.memory");
-queueTrackedMetrics.add("fairshare.vcores");
+
+for (Metric metric: Metric.values()) {
+  appTrackedMetrics.add(metric.value + ".memory");
+  appTrackedMetrics.add(metric.value + ".vcores");
+  queueTrackedMetrics.add(metric.value + ".memory");
+  queueTrackedMetrics.add(metric.value + ".vcores");
+}
   }
-  
-  @Override
-  public void trackApp(ApplicationAttemptId appAttemptId, String oldAppId) {
-super.trackApp(appAttemptId, oldAppId);
-FairScheduler fair = (FairScheduler) scheduler;
-final FSAppAttempt app = fair.getSchedulerApp(appAttemptId);
-metrics.register("variable.app." + oldAppId + ".demand.memory",
-  new Gauge() {
-@Override
-public Long getValue() {
-  return app.getDemand().getMemorySize();
-}
-  }
-);
-metrics.register("variable.app." + oldAppId + ".demand.vcores",
-  new Gauge() {
-@Override
-public Integer getValue() {
-  return app.getDemand().getVirtualCores();
-}
-  }
-);
-metrics.register("variable.app." + oldAppId + ".usage.memory",
-  new Gauge() {
-@Override
-public Long getValue() {
-  return app.getResourceUsage().getMemorySize();
-}
-  }
-);
-metrics.register("variable.app." + oldAppId + ".usage.vcores",
-  new Gauge() {
-@Override
-public Integer getValue() {
-  return app.getResourceUsage().getVirtualCores();
-}
-  }
-);
-metrics.register("variable.app." + oldAppId + ".minshare.memory",
-  new Gauge() {
-@Override
-public Long getValue() {
-  return app.getMinShare().getMemorySize();
-}
-  }
-);
-metrics.register("variable.app." + oldAppId + ".minshare.vcores",
-  new Gauge() {
-@Override
-public Long 

[2/6] hadoop git commit: YARN-6608. Backport all SLS improvements from trunk to branch-2. (Carlo Curino via wangda)

[wangda]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d894f910/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
index e152696..154bcc9 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
@@ -18,7 +18,6 @@
 
 package org.apache.hadoop.yarn.sls.web;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.text.MessageFormat;
@@ -26,11 +25,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Unstable;
 import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
@@ -38,12 +38,12 @@ import org.apache.hadoop.yarn.sls.SLSRunner;
 import org.apache.hadoop.yarn.sls.scheduler.FairSchedulerMetrics;
 import org.apache.hadoop.yarn.sls.scheduler.SchedulerMetrics;
 import org.apache.hadoop.yarn.sls.scheduler.SchedulerWrapper;
+
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Request;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.handler.AbstractHandler;
 import org.mortbay.jetty.handler.ResourceHandler;
-
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.Histogram;
@@ -84,12 +84,12 @@ public class SLSWebApp extends HttpServlet {
 // load templates
 ClassLoader cl = Thread.currentThread().getContextClassLoader();
 try {
-  simulateInfoTemplate = FileUtils.readFileToString(new File(
-  cl.getResource("simulate.info.html.template").getFile()));
-  simulateTemplate = FileUtils.readFileToString(new File(
-  cl.getResource("simulate.html.template").getFile()));
-  trackTemplate = FileUtils.readFileToString(new File(
-  cl.getResource("track.html.template").getFile()));
+  simulateInfoTemplate = IOUtils.toString(
+  cl.getResourceAsStream("html/simulate.info.html.template"));
+  simulateTemplate = IOUtils.toString(
+  cl.getResourceAsStream("html/simulate.html.template"));
+  trackTemplate = IOUtils.toString(
+  cl.getResourceAsStream("html/track.html.template"));
 } catch (IOException e) {
   e.printStackTrace();
 }
@@ -105,24 +105,23 @@ public class SLSWebApp extends HttpServlet {
 
   public SLSWebApp(SchedulerWrapper wrapper, int metricsAddressPort) {
 this.wrapper = wrapper;
-metrics = wrapper.getMetrics();
-handleOperTimecostHistogramMap =
-new HashMap();
-queueAllocatedMemoryCounterMap = new HashMap();
-queueAllocatedVCoresCounterMap = new HashMap();
+handleOperTimecostHistogramMap = new HashMap<>();
+queueAllocatedMemoryCounterMap = new HashMap<>();
+queueAllocatedVCoresCounterMap = new HashMap<>();
 schedulerMetrics = wrapper.getSchedulerMetrics();
+metrics = schedulerMetrics.getMetrics();
 port = metricsAddressPort;
   }
 
   public void start() throws Exception {
-// static files
 final ResourceHandler staticHandler = new ResourceHandler();
 staticHandler.setResourceBase("html");
 
 Handler handler = new AbstractHandler() {
   @Override
   public void handle(String target, HttpServletRequest request,
- HttpServletResponse response, int dispatch) {
+  HttpServletResponse response, int dispatch)
+  throws IOException, ServletException {
 try{
   // timeunit
   int timeunit = 1000;   // second, divide millionsecond / 1000
@@ -183,14 +182,14 @@ public class SLSWebApp extends HttpServlet {
 response.setStatus(HttpServletResponse.SC_OK);
 
 String simulateInfo;
-if (SLSRunner.simulateInfoMap.isEmpty()) {
+if (SLSRunner.getSimulateInfoMap().isEmpty()) {
   String empty = "" +
   "No information available";
   simulateInfo = MessageFormat.format(simulateInfoTemplate, empty);
 } else {
   StringBuilder info = new StringBuilder();
   for (Map.Entry entry :
-  SLSRunner.simulateInfoMap.entrySet()) {
+  SLSRunner.getSimulateInfoMap().entrySet()) {
 info.append("");
 info.append("").append(entry.getKey()).append("");
 

[3/6] hadoop git commit: YARN-6608. Backport all SLS improvements from trunk to branch-2. (Carlo Curino via wangda)

[wangda]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d894f910/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
new file mode 100644
index 000..81f6648
--- /dev/null
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
@@ -0,0 +1,346 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.yarn.sls.scheduler;
+
+import com.codahale.metrics.Timer;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Unstable;
+import org.apache.hadoop.conf.Configurable;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+import org.apache.hadoop.yarn.api.records.Container;
+import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+import org.apache.hadoop.yarn.api.records.ContainerId;
+import org.apache.hadoop.yarn.api.records.ContainerStatus;
+import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.api.records.ResourceRequest;
+import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
+import 
org.apache.hadoop.yarn.server.resourcemanager.rmnode.UpdatedContainerInfo;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.ContainerUpdates;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerAppReport;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptRemovedSchedulerEvent;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSLeafQueue;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue;
+import 
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import org.apache.hadoop.yarn.sls.SLSRunner;
+import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+import org.apache.hadoop.yarn.util.resource.Resources;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Private
+@Unstable
+public class SLSFairScheduler extends FairScheduler
+implements SchedulerWrapper, Configurable {
+  private SchedulerMetrics schedulerMetrics;
+  private boolean metricsON;
+  private Tracker tracker;
+
+  private Map preemptionContainerMap =
+  new ConcurrentHashMap<>();
+
+  public SchedulerMetrics getSchedulerMetrics() {
+return schedulerMetrics;
+  }
+
+  public Tracker getTracker() {
+return tracker;
+  }
+
+  public SLSFairScheduler() {
+tracker = new Tracker();
+  }
+
+  @Override
+  public void setConf(Configuration conf) {
+super.setConfig(conf);
+
+metricsON = conf.getBoolean(SLSConfiguration.METRICS_SWITCH, true);
+if (metricsON) {
+  try {
+schedulerMetrics = SchedulerMetrics.getInstance(conf,
+FairScheduler.class);
+schedulerMetrics.init(this, conf);
+  } catch (Exception e) {
+e.printStackTrace();
+  }
+}
+  }
+
+  @Override
+  public Allocation allocate(ApplicationAttemptId attemptId,
+  List resourceRequests, List containerIds,
+  List blacklistAdditions, List blacklistRemovals,
+  ContainerUpdates updateRequests) {
+if (metricsON) {
+  final Timer.Context context = 
schedulerMetrics.getSchedulerAllocateTimer()
+  .time();
+  Allocation allocation = null;
+  try {
+allocation = 

[6/6] hadoop git commit: YARN-6608. Backport all SLS improvements from trunk to branch-2. (Carlo Curino via wangda)

[wangda]

YARN-6608. Backport all SLS improvements from trunk to branch-2. (Carlo Curino 
via wangda)


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

Branch: refs/heads/branch-2
Commit: d894f910d09dd219c540b66b6bd7d15198f4c01b
Parents: 5e7491d
Author: Wangda Tan 
Authored: Tue Oct 17 19:45:09 2017 -0700
Committer: Wangda Tan 
Committed: Tue Oct 17 19:45:09 2017 -0700

--
 .../hadoop/metrics2/source/JvmMetrics.java  |  10 +
 .../org/apache/hadoop/tools/rumen/TaskInfo.java |  29 +-
 hadoop-tools/hadoop-sls/pom.xml |  48 +-
 .../hadoop-sls/src/main/assemblies/sls.xml  |   4 +-
 hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh  |  31 +-
 .../src/main/data/2jobs2min-rumen-jh.json   | 705 +-
 .../src/main/html/js/thirdparty/jquery.js   |   2 +-
 .../hadoop/yarn/sls/ReservationClientUtil.java  |  78 ++
 .../hadoop/yarn/sls/RumenToSLSConverter.java|   8 +-
 .../org/apache/hadoop/yarn/sls/SLSRunner.java   | 932 --
 .../hadoop/yarn/sls/appmaster/AMSimulator.java  | 259 +++--
 .../yarn/sls/appmaster/MRAMSimulator.java   | 230 ++---
 .../hadoop/yarn/sls/conf/SLSConfiguration.java  |  15 +
 .../yarn/sls/nodemanager/NMSimulator.java   |   1 -
 .../sls/resourcemanager/MockAMLauncher.java | 120 +++
 .../sls/scheduler/FairSchedulerMetrics.java | 328 +++
 .../sls/scheduler/ResourceSchedulerWrapper.java | 973 ---
 .../sls/scheduler/SLSCapacityScheduler.java | 680 +++--
 .../yarn/sls/scheduler/SLSFairScheduler.java| 346 +++
 .../yarn/sls/scheduler/SchedulerMetrics.java| 605 +++-
 .../yarn/sls/scheduler/SchedulerWrapper.java|  27 +-
 .../hadoop/yarn/sls/scheduler/TaskRunner.java   |   9 +-
 .../hadoop/yarn/sls/scheduler/Tracker.java  |  46 +
 .../hadoop/yarn/sls/synthetic/SynthJob.java | 306 ++
 .../yarn/sls/synthetic/SynthJobClass.java   | 180 
 .../sls/synthetic/SynthTraceJobProducer.java| 319 ++
 .../hadoop/yarn/sls/synthetic/SynthUtils.java   | 101 ++
 .../yarn/sls/synthetic/SynthWorkload.java   | 121 +++
 .../hadoop/yarn/sls/synthetic/package-info.java |  22 +
 .../apache/hadoop/yarn/sls/utils/SLSUtils.java  |  61 +-
 .../apache/hadoop/yarn/sls/web/SLSWebApp.java   |  45 +-
 .../src/site/markdown/SchedulerLoadSimulator.md | 151 ++-
 .../hadoop/yarn/sls/BaseSLSRunnerTest.java  | 151 +++
 .../sls/TestReservationSystemInvariants.java|  77 ++
 .../apache/hadoop/yarn/sls/TestSLSRunner.java   |  95 +-
 .../hadoop/yarn/sls/TestSynthJobGeneration.java |  96 ++
 .../yarn/sls/appmaster/TestAMSimulator.java |  89 +-
 .../yarn/sls/nodemanager/TestNMSimulator.java   |  32 +-
 .../yarn/sls/scheduler/TestTaskRunner.java  |   2 +-
 .../hadoop/yarn/sls/utils/TestSLSUtils.java |  30 +
 .../hadoop/yarn/sls/web/TestSLSWebApp.java  |  28 +-
 .../src/test/resources/capacity-scheduler.xml   |  10 +
 .../src/test/resources/exit-invariants.txt  |   8 +
 .../src/test/resources/fair-scheduler.xml   |   8 +-
 .../hadoop-sls/src/test/resources/inputsls.json |  55 ++
 .../src/test/resources/log4j.properties |  19 +
 .../hadoop-sls/src/test/resources/nodes.json|  84 ++
 .../src/test/resources/ongoing-invariants.txt   |  54 +
 .../src/test/resources/sls-runner.xml   |   6 +-
 .../hadoop-sls/src/test/resources/syn.json  |  53 +
 .../hadoop-sls/src/test/resources/yarn-site.xml |  19 +-
 .../hadoop-yarn-server-resourcemanager/pom.xml  |   1 +
 .../invariants/InvariantViolationException.java |  35 +
 .../monitor/invariants/InvariantsChecker.java   |  96 ++
 .../invariants/MetricsInvariantChecker.java | 195 
 .../ReservationInvariantsChecker.java   |  63 ++
 .../monitor/invariants/package-info.java|  22 +
 .../invariants/TestMetricsInvariantChecker.java |  99 ++
 .../src/test/resources/invariants.txt   |  54 +
 59 files changed, 5172 insertions(+), 3101 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d894f910/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
index caba170..c6369cd 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
+++ 

hadoop git commit: MAPREDUCE-6972. Enable try-with-resources for RecordReader. Contributed by Zoltan Haindrich.

[aajisaka]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 12d19d397 -> a887016e1


MAPREDUCE-6972. Enable try-with-resources for RecordReader. Contributed by 
Zoltan Haindrich.

(cherry picked from commit 2523e1cce5f6d6c3762c958c7f3138ab486c8497)


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

Branch: refs/heads/branch-3.0
Commit: a887016e1d13d486d5c9541206a7a98a63f42c27
Parents: 12d19d3
Author: Akira Ajisaka 
Authored: Wed Oct 18 11:18:03 2017 +0900
Committer: Akira Ajisaka 
Committed: Wed Oct 18 11:19:00 2017 +0900

--
 .../src/main/java/org/apache/hadoop/mapred/RecordReader.java   | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a887016e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
index 6e2c89f..0a996dc 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.mapred;
 
+import java.io.Closeable;
 import java.io.IOException;
 
 import org.apache.hadoop.classification.InterfaceAudience;
@@ -38,7 +39,7 @@ import org.apache.hadoop.classification.InterfaceStability;
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable
-public interface RecordReader {
+public interface RecordReader extends Closeable{
   /** 
* Reads the next key/value pair from the input for processing.
*
@@ -74,7 +75,8 @@ public interface RecordReader {
* Close this {@link InputSplit} to future operations.
* 
* @throws IOException
-   */ 
+   */
+  @Override
   public void close() throws IOException;
 
   /**


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: MAPREDUCE-6972. Enable try-with-resources for RecordReader. Contributed by Zoltan Haindrich.

[aajisaka]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 86ee0c5e4 -> 2523e1cce


MAPREDUCE-6972. Enable try-with-resources for RecordReader. Contributed by 
Zoltan Haindrich.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2523e1cc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2523e1cc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2523e1cc

Branch: refs/heads/trunk
Commit: 2523e1cce5f6d6c3762c958c7f3138ab486c8497
Parents: 86ee0c5
Author: Akira Ajisaka 
Authored: Wed Oct 18 11:18:03 2017 +0900
Committer: Akira Ajisaka 
Committed: Wed Oct 18 11:18:39 2017 +0900

--
 .../src/main/java/org/apache/hadoop/mapred/RecordReader.java   | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2523e1cc/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
index 6e2c89f..0a996dc 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/RecordReader.java
@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.mapred;
 
+import java.io.Closeable;
 import java.io.IOException;
 
 import org.apache.hadoop.classification.InterfaceAudience;
@@ -38,7 +39,7 @@ import org.apache.hadoop.classification.InterfaceStability;
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable
-public interface RecordReader {
+public interface RecordReader extends Closeable{
   /** 
* Reads the next key/value pair from the input for processing.
*
@@ -74,7 +75,8 @@ public interface RecordReader {
* Close this {@link InputSplit} to future operations.
* 
* @throws IOException
-   */ 
+   */
+  @Override
   public void close() throws IOException;
 
   /**


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: HADOOP-14944. Add JvmMetrics to KMS.

[xiao]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 46eb1033a -> 86ee0c5e4


HADOOP-14944. Add JvmMetrics to KMS.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/86ee0c5e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/86ee0c5e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/86ee0c5e

Branch: refs/heads/trunk
Commit: 86ee0c5e4e304d9551a24a3d8b9161ca1502b70e
Parents: 46eb103
Author: Xiao Chen 
Authored: Tue Oct 17 15:55:30 2017 -0700
Committer: Xiao Chen 
Committed: Tue Oct 17 19:06:45 2017 -0700

--
 .../hadoop/metrics2/source/JvmMetrics.java  | 16 +
 .../crypto/key/kms/server/KMSConfiguration.java |  9 +
 .../crypto/key/kms/server/KMSWebServer.java | 24 ++
 .../hadoop/crypto/key/kms/server/TestKMS.java   | 35 
 4 files changed, 84 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/86ee0c5e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
index c6369cd..e3f8754 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
@@ -58,6 +58,11 @@ public class JvmMetrics implements MetricsSource {
   }
   return impl;
 }
+
+synchronized void shutdown() {
+  DefaultMetricsSystem.instance().unregisterSource(JvmMetrics.name());
+  impl = null;
+}
   }
 
   @VisibleForTesting
@@ -81,6 +86,7 @@ public class JvmMetrics implements MetricsSource {
   final ConcurrentHashMap gcInfoCache =
   new ConcurrentHashMap();
 
+  @VisibleForTesting
   JvmMetrics(String processName, String sessionId) {
 this.processName = processName;
 this.sessionId = sessionId;
@@ -104,6 +110,16 @@ public class JvmMetrics implements MetricsSource {
 return Singleton.INSTANCE.init(processName, sessionId);
   }
 
+  /**
+   * Shutdown the JvmMetrics singleton. This is not necessary if the JVM itself
+   * is shutdown, but may be necessary for scenarios where JvmMetrics instance
+   * needs to be re-created while the JVM is still around. One such scenario
+   * is unit-testing.
+   */
+  public static void shutdownSingleton() {
+Singleton.INSTANCE.shutdown();
+  }
+
   @Override
   public void getMetrics(MetricsCollector collector, boolean all) {
 MetricsRecordBuilder rb = collector.addRecord(JvmMetrics)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/86ee0c5e/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
--
diff --git 
a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
 
b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
index df17ef5..18eec19 100644
--- 
a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
+++ 
b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
@@ -76,6 +76,15 @@ public class KMSConfiguration {
   public static final String KMS_AUDIT_AGGREGATION_WINDOW = CONFIG_PREFIX +
   "audit.aggregation.window.ms";
 
+  // Process name shown in metrics
+  public static final String METRICS_PROCESS_NAME_KEY =
+  CONFIG_PREFIX + "metrics.process.name";
+  public static final String METRICS_PROCESS_NAME_DEFAULT = "KMS";
+
+  // Session id for metrics
+  public static final String METRICS_SESSION_ID_KEY =
+  CONFIG_PREFIX + "metrics.session.id";
+
   // KMS Audit logger classes to use
   public static final String KMS_AUDIT_LOGGER_KEY = CONFIG_PREFIX +
   "audit.logger";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/86ee0c5e/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java
--
diff --git 
a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java
 
b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java
index ced1f69..19f7227 100644
--- 

hadoop git commit: HADOOP-14944. Add JvmMetrics to KMS.

[xiao]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 5897095d5 -> 12d19d397


HADOOP-14944. Add JvmMetrics to KMS.

(cherry picked from commit 86ee0c5e4e304d9551a24a3d8b9161ca1502b70e)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12d19d39
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/12d19d39
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/12d19d39

Branch: refs/heads/branch-3.0
Commit: 12d19d39781b0aa3372b4f7eb9a6672a2452a92f
Parents: 5897095
Author: Xiao Chen 
Authored: Tue Oct 17 15:55:30 2017 -0700
Committer: Xiao Chen 
Committed: Tue Oct 17 19:07:19 2017 -0700

--
 .../hadoop/metrics2/source/JvmMetrics.java  | 16 +
 .../crypto/key/kms/server/KMSConfiguration.java |  9 +
 .../crypto/key/kms/server/KMSWebServer.java | 24 ++
 .../hadoop/crypto/key/kms/server/TestKMS.java   | 35 
 4 files changed, 84 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/12d19d39/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
index c6369cd..e3f8754 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
@@ -58,6 +58,11 @@ public class JvmMetrics implements MetricsSource {
   }
   return impl;
 }
+
+synchronized void shutdown() {
+  DefaultMetricsSystem.instance().unregisterSource(JvmMetrics.name());
+  impl = null;
+}
   }
 
   @VisibleForTesting
@@ -81,6 +86,7 @@ public class JvmMetrics implements MetricsSource {
   final ConcurrentHashMap gcInfoCache =
   new ConcurrentHashMap();
 
+  @VisibleForTesting
   JvmMetrics(String processName, String sessionId) {
 this.processName = processName;
 this.sessionId = sessionId;
@@ -104,6 +110,16 @@ public class JvmMetrics implements MetricsSource {
 return Singleton.INSTANCE.init(processName, sessionId);
   }
 
+  /**
+   * Shutdown the JvmMetrics singleton. This is not necessary if the JVM itself
+   * is shutdown, but may be necessary for scenarios where JvmMetrics instance
+   * needs to be re-created while the JVM is still around. One such scenario
+   * is unit-testing.
+   */
+  public static void shutdownSingleton() {
+Singleton.INSTANCE.shutdown();
+  }
+
   @Override
   public void getMetrics(MetricsCollector collector, boolean all) {
 MetricsRecordBuilder rb = collector.addRecord(JvmMetrics)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/12d19d39/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
--
diff --git 
a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
 
b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
index df17ef5..18eec19 100644
--- 
a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
+++ 
b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java
@@ -76,6 +76,15 @@ public class KMSConfiguration {
   public static final String KMS_AUDIT_AGGREGATION_WINDOW = CONFIG_PREFIX +
   "audit.aggregation.window.ms";
 
+  // Process name shown in metrics
+  public static final String METRICS_PROCESS_NAME_KEY =
+  CONFIG_PREFIX + "metrics.process.name";
+  public static final String METRICS_PROCESS_NAME_DEFAULT = "KMS";
+
+  // Session id for metrics
+  public static final String METRICS_SESSION_ID_KEY =
+  CONFIG_PREFIX + "metrics.session.id";
+
   // KMS Audit logger classes to use
   public static final String KMS_AUDIT_LOGGER_KEY = CONFIG_PREFIX +
   "audit.logger";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/12d19d39/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java
--
diff --git 
a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java
 
b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java
index ced1f69..19f7227 100644
--- 

hadoop git commit: HDFS-12420. Add an option to disallow 'namenode format -force'. Contributed by Ajay Kumar.

[zhz]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 175c4472d -> 5897095d5


HDFS-12420. Add an option to disallow 'namenode format -force'. Contributed by 
Ajay Kumar.

(cherry picked from commit b6942cbe9b8c9469e8c2b64c3268d671f5a43e75)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5897095d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5897095d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5897095d

Branch: refs/heads/branch-3.0
Commit: 5897095d539be086ed37df011f024e37eb37b0cd
Parents: 175c447
Author: Arpit Agarwal 
Authored: Thu Oct 5 15:26:52 2017 -0700
Committer: Zhe Zhang 
Committed: Tue Oct 17 16:45:21 2017 -0700

--
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |  3 ++
 .../hadoop/hdfs/server/namenode/NameNode.java   | 16 +
 .../namenode/NameNodeFormatException.java   | 37 
 .../src/main/resources/hdfs-default.xml | 10 ++
 .../src/site/markdown/HDFSCommands.md   |  2 +-
 .../hdfs/server/namenode/TestClusterId.java | 34 ++
 6 files changed, 101 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5897095d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index fbc49fa..582ae4e 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -281,6 +281,9 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
   "dfs.namenode.posix.acl.inheritance.enabled";
   public static final boolean
   DFS_NAMENODE_POSIX_ACL_INHERITANCE_ENABLED_DEFAULT = true;
+  public static final String DFS_REFORMAT_DISABLED = "dfs.reformat.disabled";
+  public static final boolean DFS_REFORMAT_DISABLED_DEFAULT = false;
+
   public static final String  DFS_NAMENODE_XATTRS_ENABLED_KEY = 
"dfs.namenode.xattrs.enabled";
   public static final boolean DFS_NAMENODE_XATTRS_ENABLED_DEFAULT = true;
   public static final String  DFS_ADMIN = "dfs.cluster.administrators";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5897095d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index 79bbbc5..32b873b 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -50,6 +50,7 @@ import 
org.apache.hadoop.hdfs.server.common.HdfsServerConstants.NamenodeRole;
 import 
org.apache.hadoop.hdfs.server.common.HdfsServerConstants.RollingUpgradeStartupOption;
 import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
 import org.apache.hadoop.hdfs.server.common.MetricsLoggerTask;
+import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
 import org.apache.hadoop.hdfs.server.namenode.ha.ActiveState;
 import org.apache.hadoop.hdfs.server.namenode.ha.BootstrapStandby;
 import org.apache.hadoop.hdfs.server.namenode.ha.HAContext;
@@ -1146,6 +1147,21 @@ public class NameNode extends ReconfigurableBase 
implements
   FSNamesystem fsn = new FSNamesystem(conf, fsImage);
   fsImage.getEditLog().initJournalsForWrite();
 
+  // Abort NameNode format if reformat is disabled and if
+  // meta-dir already exists
+  if (conf.getBoolean(DFSConfigKeys.DFS_REFORMAT_DISABLED,
+  DFSConfigKeys.DFS_REFORMAT_DISABLED_DEFAULT)) {
+force = false;
+isInteractive = false;
+for (StorageDirectory sd : fsImage.storage.dirIterable(null)) {
+  if (sd.hasSomeData()) {
+throw new NameNodeFormatException(
+"NameNode format aborted as reformat is disabled for "
++ "this cluster.");
+  }
+}
+  }
+
   if (!fsImage.confirmFormat(force, isInteractive)) {
 return true; // aborted
   }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5897095d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeFormatException.java

hadoop git commit: YARN-6546. SLS is slow while loading 10k queues. (Yufei Gu via Haibo Chen)

[haibochen]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 6959db9c2 -> 175c4472d


YARN-6546. SLS is slow while loading 10k queues. (Yufei Gu via Haibo Chen)

(cherry picked from commit 46eb1033a86ca53e7b94202567aef8af2417bdf8)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/175c4472
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/175c4472
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/175c4472

Branch: refs/heads/branch-3.0
Commit: 175c4472d5b42bb972cd7da8469c9aa71b9bb0d1
Parents: 6959db9
Author: Haibo Chen 
Authored: Tue Oct 17 16:03:46 2017 -0700
Committer: Haibo Chen 
Committed: Tue Oct 17 16:04:49 2017 -0700

--
 .../org/apache/hadoop/yarn/sls/SLSRunner.java   |  1 +
 .../sls/scheduler/CapacitySchedulerMetrics.java |  5 --
 .../sls/scheduler/FairSchedulerMetrics.java | 17 +
 .../sls/scheduler/FifoSchedulerMetrics.java |  5 +-
 .../sls/scheduler/SLSCapacityScheduler.java | 19 --
 .../yarn/sls/scheduler/SLSFairScheduler.java| 19 --
 .../yarn/sls/scheduler/SchedulerMetrics.java| 66 +---
 7 files changed, 36 insertions(+), 96 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/175c4472/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
index 59f9c17..dfdf7c9 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
@@ -731,6 +731,7 @@ public class SLSRunner extends Configured implements Tool {
 }
 
 queueAppNumMap.put(queueName, appNum);
+wrapper.getSchedulerMetrics().trackQueue(queueName);
   }
 
   private void runNewAM(String jobType, String user,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/175c4472/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
index a73f48c..89b44c6 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
@@ -28,9 +28,4 @@ public class CapacitySchedulerMetrics extends 
SchedulerMetrics {
   public CapacitySchedulerMetrics() {
 super();
   }
-
-  @Override
-  public void trackQueue(String queueName) {
-trackedQueues.add(queueName);
-  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/175c4472/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
index 7b306f0..a5aee74 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
@@ -167,8 +167,9 @@ public class FairSchedulerMetrics extends SchedulerMetrics {
   }
 
   @Override
-  public void trackQueue(String queueName) {
-trackedQueues.add(queueName);
+  protected void registerQueueMetrics(String queueName) {
+super.registerQueueMetrics(queueName);
+
 FairScheduler fair = (FairScheduler) scheduler;
 final FSQueue queue = fair.getQueueManager().getQueue(queueName);
 registerQueueMetrics(queue, Metric.DEMAND);
@@ -209,16 +210,4 @@ public class FairSchedulerMetrics extends SchedulerMetrics 
{
   }
 );
   }
-
-  @Override
-  public void untrackQueue(String queueName) {
-trackedQueues.remove(queueName);
-
-for (Metric metric: Metric.values()) {
-  metrics.remove("variable.queue." + queueName + "." +
-  metric.value + ".memory");
-  metrics.remove("variable.queue." + queueName + "." +
-  metric.value + ".vcores");
-}
-  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/175c4472/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java

hadoop git commit: YARN-6546. SLS is slow while loading 10k queues. (Yufei Gu via Haibo Chen)

[haibochen]

Repository: hadoop
Updated Branches:
  refs/heads/trunk f27a4ad03 -> 46eb1033a


YARN-6546. SLS is slow while loading 10k queues. (Yufei Gu via Haibo Chen)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/46eb1033
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/46eb1033
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/46eb1033

Branch: refs/heads/trunk
Commit: 46eb1033a86ca53e7b94202567aef8af2417bdf8
Parents: f27a4ad
Author: Haibo Chen 
Authored: Tue Oct 17 16:03:46 2017 -0700
Committer: Haibo Chen 
Committed: Tue Oct 17 16:04:19 2017 -0700

--
 .../org/apache/hadoop/yarn/sls/SLSRunner.java   |  1 +
 .../sls/scheduler/CapacitySchedulerMetrics.java |  5 --
 .../sls/scheduler/FairSchedulerMetrics.java | 17 +
 .../sls/scheduler/FifoSchedulerMetrics.java |  5 +-
 .../sls/scheduler/SLSCapacityScheduler.java | 19 --
 .../yarn/sls/scheduler/SLSFairScheduler.java| 19 --
 .../yarn/sls/scheduler/SchedulerMetrics.java| 66 +---
 7 files changed, 36 insertions(+), 96 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/46eb1033/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
index 59f9c17..dfdf7c9 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
@@ -731,6 +731,7 @@ public class SLSRunner extends Configured implements Tool {
 }
 
 queueAppNumMap.put(queueName, appNum);
+wrapper.getSchedulerMetrics().trackQueue(queueName);
   }
 
   private void runNewAM(String jobType, String user,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/46eb1033/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
index a73f48c..89b44c6 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
@@ -28,9 +28,4 @@ public class CapacitySchedulerMetrics extends 
SchedulerMetrics {
   public CapacitySchedulerMetrics() {
 super();
   }
-
-  @Override
-  public void trackQueue(String queueName) {
-trackedQueues.add(queueName);
-  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/46eb1033/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
--
diff --git 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
index 7b306f0..a5aee74 100644
--- 
a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
+++ 
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
@@ -167,8 +167,9 @@ public class FairSchedulerMetrics extends SchedulerMetrics {
   }
 
   @Override
-  public void trackQueue(String queueName) {
-trackedQueues.add(queueName);
+  protected void registerQueueMetrics(String queueName) {
+super.registerQueueMetrics(queueName);
+
 FairScheduler fair = (FairScheduler) scheduler;
 final FSQueue queue = fair.getQueueManager().getQueue(queueName);
 registerQueueMetrics(queue, Metric.DEMAND);
@@ -209,16 +210,4 @@ public class FairSchedulerMetrics extends SchedulerMetrics 
{
   }
 );
   }
-
-  @Override
-  public void untrackQueue(String queueName) {
-trackedQueues.remove(queueName);
-
-for (Metric metric: Metric.values()) {
-  metrics.remove("variable.queue." + queueName + "." +
-  metric.value + ".memory");
-  metrics.remove("variable.queue." + queueName + "." +
-  metric.value + ".vcores");
-}
-  }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/46eb1033/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java
--
diff --git 

hadoop git commit: HDFS-12612. DFSStripedOutputStream.close will throw if called a second time with a failed streamer. (Lei (Eddy) Xu)

[lei]

Repository: hadoop
Updated Branches:
  refs/heads/trunk 75323394f -> f27a4ad03


HDFS-12612. DFSStripedOutputStream.close will throw if called a second time 
with a failed streamer. (Lei (Eddy) Xu)


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

Branch: refs/heads/trunk
Commit: f27a4ad0324aa0b4080a1c4c6bf4cd560c927e20
Parents: 7532339
Author: Lei Xu 
Authored: Tue Oct 17 15:52:09 2017 -0700
Committer: Lei Xu 
Committed: Tue Oct 17 15:52:09 2017 -0700

--
 .../hadoop/hdfs/DFSStripedOutputStream.java | 40 +++
 .../org/apache/hadoop/hdfs/DataStreamer.java| 31 ++--
 .../apache/hadoop/hdfs/ExceptionLastSeen.java   | 75 +++
 .../TestDFSStripedOutputStreamWithFailure.java  | 76 
 4 files changed, 184 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f27a4ad0/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
index 1b83959..39717ef 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
@@ -82,6 +82,12 @@ public class DFSStripedOutputStream extends DFSOutputStream
 implements StreamCapabilities {
   private static final ByteBufferPool BUFFER_POOL = new 
ElasticByteBufferPool();
 
+  /**
+   * OutputStream level last exception, will be used to indicate the fatal
+   * exception of this stream, i.e., being aborted.
+   */
+  private final ExceptionLastSeen exceptionLastSeen = new ExceptionLastSeen();
+
   static class MultipleBlockingQueue {
 private final List queues;
 
@@ -971,12 +977,9 @@ public class DFSStripedOutputStream extends DFSOutputStream
   if (isClosed()) {
 return;
   }
-  for (StripedDataStreamer streamer : streamers) {
-streamer.getLastException().set(
-new IOException("Lease timeout of "
-+ (dfsClient.getConf().getHdfsTimeout() / 1000)
-+ " seconds expired."));
-  }
+  exceptionLastSeen.set(new IOException("Lease timeout of "
+  + (dfsClient.getConf().getHdfsTimeout() / 1000)
+  + " seconds expired."));
 
   try {
 closeThreads(true);
@@ -1133,18 +1136,26 @@ public class DFSStripedOutputStream extends 
DFSOutputStream
   @Override
   protected synchronized void closeImpl() throws IOException {
 if (isClosed()) {
+  exceptionLastSeen.check(true);
+
+  // Writing to at least {dataUnits} replicas can be considered as success,
+  // and the rest of data can be recovered.
+  final int minReplication = ecPolicy.getNumDataUnits();
+  int goodStreamers = 0;
   final MultipleIOException.Builder b = new MultipleIOException.Builder();
-  for(int i = 0; i < streamers.size(); i++) {
-final StripedDataStreamer si = getStripedDataStreamer(i);
+  for (final StripedDataStreamer si : streamers) {
 try {
   si.getLastException().check(true);
+  goodStreamers++;
 } catch (IOException e) {
   b.add(e);
 }
   }
-  final IOException ioe = b.build();
-  if (ioe != null) {
-throw ioe;
+  if (goodStreamers < minReplication) {
+final IOException ioe = b.build();
+if (ioe != null) {
+  throw ioe;
+}
   }
   return;
 }
@@ -1183,9 +1194,10 @@ public class DFSStripedOutputStream extends 
DFSOutputStream
 }
   } finally {
 // Failures may happen when flushing data/parity data out. Exceptions
-// may be thrown if more than 3 streamers fail, or updatePipeline RPC
-// fails. Streamers may keep waiting for the new block/GS information.
-// Thus need to force closing these threads.
+// may be thrown if the number of failed streamers is more than the
+// number of parity blocks, or updatePipeline RPC fails. Streamers may
+// keep waiting for the new block/GS information. Thus need to force
+// closing these threads.
 closeThreads(true);
   }
 

hadoop git commit: HDFS-12612. DFSStripedOutputStream.close will throw if called a second time with a failed streamer. (Lei (Eddy) Xu)

[lei]

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 81a86860b -> 6959db9c2


HDFS-12612. DFSStripedOutputStream.close will throw if called a second time 
with a failed streamer. (Lei (Eddy) Xu)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6959db9c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6959db9c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6959db9c

Branch: refs/heads/branch-3.0
Commit: 6959db9c20217f6adb12e9f3140f5db9a26c38c4
Parents: 81a8686
Author: Lei Xu 
Authored: Tue Oct 17 15:52:09 2017 -0700
Committer: Lei Xu 
Committed: Tue Oct 17 15:53:07 2017 -0700

--
 .../hadoop/hdfs/DFSStripedOutputStream.java | 40 +++
 .../org/apache/hadoop/hdfs/DataStreamer.java| 31 ++--
 .../apache/hadoop/hdfs/ExceptionLastSeen.java   | 75 +++
 .../TestDFSStripedOutputStreamWithFailure.java  | 76 
 4 files changed, 184 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6959db9c/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
index 1b83959..39717ef 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
@@ -82,6 +82,12 @@ public class DFSStripedOutputStream extends DFSOutputStream
 implements StreamCapabilities {
   private static final ByteBufferPool BUFFER_POOL = new 
ElasticByteBufferPool();
 
+  /**
+   * OutputStream level last exception, will be used to indicate the fatal
+   * exception of this stream, i.e., being aborted.
+   */
+  private final ExceptionLastSeen exceptionLastSeen = new ExceptionLastSeen();
+
   static class MultipleBlockingQueue {
 private final List queues;
 
@@ -971,12 +977,9 @@ public class DFSStripedOutputStream extends DFSOutputStream
   if (isClosed()) {
 return;
   }
-  for (StripedDataStreamer streamer : streamers) {
-streamer.getLastException().set(
-new IOException("Lease timeout of "
-+ (dfsClient.getConf().getHdfsTimeout() / 1000)
-+ " seconds expired."));
-  }
+  exceptionLastSeen.set(new IOException("Lease timeout of "
+  + (dfsClient.getConf().getHdfsTimeout() / 1000)
+  + " seconds expired."));
 
   try {
 closeThreads(true);
@@ -1133,18 +1136,26 @@ public class DFSStripedOutputStream extends 
DFSOutputStream
   @Override
   protected synchronized void closeImpl() throws IOException {
 if (isClosed()) {
+  exceptionLastSeen.check(true);
+
+  // Writing to at least {dataUnits} replicas can be considered as success,
+  // and the rest of data can be recovered.
+  final int minReplication = ecPolicy.getNumDataUnits();
+  int goodStreamers = 0;
   final MultipleIOException.Builder b = new MultipleIOException.Builder();
-  for(int i = 0; i < streamers.size(); i++) {
-final StripedDataStreamer si = getStripedDataStreamer(i);
+  for (final StripedDataStreamer si : streamers) {
 try {
   si.getLastException().check(true);
+  goodStreamers++;
 } catch (IOException e) {
   b.add(e);
 }
   }
-  final IOException ioe = b.build();
-  if (ioe != null) {
-throw ioe;
+  if (goodStreamers < minReplication) {
+final IOException ioe = b.build();
+if (ioe != null) {
+  throw ioe;
+}
   }
   return;
 }
@@ -1183,9 +1194,10 @@ public class DFSStripedOutputStream extends 
DFSOutputStream
 }
   } finally {
 // Failures may happen when flushing data/parity data out. Exceptions
-// may be thrown if more than 3 streamers fail, or updatePipeline RPC
-// fails. Streamers may keep waiting for the new block/GS information.
-// Thus need to force closing these threads.
+// may be thrown if the number of failed streamers is more than the
+// number of parity blocks, or updatePipeline RPC fails. Streamers may
+// keep waiting for the new block/GS information. Thus need to force
+// closing these threads.
 closeThreads(true);
   }
 

hadoop git commit: YARN-7323. Data structure update in service REST API. Contributed by Jian He

[billie]

Repository: hadoop
Updated Branches:
  refs/heads/yarn-native-services 630da28ed -> 16ecb9cd8


YARN-7323. Data structure update in service REST API. Contributed by Jian He


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/16ecb9cd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16ecb9cd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16ecb9cd

Branch: refs/heads/yarn-native-services
Commit: 16ecb9cd820f3f437ebe8dec55dac7b26d643090
Parents: 630da28
Author: Billie Rinaldi 
Authored: Tue Oct 17 11:50:16 2017 -0700
Committer: Billie Rinaldi 
Committed: Tue Oct 17 11:50:16 2017 -0700

--
 .../hadoop/yarn/service/webapp/ApiServer.java   |  9 ---
 ...RN-Simplified-V1-API-Layer-For-Services.yaml | 67 -
 .../hadoop/yarn/service/ServiceScheduler.java   |  1 +
 .../yarn/service/api/records/Component.java | 22 +-
 .../service/api/records/ComponentState.java | 30 
 .../yarn/service/api/records/Container.java | 15 ++--
 .../yarn/service/api/records/Service.java   | 76 
 .../yarn/service/api/records/ServiceState.java  |  2 +-
 .../yarn/service/client/ServiceClient.java  | 45 
 .../yarn/service/component/Component.java   | 12 
 .../component/instance/ComponentInstance.java   | 48 +
 .../yarn/service/conf/RestApiConstants.java |  4 --
 .../yarn/service/utils/ServiceApiUtil.java  | 53 ++
 .../hadoop/yarn/service/ServiceTestUtils.java   |  4 +-
 .../hadoop/yarn/service/TestServiceApiUtil.java | 74 ++-
 .../yarn/service/TestYarnNativeServices.java|  4 +-
 .../service/conf/examples/app-override.json |  8 ++-
 .../hadoop/yarn/service/conf/examples/app.json  |  8 ++-
 .../yarn/service/conf/examples/external0.json   | 15 ++--
 .../markdown/yarn-service/YarnServiceAPI.md | 22 +++---
 20 files changed, 232 insertions(+), 287 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/16ecb9cd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
index 5773069..1bb6c93 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
@@ -242,15 +242,6 @@ public class ApiServer {
   return updateLifetime(appName, updateServiceData);
 }
 
-// flex a single component app
-if (updateServiceData.getNumberOfContainers() != null && !ServiceApiUtil
-.hasComponent(updateServiceData)) {
-  Component defaultComp = ServiceApiUtil
-  .createDefaultComponent(updateServiceData);
-  return updateComponent(updateServiceData.getName(), 
defaultComp.getName(),
-  defaultComp);
-}
-
 // If nothing happens consider it a no-op
 return Response.status(Status.NO_CONTENT).build();
   }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/16ecb9cd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
index b9b5b3a..cc76259 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
@@ -19,28 +19,17 @@ swagger: '2.0'
 info:
   title: "YARN Simplified API layer for services"
   description: |
-Bringing a new service on YARN today is not a simple experience. The APIs 
of
-existing frameworks are either too low level (native YARN), require writing
-new code (for frameworks with 

[17/50] [abbrv] hadoop git commit: YARN-5145. [YARN-3368] Move new YARN UI configuration to HADOOP_CONF_DIR. (Sunil G and Kai Sasaki via wangda)

[varunsaxena]

YARN-5145. [YARN-3368] Move new YARN UI configuration to HADOOP_CONF_DIR. 
(Sunil G and Kai Sasaki via wangda)


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

Branch: refs/heads/YARN-3368_branch2
Commit: 751331575847339aa8735d81eabe93cc71d2c51e
Parents: f1de967
Author: Wangda Tan 
Authored: Mon Oct 17 11:30:16 2016 -0700
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../src/main/webapp/app/initializers/loader.js  | 86 
 .../tests/unit/initializers/loader-test.js  | 40 +
 2 files changed, 126 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/75133157/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
new file mode 100644
index 000..08e4dbd
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -0,0 +1,86 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+function getTimeLineURL(parameters) {
+  return '/conf?name=yarn.timeline-service.webapp.address';
+}
+
+function updateConfigs(application) {
+  var hostname = window.location.hostname;
+  var rmhost = hostname +
+(window.location.port ? ':' + window.location.port: '');
+
+  Ember.Logger.log("RM Address:" + rmhost);
+
+  if(!ENV.hosts.rmWebAddress) {
+ENV = {
+   hosts: {
+  rmWebAddress: rmhost,
+},
+};
+  }
+
+  if(!ENV.hosts.timelineWebAddress) {
+var result = [];
+var timelinehost = "";
+$.ajax({
+  type: 'GET',
+  dataType: 'json',
+  async: true,
+  context: this,
+  url: getTimeLineURL(),
+  success: function(data) {
+timelinehost = data.property.value;
+ENV.hosts.timelineWebAddress = timelinehost;
+
+var address = timelinehost.split(":")[0];
+var port = timelinehost.split(":")[1];
+
+Ember.Logger.log("Timeline Address from RM:" + address + ":" + port);
+
+if(address == "0.0.0.0" || address == "localhost") {
+  var updatedAddress =  hostname + ":" + port;
+
+  /* Timeline v2 is not supporting CORS, so make as default*/
+  ENV = {
+ hosts: {
+rmWebAddress: rmhost,
+timelineWebAddress: updatedAddress,
+  },
+  };
+  Ember.Logger.log("Timeline Updated Address:" + updatedAddress);
+}
+application.advanceReadiness();
+  },
+});
+  } else {
+application.advanceReadiness();
+  }
+}
+
+export function initialize( application ) {
+  application.deferReadiness();
+  updateConfigs(application);
+}
+
+export default {
+  name: 'loader',
+  before: 'env',
+  initialize
+};

http://git-wip-us.apache.org/repos/asf/hadoop/blob/75133157/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
new file mode 100644
index 000..cc32e92
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF 

[hadoop] Git Push Summary

[varunsaxena]

Repository: hadoop
Updated Branches:
  refs/heads/YARN-5355_branch2 [created] 56e0873e2

-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[22/50] [abbrv] hadoop git commit: YARN-5490. [YARN-3368] Fix various alignment issues and broken breadcrumb link in Node page. (Akhil P B Tan via Sunil G)

[varunsaxena]

YARN-5490. [YARN-3368] Fix various alignment issues and broken breadcrumb link 
in Node page. (Akhil P B Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9ebb57df
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9ebb57df
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9ebb57df

Branch: refs/heads/YARN-3368_branch2
Commit: 9ebb57dfc8b54bd0a31c6f0adf71c4fa28e5b396
Parents: 36f5091
Author: sunilg 
Authored: Thu Oct 27 21:04:56 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../src/main/webapp/app/controllers/yarn-node-apps.js| 2 +-
 .../src/main/webapp/app/controllers/yarn-node-containers.js  | 2 +-
 .../hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js  | 2 +-
 .../src/main/webapp/app/controllers/yarn-nodes-heatmap.js| 2 +-
 .../hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js | 2 +-
 .../hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs   | 4 ++--
 .../hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
index 4bfe9d0..6e67ab0 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
   routeName: 'application'
 },{
   text: "Nodes",
-  routeName: 'yarn-nodes'
+  routeName: 'yarn-nodes.table'
 }, {
   text: `Node [ ${nodeInfo.id} ]`,
   href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
index 59c8591..abe4098 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
   routeName: 'application'
 },{
   text: "Nodes",
-  routeName: 'yarn-nodes'
+  routeName: 'yarn-nodes.table'
 }, {
   text: `Node [ ${nodeInfo.id} ]`,
   href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
index e505022..0661415 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
   routeName: 'application'
 },{
   text: "Nodes",
-  routeName: 'yarn-nodes'
+  routeName: 'yarn-nodes.table'
 }, {
   text: `Node [ ${nodeInfo.id} ]`,
   href: `/#/yarn-node/${nodeInfo.id}/${nodeInfo.addr}`,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ebb57df/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
index fbe77fa..a38d8c5 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
+++ 

[40/50] [abbrv] hadoop git commit: YARN-7071. Add vcores and number of containers in new YARN UI node heat map. Contributed by Abdullah Yousufi.

[varunsaxena]

YARN-7071. Add vcores and number of containers in new YARN UI node heat map. 
Contributed by Abdullah Yousufi.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1cf7ed8a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1cf7ed8a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1cf7ed8a

Branch: refs/heads/YARN-3368_branch2
Commit: 1cf7ed8a28c723aba9c405f28431e6c31b4effef
Parents: 65b90e1
Author: Sunil G 
Authored: Fri Sep 1 20:46:39 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../main/webapp/app/components/nodes-heatmap.js | 62 ++--
 .../src/main/webapp/app/models/yarn-rm-node.js  |  4 +-
 .../app/templates/components/nodes-heatmap.hbs  |  3 +
 .../webapp/app/templates/yarn-nodes/heatmap.hbs |  2 +-
 4 files changed, 61 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1cf7ed8a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
index 3acc5de..a1df480 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
@@ -27,6 +27,10 @@ export default BaseChartComponent.extend({
   RACK_MARGIN: 20,
   filter: "",
   selectedCategory: 0,
+  memoryLabel: "Memory",
+  cpuLabel: "VCores",
+  containersLabel: "Containers",
+  totalContainers: 0,
 
   bindTP: function(element, cell) {
 element.on("mouseover", function() {
@@ -75,8 +79,7 @@ export default BaseChartComponent.extend({
   return true;
 }
 
-var usage = node.get("usedMemoryMB") /
-  (node.get("usedMemoryMB") + node.get("availMemoryMB"));
+var usage = this.calcUsage(node);
 var lowerLimit = (this.selectedCategory - 1) * 0.2;
 var upperLimit = this.selectedCategory * 0.2;
 if (lowerLimit <= usage && usage <= upperLimit) {
@@ -89,6 +92,7 @@ export default BaseChartComponent.extend({
   //[{label=label1, value=value1}, ...]
   //...
   renderCells: function (model, title) {
+var selectedOption = d3.select("select").property("value");
 var data = [];
 model.forEach(function (o) {
   data.push(o);
@@ -149,6 +153,7 @@ export default BaseChartComponent.extend({
 
 var chartXOffset = -1;
 
+this.totalContainers = 0;
 for (i = 0; i < racksArray.length; i++) {
   text = g.append("text")
 .text(racksArray[i])
@@ -166,6 +171,7 @@ export default BaseChartComponent.extend({
 var rack = data[j].get("rack");
 
 if (rack === racksArray[i]) {
+  this.totalContainers += data[j].get("numContainers");
   this.addNode(g, xOffset, yOffset, colorFunc, data[j]);
   xOffset += this.CELL_MARGIN + this.CELL_WIDTH;
   if (xOffset + this.CELL_MARGIN + this.CELL_WIDTH >= layout.x2 -
@@ -192,7 +198,7 @@ export default BaseChartComponent.extend({
 
 layout.y2 = yOffset + layout.margin;
 this.adjustMaxHeight(layout.y2);
-this.renderTitleAndBG(g, title, layout, false);
+this.renderTitleAndBG(g, title + selectedOption + ")" , layout, false);
   },
 
   addNode: function (g, xOffset, yOffset, colorFunc, data) {
@@ -200,10 +206,9 @@ export default BaseChartComponent.extend({
   .attr("y", yOffset)
   .attr("x", xOffset)
   .attr("height", this.CELL_HEIGHT)
-  .attr("fill", colorFunc(data.get("usedMemoryMB") /
-(data.get("usedMemoryMB") + data.get("availMemoryMB"
+  .attr("fill", colorFunc(this.calcUsage(data)))
   .attr("width", this.CELL_WIDTH)
-  .attr("tooltiptext", data.get("toolTipText"));
+  .attr("tooltiptext", data.get("toolTipText") + 
this.getToolTipText(data));
 
 if (this.isNodeSelected(data)) {
   rect.style("opacity", 0.8);
@@ -243,6 +248,18 @@ export default BaseChartComponent.extend({
   },
 
   didInsertElement: function () {
+var parentId = this.get("parentId");
+var self = this;
+var optionsData = [this.memoryLabel, this.cpuLabel, this.containersLabel];
+d3.select("#heatmap-select")
+  .on('change', function() {
+self.renderCells(self.get("model"), self.get("title"), 
self.get("textWidth"));
+  })
+  .selectAll('option')
+  .data(optionsData).enter()
+  .append('option')
+  .text(function (d) { return d; });
+
 this.draw();
   },
 
@@ -252,5 +269,38 @@ export default BaseChartComponent.extend({
   

[hadoop] Git Push Summary

[varunsaxena]

Repository: hadoop
Updated Branches:
  refs/heads/YARN-5355-branch2 [deleted] 56e0873e2

-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[30/50] [abbrv] hadoop git commit: YARN-5917. Make navigation link active when selecting sub tabs in 'Applications' and 'Nodes' page for new UI. Contributed by Kai Sasaki.

[varunsaxena]

YARN-5917. Make navigation link active when selecting sub tabs in 
'Applications' and 'Nodes' page for new UI. Contributed by Kai Sasaki.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2c93e8ee
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2c93e8ee
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2c93e8ee

Branch: refs/heads/YARN-3368_branch2
Commit: 2c93e8ee13258946ede4be67375f5800ecd63fb9
Parents: 0d1a53a
Author: Sunil G 
Authored: Tue Feb 7 21:45:40 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../src/main/webapp/app/templates/application.hbs| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c93e8ee/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
index 7783db4..4a2ba38 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
@@ -46,13 +46,13 @@
   (current)
 {{/link-to}}
   {{/link-to}}
-  {{#link-to 'yarn-apps.apps' tagName="li"}}
-{{#link-to 'yarn-apps.apps' class="navigation-link"}}Applications
+  {{#link-to 'yarn-apps.apps' tagName="li" currentWhen="yarn-apps.apps 
yarn-apps.services"}}
+{{#link-to 'yarn-apps.apps' class="navigation-link" 
currentWhen="yarn-apps.apps yarn-apps.services"}}Applications
   (current)
 {{/link-to}}
   {{/link-to}}
-  {{#link-to 'yarn-nodes.table' tagName="li"}}
-{{#link-to 'yarn-nodes.table' class="navigation-link"}}Nodes
+  {{#link-to 'yarn-nodes.table' tagName="li" 
currentWhen="yarn-nodes.table yarn-nodes.heatmap"}}
+{{#link-to 'yarn-nodes.table' class="navigation-link" 
currentWhen="yarn-nodes.table yarn-nodes.heatmap"}}Nodes
   (current)
 {{/link-to}}
   {{/link-to}}


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[15/50] [abbrv] hadoop git commit: YARN-5698. [YARN-3368] Launch new YARN UI under hadoop web app port. (Sunil G via wangda)

[varunsaxena]

YARN-5698. [YARN-3368] Launch new YARN UI under hadoop web app port. (Sunil G 
via wangda)


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

Branch: refs/heads/YARN-3368_branch2
Commit: c0c124c2bf996ca986af02efee57362f7a6835cc
Parents: 8222307
Author: Wangda Tan 
Authored: Wed Oct 12 13:22:20 2016 -0700
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../hadoop/yarn/conf/YarnConfiguration.java | 21 ++
 .../org/apache/hadoop/yarn/webapp/WebApps.java  |  8 +++
 .../src/main/resources/yarn-default.xml | 20 ++
 .../server/resourcemanager/ResourceManager.java | 70 +++-
 .../src/main/webapp/config/default-config.js|  4 +-
 5 files changed, 57 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0c124c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 224e030..69dd080 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -301,25 +301,12 @@ public class YarnConfiguration extends Configuration {
   /**
* Enable YARN WebApp V2.
*/
-  public static final String RM_WEBAPP_UI2_ENABLE = RM_PREFIX
+  public static final String YARN_WEBAPP_UI2_ENABLE = "yarn."
   + "webapp.ui2.enable";
-  public static final boolean DEFAULT_RM_WEBAPP_UI2_ENABLE = false;
+  public static final boolean DEFAULT_YARN_WEBAPP_UI2_ENABLE = false;
 
-  /** The address of the RM web ui2 application. */
-  public static final String RM_WEBAPP_UI2_ADDRESS = RM_PREFIX
-  + "webapp.ui2.address";
-
-  public static final int DEFAULT_RM_WEBAPP_UI2_PORT = 8288;
-  public static final String DEFAULT_RM_WEBAPP_UI2_ADDRESS = "0.0.0.0:" +
-  DEFAULT_RM_WEBAPP_UI2_PORT;
-  
-  /** The https address of the RM web ui2 application.*/
-  public static final String RM_WEBAPP_UI2_HTTPS_ADDRESS =
-  RM_PREFIX + "webapp.ui2.https.address";
-
-  public static final int DEFAULT_RM_WEBAPP_UI2_HTTPS_PORT = 8290;
-  public static final String DEFAULT_RM_WEBAPP_UI2_HTTPS_ADDRESS = "0.0.0.0:"
-  + DEFAULT_RM_WEBAPP_UI2_HTTPS_PORT;
+  public static final String YARN_WEBAPP_UI2_WARFILE_PATH = "yarn."
+  + "webapp.ui2.war-file-path";
 
   public static final String RM_RESOURCE_TRACKER_ADDRESS =
 RM_PREFIX + "resource-tracker.address";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0c124c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
index 9c96339..0dc6354 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
@@ -44,6 +44,7 @@ import 
org.apache.hadoop.security.http.RestCsrfPreventionFilter;
 import org.apache.hadoop.security.http.XFrameOptionsFilter;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+import org.mortbay.jetty.webapp.WebAppContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -393,8 +394,15 @@ public class WebApps {
 }
 
 public WebApp start(WebApp webapp) {
+  return start(webapp, null);
+}
+
+public WebApp start(WebApp webapp, WebAppContext ui2Context) {
   WebApp webApp = build(webapp);
   HttpServer2 httpServer = webApp.httpServer();
+  if (ui2Context != null) {
+httpServer.addContext(ui2Context, true);
+  }
   try {
 httpServer.start();
 LOG.info("Web app " + name + " started at "

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0c124c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml

[49/50] [abbrv] hadoop git commit: YARN-6458. Use yarn package manager to lock down dependency versions for new web UI. Contributed by Sreenath Somarajapuram.

[varunsaxena]

YARN-6458. Use yarn package manager to lock down dependency versions for new 
web UI. Contributed by Sreenath Somarajapuram.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3aa81115
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3aa81115
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3aa81115

Branch: refs/heads/YARN-3368_branch2
Commit: 3aa8111594ceeb4e289dee63201ebb32ec9e1e35
Parents: 9e4e218
Author: Sunil G 
Authored: Sun Jun 4 22:05:14 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../hadoop-yarn/hadoop-yarn-ui/README.md|   64 +
 .../hadoop-yarn/hadoop-yarn-ui/pom.xml  |  171 +-
 .../hadoop-yarn-ui/src/main/webapp/.bowerrc |5 +-
 .../src/main/webapp/WEB-INF/wro.xml |9 +
 .../src/main/webapp/bower-shrinkwrap.json   |   66 +
 .../src/main/webapp/ember-cli-build.js  |   16 +-
 .../hadoop-yarn-ui/src/main/webapp/package.json |   15 +-
 .../hadoop-yarn-ui/src/main/webapp/yarn.lock| 4983 ++
 8 files changed, 5275 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
new file mode 100644
index 000..f67f351
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
@@ -0,0 +1,64 @@
+
+
+# Yarn UI
+
+The Yarn UI is an Ember based web-app that provides visualization of the 
applications running on the Apache Hadoop YARN framework.
+
+## Configurations
+
+* You can point the UI to custom locations by setting the environment 
variables in `src/main/webapp/config/configs.env`
+
+## Development
+
+All the following commands must be run inside `src/main/webapp`.
+
+### Prerequisites
+
+You will need the following things properly installed on your computer.
+
+* Install [Yarn](https://yarnpkg.com) v0.21.3
+* Install [Bower](http://bower.io/) v1.7.7
+* Install all dependencies by running `yarn install` & `bower install`
+
+### Running UI
+
+* `yarn start`
+* Visit your app at [http://localhost:4200](http://localhost:4200).
+
+### Building
+
+* `yarn run build` (production)
+* Files would be stored in "dist/"
+
+### Adding new dependencies
+
+**Warning: Do not edit the _package.json_ or _bower.json_ files manually. This 
could make them out-of-sync with the respective lock or shrinkwrap files.**
+
+Yarn UI has replaced NPM with Yarn package manager. And hence Yarn would be 
used to manage dependencies defined in package.json.
+
+* Please use the Yarn and Bower command-line tools to add new dependencies. 
And the tool version must be same as those defined in Prerequisites section.
+* Once any dependency is added:
+  *  If it's in package.json. Make sure that the respective, and only those 
changes are reflected in yarn.lock file.
+  *  If it's in bower.json. Make sure that the respective, and only those 
changes are reflected in bower-shrinkwrap.json file.
+* Commands to add using CLI tools:
+  * Yarn: yarn add [package-name]
+  * Bower: bower install --save [package-name]
+
+### Adding new routes (pages), controllers, components etc.
+
+* Use ember-cli blueprint generator - [Ember 
CLI](http://ember-cli.com/extending/#generators-and-blueprints)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 5f6eda9..5f546ef 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -27,15 +27,16 @@
   hadoop-yarn-ui
   2.9.0-SNAPSHOT
   Apache Hadoop YARN UI
-  ${packaging.type}
+  ${packagingType}
 
   
-pom
-${basedir}/target/src/main/webapp
-node
-v0.12.2
-2.10.0
-false
+pom
+
+${basedir}/target/webapp
+${basedir}/target/webapp/node/node
+node/yarn/dist/bin/yarn.js
+
+false
   
 
   
@@ -48,7 +49,9 @@
   
 src/main/webapp/jsconfig.json
 src/main/webapp/bower.json
+src/main/webapp/bower-shrinkwrap.json
 src/main/webapp/package.json
+src/main/webapp/yarn.lock
 src/main/webapp/testem.json
 src/main/webapp/public/assets/images/**/*
 src/main/webapp/public/assets/images/*
@@ -58,6 +61,7 @@
 src/main/webapp/.ember-cli
 

[25/50] [abbrv] hadoop git commit: YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by Akhil P B.

[varunsaxena]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
index 1c5b7b3..766c5c7 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
@@ -49,7 +49,7 @@ export default DS.JSONAPISerializer.extend({
   relationshipUserData.push({
 type: "YarnUser",
 id: u.username + "_" + payload.queueName,
-  })
+  });
 });
   }
 
@@ -85,12 +85,12 @@ export default DS.JSONAPISerializer.extend({
   return {
 queue: this._super(store, primaryModelClass, fixedPayload, id, 
requestType),
 includedData: includedData
-  }
+  };
 },
 
 handleQueue(store, primaryModelClass, payload, id, requestType) {
   var data = [];
-  var includedData = []
+  var includedData = [];
   var result = this.normalizeSingleResponse(store, primaryModelClass,
 payload, id, requestType);
 
@@ -112,8 +112,8 @@ export default DS.JSONAPISerializer.extend({
 
   return {
 data: data,
-includedData, includedData
-  }
+includedData: includedData
+  };
 },
 
 normalizeArrayResponse(store, primaryModelClass, payload, id,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
index 6feab36..ad50621 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import Ember from 'ember';
 import DS from 'ember-data';
 import Converter from 'yarn-ui/utils/converter';
 
@@ -48,16 +47,14 @@ export default DS.JSONAPISerializer.extend({
 return fixedPayload;
   },
 
-  normalizeSingleResponse(store, primaryModelClass, payload, id,
-  requestType) {
+  normalizeSingleResponse(store, primaryModelClass, payload, id/*, 
requestType*/) {
 // payload is of the form {"nodeInfo":{}}
 var p = this.internalNormalizeSingleResponse(store,
 primaryModelClass, payload, id);
 return { data: p };
   },
 
-  normalizeArrayResponse(store, primaryModelClass, payload, id,
-  requestType) {
+  normalizeArrayResponse(store, primaryModelClass, payload/*, id, 
requestType*/) {
 // expected response is of the form { data: [ {}, {} ] }
 var normalizedArrayResponse = {};
 if (payload.nodes) {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
index b96ec16..6c0cfee 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
@@ -16,8 +16,6 @@
  * limitations under the License.
  */
 
-import Constants from 'yarn-ui/constants';
-
 export default {
   preDefinedColors : ["#1f77b4", "#aec7e8", "#ffbb78",
 "#98df8a", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b",
@@ -43,14 +41,14 @@ export default {
   startIdx = Math.max(nColors - colorsTarget.length, 0);
 }
 
-for (var i = 0; i < colorsTarget.length; i++) {
+for (i = 0; i < colorsTarget.length; i++) {
   if (i + startIdx < nColors) {
 colors[i + startIdx] = this.getColorByTarget(colorsTarget[i]);
   }
 }
 
 var idx = 0;
-for (var i = 0; i < nColors; i++) {
+for (i = 0; i < nColors; i++) {
   if (!colors[i]) {
 colors[i] = this.preDefinedColors[i % this.preDefinedColors.length];
 idx ++;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d1a53ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
--
diff --git 

[03/50] [abbrv] hadoop git commit: YARN-5772. [YARN-3368] Replace old Hadoop logo with new one (Akhil P B Tan via Sunil G)

[varunsaxena]

YARN-5772. [YARN-3368] Replace old Hadoop logo with new one (Akhil P B Tan via 
Sunil G)


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

Branch: refs/heads/YARN-3368_branch2
Commit: addc399e8bb8fe774dd5aefdc2dae3226c610b6c
Parents: 43f0627
Author: sunilg 
Authored: Thu Oct 27 10:45:47 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../webapp/public/assets/images/hadoop_logo.png | Bin 26495 -> 31716 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/addc399e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
index 275d39e..d481395 100644
Binary files 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
 and 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
 differ


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[37/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from ATS v2 in new web UI. Contributed by Akhil PB.

[varunsaxena]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
new file mode 100644
index 000..b700464
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
@@ -0,0 +1,53 @@
+{{!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--}}
+
+Flow Information
+
+  
+
+  
+
+  Flow Name
+  {{flowInfo.flowName}}
+
+
+  User
+  {{flowInfo.user}}
+
+
+  Flow ID
+  {{flowInfo.flowUid}}
+
+
+  First Run Started
+  {{flowInfo.firstRunStarted}}
+
+
+  Last Run Finished
+  {{flowInfo.lastRunFinished}}
+
+{{#if flowInfo.lastExecutionDate}}
+  
+Last Execution Date
+{{flowInfo.lastExecutionDate}}
+  
+{{/if}}
+  
+
+  
+

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
new file mode 100644
index 000..96d9e63
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
@@ -0,0 +1,131 @@
+{{!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--}}
+
+
+
+  {{#if (or (or elapsedTimeVizData.length cpuVCoresVizData.length) 
memoryVizData.length)}}
+  
+
+  Add Metrics Widget 
+
+
+  {{#if elapsedTimeVizData.length}}
+
+  
+
+  {{#if vizWidgets.runDuration}}
+
+  {{/if}}
+
+Flow Run Vs Run Duration
+  
+
+  {{/if}}
+  {{#if cpuVCoresVizData.length}}
+
+  
+
+  {{#if vizWidgets.cpuVcores}}
+
+  {{/if}}
+
+Flow Run Vs Cpu Vcores
+  
+
+  {{/if}}
+  {{#if memoryVizData.length}}
+
+  
+
+  {{#if vizWidgets.memoryUsed}}
+
+  {{/if}}
+
+Flow Run Vs Memory Used
+  
+
+  {{/if}}
+
+  
+  {{/if}}
+
+  Flow Runs
+  {{em-table columns=columns rows=model.flowRuns definition=tableDefinition}}
+
+  
+{{#if (and elapsedTimeVizData.length vizWidgets.runDuration)}}
+  
+
+  
+
+Flow Run Vs Run Duration
+{{simple-bar-chart
+  class="chart-panel"
+  data=elapsedTimeVizData
+  xAxisTickFormatter=flowrunIdFormatter
+  yAxisTickFormatter=elapsedTimeFormatter
+  xAxisText="Flow Run"
+  yAxisText="Run Duration"
+  onBarChartClickCallback=onBarChartClick
+}}
+  

[43/50] [abbrv] hadoop git commit: Updating to use maven 3.3

[varunsaxena]

Updating to use maven 3.3


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/17213a0d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/17213a0d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/17213a0d

Branch: refs/heads/YARN-3368_branch2
Commit: 17213a0d277761ab3c83e7d5df84ce21b651e81a
Parents: ec3fb45
Author: vrushali 
Authored: Thu Oct 12 15:29:08 2017 -0700
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 BUILDING.txt  |  2 +-
 dev-support/docker/Dockerfile | 13 ++---
 hadoop-project/pom.xml|  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/17213a0d/BUILDING.txt
--
diff --git a/BUILDING.txt b/BUILDING.txt
index bf6122b..689325e 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -317,7 +317,7 @@ Requirements:
 
 * Windows System
 * JDK 1.8+
-* Maven 3.0 or later
+* Maven 3.3 or later
 * Findbugs 1.3.9 (if running findbugs)
 * ProtocolBuffer 2.5.0
 * CMake 2.6 or newer

http://git-wip-us.apache.org/repos/asf/hadoop/blob/17213a0d/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 6bba5a8..50a221fc 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -65,9 +65,16 @@ RUN apt-get -q update && apt-get -q install 
--no-install-recommends -y \
 snappy \
 zlib1g-dev
 
-# Fixing the Apache commons / Maven dependency problem under Ubuntu:
-# See http://wiki.apache.org/commons/VfsProblems
-RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar .
+##
+# Install Apache Maven
+##
+RUN mkdir -p /opt/maven && \
+curl -L -s -S \
+ 
http://www-us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
 \
+ -o /opt/maven.tar.gz && \
+tar xzf /opt/maven.tar.gz --strip-components 1 -C /opt/maven
+ENV MAVEN_HOME /opt/maven
+
 
 ###
 # Java OpenJDK

http://git-wip-us.apache.org/repos/asf/hadoop/blob/17213a0d/hadoop-project/pom.xml
--
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 1beaef9..575a9c4 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -107,7 +107,7 @@
 for an open-ended enforcement
 -->
 [${javac.version},)
-[3.0.2,)
+[3.3.0,)
 
 
 -Xmx2048m -XX:MaxPermSize=768m 
-XX:+HeapDumpOnOutOfMemoryError


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[27/50] [abbrv] hadoop git commit: YARN-5650. Render Application Timeout value in web UI. Contributed by Akhil PB.

[varunsaxena]

YARN-5650. Render Application Timeout value in web UI. Contributed by Akhil PB.


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

Branch: refs/heads/YARN-3368_branch2
Commit: d5271b03d33e17be056f1604b03dea30242649e2
Parents: 011402e
Author: Sunil G 
Authored: Mon Dec 19 11:44:03 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../webapp/app/components/app-timeout-bar.js| 60 
 .../src/main/webapp/app/models/yarn-app.js  |  2 +
 .../src/main/webapp/app/serializers/yarn-app.js | 21 +--
 .../templates/components/app-timeout-bar.hbs| 34 +++
 .../src/main/webapp/app/templates/yarn-app.hbs  | 10 +++-
 .../src/main/webapp/app/utils/converter.js  |  3 +
 .../components/app-timeout-bar-test.js  | 34 +++
 7 files changed, 157 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5271b03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
new file mode 100644
index 000..0eac827
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Ember from 'ember';
+import Converter from 'yarn-ui/utils/converter';
+
+export default Ember.Component.extend({
+  app: null,
+
+  appTimeoutValue: function() {
+var timeoutValueInSecs = this.get("app.remainingTimeoutInSeconds");
+if (timeoutValueInSecs > -1) {
+  return Converter.msToElapsedTime(timeoutValueInSecs * 1000);
+} else {
+  return timeoutValueInSecs;
+}
+  }.property("app.remainingTimeoutInSeconds"),
+
+  isAppTimedOut: function() {
+if (this.get("app.remainingTimeoutInSeconds") > 0) {
+  return false;
+} else {
+  return true;
+}
+  }.property("app.remainingTimeoutInSeconds"),
+
+  appTimeoutBarStyle: function() {
+var remainingInSecs = this.get("app.remainingTimeoutInSeconds"),
+expiryTimestamp = 
Converter.dateToTimeStamp(this.get("app.applicationExpiryTime")),
+expiryInSecs = expiryTimestamp / 1000,
+startTimestamp = Converter.dateToTimeStamp(this.get("app.startTime")),
+startInSecs = startTimestamp / 1000,
+totalRunInSecs = 0,
+appRunDurationInSecs = 0,
+width = 0;
+
+if (remainingInSecs > 0) {
+  totalRunInSecs = expiryInSecs - startInSecs;
+  appRunDurationInSecs = totalRunInSecs - remainingInSecs;
+  width = appRunDurationInSecs / totalRunInSecs * 100;
+}
+
+return "width: " + width + "%";
+  }.property("app.remainingTimeoutInSeconds", "app.applicationExpiryTime", 
"app.startTime")
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5271b03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
index 8b5474f..4138a87 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
@@ -50,6 +50,8 @@ export default DS.Model.extend({
   clusterUsagePercentage: DS.attr('number'),
   queueUsagePercentage: DS.attr('number'),
   currentAppAttemptId: DS.attr('string'),
+  

[10/50] [abbrv] hadoop git commit: YARN-5503. [YARN-3368] Add missing hidden files in webapp folder for deployment (Sreenath Somarajapuram via Sunil G)

[varunsaxena]

YARN-5503. [YARN-3368] Add missing hidden files in webapp folder for deployment 
(Sreenath Somarajapuram via Sunil G)


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

Branch: refs/heads/YARN-3368_branch2
Commit: dd8ad34305922ee8715281b3988a609c8ddc8ec4
Parents: 9e609b8
Author: sunilg 
Authored: Tue Aug 30 20:58:35 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../hadoop-yarn/hadoop-yarn-ui/pom.xml  | 19 ++-
 .../hadoop-yarn-ui/src/main/webapp/.bowerrc |  4 +++
 .../src/main/webapp/.editorconfig   | 34 
 .../hadoop-yarn-ui/src/main/webapp/.ember-cli   |  9 ++
 .../hadoop-yarn-ui/src/main/webapp/.jshintrc| 32 ++
 .../src/main/webapp/.watchmanconfig |  3 ++
 6 files changed, 100 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 8162bdd..fcca48a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -30,7 +30,7 @@
   ${packaging.type}
 
   
-jar
+war
 src/main/webapp
 node
 v0.12.2
@@ -52,9 +52,26 @@
 src/main/webapp/bower.json
 src/main/webapp/package.json
 src/main/webapp/testem.json
+
+src/main/webapp/dist/**/*
+src/main/webapp/tmp/**/*
 src/main/webapp/public/assets/images/**/*
+src/main/webapp/public/assets/images/*
 src/main/webapp/public/robots.txt
+
+public/assets/images/**/*
 public/crossdomain.xml
+
+src/main/webapp/.tmp/**/*
+src/main/webapp/.bowerrc
+src/main/webapp/.editorconfig
+src/main/webapp/.ember-cli
+src/main/webapp/.gitignore
+src/main/webapp/.jshintrc
+src/main/webapp/.travis.yml
+src/main/webapp/.watchmanconfig
+src/main/webapp/tests/.jshintrc
+src/main/webapp/blueprints/.jshintrc
   
 
   

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
new file mode 100644
index 000..959e169
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
@@ -0,0 +1,4 @@
+{
+  "directory": "bower_components",
+  "analytics": false
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
new file mode 100644
index 000..47c5438
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
@@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd8ad343/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
new file mode 100644
index 000..ee64cfe
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
@@ -0,0 +1,9 @@
+{
+  /**
+Ember CLI sends analytics information by 

[11/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix javadocs. (Sunil G via wangda)

[varunsaxena]

 YARN-4849. Addendum patch to fix javadocs. (Sunil G via wangda)


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

Branch: refs/heads/YARN-3368_branch2
Commit: e5c021922863308c274564548fad7e3398515699
Parents: b428cf8
Author: Wangda Tan 
Authored: Fri Sep 9 10:54:37 2016 -0700
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../hadoop/yarn/server/resourcemanager/ResourceManager.java| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5c02192/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 077cc1b..a26bc0c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -1013,6 +1013,12 @@ public class ResourceManager extends CompositeService 
implements Recoverable {
* Return a HttpServer.Builder that the journalnode / namenode / secondary
* namenode can use to initialize their HTTP / HTTPS server.
*
+   * @param conf configuration object
+   * @param httpAddr HTTP address
+   * @param httpsAddr HTTPS address
+   * @param name  Name of the server
+   * @throws IOException from Builder
+   * @return builder object
*/
   public static HttpServer2.Builder httpServerTemplateForRM(Configuration conf,
   final InetSocketAddress httpAddr, final InetSocketAddress httpsAddr,


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[35/50] [abbrv] hadoop git commit: YARN-5496. Make Node Heatmap Chart categories clickable in new YARN UI. Contributed by Gergely Novák.

[varunsaxena]

YARN-5496. Make Node Heatmap Chart categories clickable in new YARN UI. 
Contributed by Gergely Novák.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/16cc2827
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16cc2827
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16cc2827

Branch: refs/heads/YARN-3368_branch2
Commit: 16cc2827250039a4263aa8aefd5d7c131976e37a
Parents: bbd98cb
Author: Sunil G 
Authored: Tue Mar 14 11:47:11 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../app/components/base-chart-component.js  |   4 +
 .../main/webapp/app/components/nodes-heatmap.js | 106 ++-
 .../src/main/webapp/app/styles/app.css  |  12 +++
 3 files changed, 93 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/16cc2827/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
index d11a532..aa41893 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
@@ -141,4 +141,8 @@ export default Ember.Component.extend({
 };
 return layout;
   },
+
+  willDestroy: function() {
+this.tooltip.remove();
+  }
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/16cc2827/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
index 5652834..ef6e46e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
@@ -26,17 +26,18 @@ export default BaseChartComponent.extend({
   CELL_MARGIN: 2,
   RACK_MARGIN: 20,
   filter: "",
+  selectedCategory: 0,
 
-  bindTP: function(element) {
+  bindTP: function(element, cell) {
 element.on("mouseover", function() {
   this.tooltip
 .style("left", (d3.event.pageX) + "px")
 .style("top", (d3.event.pageY - 28) + "px");
-  element.style("opacity", 1.0);
+  cell.style("opacity", 1.0);
 }.bind(this))
   .on("mousemove", function() {
 // Handle pie chart case
-var text = element.attr("tooltiptext");
+var text = cell.attr("tooltiptext");
 
 this.tooltip.style("opacity", 0.9);
 this.tooltip.html(text)
@@ -45,10 +46,45 @@ export default BaseChartComponent.extend({
   }.bind(this))
   .on("mouseout", function() {
 this.tooltip.style("opacity", 0);
-element.style("opacity", 0.8);
+cell.style("opacity", 0.8);
   }.bind(this));
   },
 
+  bindSelectCategory: function(element, i) {
+element.on("click", function() {
+  if (this.selectedCategory == i) {
+// Remove selection for second click
+this.selectedCategory = 0;
+  } else {
+this.selectedCategory = i;
+  }
+  this.didInsertElement();
+}.bind(this));
+  },
+
+  isNodeSelected: function(node) {
+if (this.filter) {
+  var rack = node.get("rack");
+  var host = node.get("nodeHostName");
+  if (!rack.includes(this.filter) && !host.includes(this.filter)) {
+return false;
+  }
+}
+
+if (this.selectedCategory === 0) {
+  return true;
+}
+
+var usage = node.get("usedMemoryMB") /
+  (node.get("usedMemoryMB") + node.get("availMemoryMB"))
+var lowerLimit = (this.selectedCategory - 1) * 0.2;
+var upperLimit = this.selectedCategory * 0.2;
+if (lowerLimit <= usage && usage <= upperLimit) {
+  return true;
+}
+return false;
+  },
+
   // data:
   //[{label=label1, value=value1}, ...]
   //...
@@ -84,20 +120,32 @@ export default BaseChartComponent.extend({
 for (i = 1; i <= 5; i++) {
   var ratio = i * 0.2 - 0.1;
 
-  g.append("rect")
+  var rect = g.append("rect")
 .attr("x", sampleXOffset)
 .attr("y", sampleYOffset)
-.attr("fill", colorFunc(ratio))
+.attr("fill", this.selectedCategory === i ? "#2ca02c" : 
colorFunc(ratio))
 

[31/50] [abbrv] hadoop git commit: YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB.

[varunsaxena]

YARN-6183. Few missing informations in Application and Application Attempt 
pages for new YARN UI. Contributed by Akhil PB.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/981ccd9d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/981ccd9d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/981ccd9d

Branch: refs/heads/YARN-3368_branch2
Commit: 981ccd9d906c75226f0cee32ce935a59f071e257
Parents: 9071c71
Author: Sunil G 
Authored: Wed Feb 15 15:52:57 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../webapp/app/components/app-attempt-table.js  |  9 -
 .../src/main/webapp/app/controllers/yarn-app.js |  6 +++---
 .../src/main/webapp/app/models/yarn-app.js  |  2 +-
 .../src/main/webapp/app/serializers/yarn-app.js |  6 +++---
 .../src/main/webapp/app/styles/app.css  | 20 ++--
 .../webapp/app/templates/cluster-overview.hbs   | 10 +-
 .../templates/components/app-attempt-table.hbs  |  6 +++---
 .../templates/components/container-table.hbs|  6 +++---
 .../src/main/webapp/app/templates/yarn-app.hbs  |  8 
 9 files changed, 44 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/981ccd9d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
index 4b741b8..3c43037 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
@@ -19,4 +19,11 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-});
\ No newline at end of file
+  nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', 
function() {
+var nodeHttpAddress = this.get('attempt.nodeHttpAddress');
+if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) {
+  nodeHttpAddress = 'http://' + nodeHttpAddress;
+}
+return nodeHttpAddress;
+  })
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/981ccd9d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
index 9c1cb5d..f699a22 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
@@ -35,11 +35,11 @@ export default Ember.Controller.extend({
 }];
   }),
 
-  amHostHttpAddressFormatted: function() {
+  amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', 
function() {
 var amHostAddress = this.get('model.app.amHostHttpAddress');
-if (amHostAddress.indexOf('http://') < 0) {
+if (amHostAddress && amHostAddress.indexOf('://') < 0) {
   amHostAddress = 'http://' + amHostAddress;
 }
 return amHostAddress;
-  }.property('model.app.amHostHttpAddress')
+  })
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/981ccd9d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
index 1366357..638e5b0 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
@@ -37,7 +37,7 @@ export default DS.Model.extend({
   amNodeLabelExpression: DS.attr('string'),
   applicationTags: DS.attr('string'),
   applicationType: DS.attr('string'),
-  priority: DS.attr('number'),
+  priority: DS.attr('string'),
   allocatedMB: DS.attr('number'),
   allocatedVCores: DS.attr('number'),
   runningContainers: DS.attr('number'),

http://git-wip-us.apache.org/repos/asf/hadoop/blob/981ccd9d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
--
diff --git 

[41/50] [abbrv] hadoop git commit: YARN-7022. Improve click interaction in queue topology in new YARN UI. Contributed by Abdullah Yousufi.

[varunsaxena]

YARN-7022. Improve click interaction in queue topology in new YARN UI. 
Contributed by Abdullah Yousufi.


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

Branch: refs/heads/YARN-3368_branch2
Commit: ec3fb457724bb94833346c1ac196c86bb1866dca
Parents: da104a3
Author: Sunil G 
Authored: Tue Sep 5 08:06:43 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../src/main/webapp/app/components/tree-selector.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec3fb457/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
index 1a81a32..6788582 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
@@ -129,7 +129,7 @@ export default Ember.Component.extend({
 var nodeEnter = node.enter().append("g")
   .attr("class", "node")
   .attr("transform", function() { return "translate(" + source.y0 + "," + 
source.x0 + ")"; })
-  .on("mouseover", function(d){
+  .on("click", function(d){
 if (d.queueData.get("name") !== this.get("selected")) {
 document.location.href = "#/yarn-queues/" + 
d.queueData.get("name") + "!";
 }
@@ -145,7 +145,7 @@ export default Ember.Component.extend({
 }, 100);
 
   }.bind(this))
-.on("click", function (d) {
+.on("dblclick", function (d) {
   document.location.href = "#/yarn-queue/" + d.queueData.get("name") + 
"/info";
 });
 


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[20/50] [abbrv] hadoop git commit: YARN-5153. Add a toggle button to switch between timeline view / table view for containers and application-attempts in new YARN UI. Contributed by Akhil PB.

[varunsaxena]

YARN-5153. Add a toggle button to switch between timeline view / table view for 
containers and application-attempts in new YARN UI. Contributed by Akhil PB.


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

Branch: refs/heads/YARN-3368_branch2
Commit: bef6b2f030c1b85025f5a09e9316aef95034fbcf
Parents: deef8d5
Author: Sunil G 
Authored: Mon Apr 10 13:35:08 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../webapp/app/components/app-attempt-table.js  |   7 -
 .../main/webapp/app/components/timeline-view.js | 199 ++-
 .../main/webapp/app/helpers/prepend-protocol.js |  29 +++
 .../templates/components/app-attempt-table.hbs  |  36 ++--
 .../templates/components/container-table.hbs|  22 +-
 .../app/templates/components/timeline-view.hbs  |  61 --
 .../tests/unit/helpers/prepend-protocol-test.js |  28 +++
 7 files changed, 331 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef6b2f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
index 3c43037..8828275 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
@@ -19,11 +19,4 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-  nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', 
function() {
-var nodeHttpAddress = this.get('attempt.nodeHttpAddress');
-if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) {
-  nodeHttpAddress = 'http://' + nodeHttpAddress;
-}
-return nodeHttpAddress;
-  })
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bef6b2f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
index d730a43..4a33d5b 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
@@ -18,6 +18,7 @@
 
 import Ember from 'ember';
 import Converter from 'yarn-ui/utils/converter';
+import ColumnDef from 'em-table/utils/column-definition';
 
 export default Ember.Component.extend({
   canvas: {
@@ -31,6 +32,8 @@ export default Ember.Component.extend({
   modelArr: [],
   colors: d3.scale.category10().range(),
   _selected: undefined,
+  gridColumns: [],
+  gridRows: [],
 
   selected: function() {
 return this._selected;
@@ -276,5 +279,199 @@ export default Ember.Component.extend({
 if (this.modelArr.length > 0) {
   this.setSelected(this.modelArr[0]);
 }
+
+if (this.get('attemptModel')) {
+  this.setAttemptsGridColumnsAndRows();
+} else {
+  this.setContainersGridColumnsAndRows();
+}
+  },
+
+  setAttemptsGridColumnsAndRows: function() {
+var self = this;
+var columns = [];
+
+columns.push({
+  id: 'id',
+  headerTitle: 'Attempt ID',
+  contentPath: 'id',
+  cellComponentName: 'em-table-linked-cell',
+  minWidth: '300px',
+  getCellContent: function(row) {
+return {
+  displayText: row.get('id'),
+  routeName: 'yarn-app-attempt',
+  id: row.get('id')
+};
+  }
+}, {
+  id: 'attemptStartedTime',
+  headerTitle: 'Started Time',
+  contentPath: 'attemptStartedTime'
+}, {
+  id: 'finishedTime',
+  headerTitle: 'Finished Time',
+  contentPath: 'finishedTime',
+  getCellContent: function(row) {
+if (row.get('finishedTs')) {
+  return row.get('finishedTime');
+}
+return 'N/A';
+  }
+}, {
+  id: 'elapsedTime',
+  headerTitle: 'Elapsed Time',
+  contentPath: 'elapsedTime'
+}, {
+  id: 'appMasterContainerId',
+  headerTitle: 'AM Container ID',
+  contentPath: 'appMasterContainerId',
+  minWidth: '300px'
+}, {
+  id: 'amNodeId',
+  

[48/50] [abbrv] hadoop git commit: YARN-6458. Use yarn package manager to lock down dependency versions for new web UI. Contributed by Sreenath Somarajapuram.

[varunsaxena]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3aa81115/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
new file mode 100644
index 000..948feb9
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
@@ -0,0 +1,4983 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abbrev@1:
+  version "1.1.0"
+  resolved 
"https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f;
+
+abbrev@~1.0.7:
+  version "1.0.9"
+  resolved 
"https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135;
+
+accepts@~1.3.3:
+  version "1.3.3"
+  resolved 
"https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca;
+  dependencies:
+mime-types "~2.1.11"
+negotiator "0.6.1"
+
+acorn@^4.0.3:
+  version "4.0.11"
+  resolved 
"https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0;
+
+after@0.8.1:
+  version "0.8.1"
+  resolved 
"https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627;
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved 
"https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117;
+  dependencies:
+kind-of "^3.0.2"
+longest "^1.0.1"
+repeat-string "^1.5.2"
+
+alter@~0.2.0:
+  version "0.2.0"
+  resolved 
"https://registry.yarnpkg.com/alter/-/alter-0.2.0.tgz#c7588808617572034aae62480af26b1d4d1cb3cd;
+  dependencies:
+stable "~0.1.3"
+
+amd-name-resolver@0.0.2:
+  version "0.0.2"
+  resolved 
"https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.2.tgz#7bee4e112aabeecc2e14429c4ca750c55d8e5ecd;
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved 
"https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5;
+
+ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+  version "0.2.1"
+  resolved 
"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9;
+
+ansi-regex@^1.0.0:
+  version "1.1.1"
+  resolved 
"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d;
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved 
"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df;
+
+ansi-styles@^1.1.0:
+  version "1.1.0"
+  resolved 
"https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de;
+
+ansi-styles@^2.0.1, ansi-styles@^2.1.0, ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved 
"https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe;
+
+ansi-styles@~1.0.0:
+  version "1.0.0"
+  resolved 
"https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178;
+
+ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1:
+  version "0.3.1"
+  resolved 
"https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21;
+
+ansicolors@~0.2.1:
+  version "0.2.1"
+  resolved 
"https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef;
+
+ansicolors@~0.3.2:
+  version "0.3.2"
+  resolved 
"https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979;
+
+ansistyles@~0.1.3:
+  version "0.1.3"
+  resolved 
"https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539;
+
+anymatch@^1.3.0:
+  version "1.3.0"
+  resolved 
"https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507;
+  dependencies:
+arrify "^1.0.0"
+micromatch "^2.1.5"
+
+archy@~1.0.0:
+  version "1.0.0"
+  resolved 
"https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40;
+
+are-we-there-yet@~1.0.0:
+  version "1.0.6"
+  resolved 
"https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c;
+  dependencies:
+delegates "^1.0.0"
+readable-stream "^2.0.0 || ^1.1.13"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved 
"https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d;
+  dependencies:
+delegates "^1.0.0"
+readable-stream "^2.0.6"
+
+argparse@^1.0.7, argparse@~1.0.2:
+  version "1.0.9"
+  resolved 
"https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86;
+  dependencies:
+sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  

[28/50] [abbrv] hadoop git commit: YARN-5912. Fix breadcrumb issues for various pages in new YARN UI. Contributed by Akhil P B.

[varunsaxena]

YARN-5912. Fix breadcrumb issues for various pages in new YARN UI. Contributed 
by Akhil P B.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9071c712
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9071c712
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9071c712

Branch: refs/heads/YARN-3368_branch2
Commit: 9071c712d964501197428fa348cd7bb9914a0e59
Parents: 2c93e8e
Author: Sunil G 
Authored: Tue Feb 14 22:29:21 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../webapp/app/controllers/yarn-app-attempt.js  |  2 +-
 .../webapp/app/controllers/yarn-app-attempts.js |  2 +-
 .../src/main/webapp/app/controllers/yarn-app.js |  2 +-
 .../main/webapp/app/controllers/yarn-apps.js|  2 +-
 .../app/controllers/yarn-container-log.js   |  7 +++-
 .../webapp/app/controllers/yarn-node-app.js |  7 +++-
 .../webapp/app/controllers/yarn-node-apps.js|  2 +-
 .../app/controllers/yarn-node-container.js  | 39 
 .../app/controllers/yarn-node-containers.js |  2 +-
 .../main/webapp/app/controllers/yarn-node.js|  2 +-
 .../webapp/app/controllers/yarn-services.js |  2 +-
 .../src/main/webapp/app/models/yarn-app.js  |  2 +-
 .../src/main/webapp/app/routes/yarn-node-app.js |  2 +-
 .../webapp/app/routes/yarn-node-container.js|  2 +-
 .../controllers/yarn-node-container-test.js | 30 +++
 15 files changed, 90 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
index a458842..4c02361 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
   routeName: 'application'
 },{
   text: "Applications",
-  routeName: 'yarn-apps'
+  routeName: 'yarn-apps.apps'
 }, {
   text: `App [${appId}]`,
   routeName: 'yarn-app',

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
index 9ebc2a6..92de2f9 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
   routeName: 'application'
 },{
   text: "Applications",
-  routeName: 'yarn-apps'
+  routeName: 'yarn-apps.apps'
 }, {
   text: `App [${appId}]`,
   routeName: 'yarn-app',

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
index 309c895..9c1cb5d 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
   routeName: 'application'
 },{
   text: "Applications",
-  routeName: 'yarn-apps'
+  routeName: 'yarn-apps.apps'
 }, {
   text: `App [${appId}]`,
   routeName: 'yarn-app',

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9071c712/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
index 396f83b..18bf682 

[24/50] [abbrv] hadoop git commit: YARN-5785. [YARN-3368] Accessing applications and containers list from Node page is throwing few exceptions in console. (Akhil P B and Sreenath Somarajapuram via Sun

[varunsaxena]

YARN-5785. [YARN-3368] Accessing applications and containers list from Node 
page is throwing few exceptions in console. (Akhil P B and Sreenath 
Somarajapuram via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4fba66c2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4fba66c2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4fba66c2

Branch: refs/heads/YARN-3368_branch2
Commit: 4fba66c28e0b1848251bffc643a690838989bf60
Parents: 6c68032
Author: sunilg 
Authored: Fri Oct 28 19:56:18 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../src/main/webapp/app/adapters/yarn-node-app.js   | 12 ++--
 .../src/main/webapp/app/adapters/yarn-node-container.js | 12 ++--
 .../src/main/webapp/app/adapters/yarn-node.js   |  5 +
 .../src/main/webapp/app/serializers/yarn-node-app.js|  2 +-
 .../main/webapp/app/serializers/yarn-node-container.js  |  2 +-
 .../src/main/webapp/config/default-config.js|  2 +-
 6 files changed, 8 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fba66c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
index eaddfcb..6d69828 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
@@ -25,22 +25,14 @@ export default AbstractAdapter.extend({
   serverName: "NM",
 
   urlForQuery(query) {
-var extension = this.get("host").split('/').pop();
-if (extension != query.nodeAddr) {
-  this.host = this.get("host") + query.nodeAddr;
-}
 var url = this._buildURL();
-url = url + "/apps";
+url = url.replace("{nodeAddress}", query.nodeAddr) + "/apps";
 return url;
   },
 
   urlForQueryRecord: function (query) {
-var extension = this.get("host").split('/').pop();
-if (extension != query.nodeAddr) {
-  this.host = this.get("host") + query.nodeAddr;
-}
 var url = this._buildURL();
-url = url + "/apps/" + query.appId;
+url = url.replace("{nodeAddress}", query.nodeAddr) + "/apps/" + 
query.appId;
 return url;
   },
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fba66c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
index 56c4bcd..0fff047 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
@@ -25,22 +25,14 @@ export default AbstractAdapter.extend({
   serverName: "NM",
 
   urlForQuery(query) {
-var extension = this.get("host").split('/').pop();
-if (extension != query.nodeHttpAddr) {
-  this.host = this.get("host") + query.nodeHttpAddr;
-}
 var url = this._buildURL();
-url = url + "/containers";
+url = url.replace("{nodeAddress}", query.nodeHttpAddr) + "/containers";
 return url;
   },
 
   urlForQueryRecord(query) {
-var extension = this.get("host").split('/').pop();
-if (extension != query.nodeHttpAddr) {
-  this.host = this.get("host") + query.nodeHttpAddr;
-}
 var url = this._buildURL();
-url = url + "/containers/" + query.containerId;
+url = url.replace("{nodeAddress}", query.nodeHttpAddr) + "/containers/" + 
query.containerId;
 return url;
   },
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fba66c2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
index 7a0fc4a..5bcfc9a 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
@@ -25,11 +25,8 @@ export default 

[34/50] [abbrv] hadoop git commit: YARN-6258. localBaseAddress for CORS proxy configuration is not working when suffixed with forward slash in new YARN UI. Contributed by Gergely Novák.

[varunsaxena]

YARN-6258. localBaseAddress for CORS proxy configuration is not working when 
suffixed with forward slash in new YARN UI. Contributed by Gergely Novák.


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

Branch: refs/heads/YARN-3368_branch2
Commit: deef8d544698fe9c1adfae7b27a343a30b05ce0e
Parents: 16cc282
Author: Sunil G 
Authored: Fri Apr 7 11:42:50 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../hadoop-yarn-ui/src/main/webapp/app/services/hosts.js   | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/deef8d54/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
index 19863e1..807844e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
@@ -61,7 +61,11 @@ export default Ember.Service.extend({
   },
 
   localBaseAddress: Ember.computed(function () {
-return this.localAddress();
+var url = this.localAddress();
+if (url.endsWith('/')) {
+  url = url.slice(0, -1);
+}
+return url;
   }),
 
   timelineWebAddress: Ember.computed(function () {


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[47/50] [abbrv] hadoop git commit: Updating dependencies to work on branch-2

[varunsaxena]

Updating dependencies to work on branch-2


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6232c3ae
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6232c3ae
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6232c3ae

Branch: refs/heads/YARN-3368_branch2
Commit: 6232c3aef34ad2603f7fb9fc9183f94d294b79e0
Parents: 3aa8111
Author: vrushali 
Authored: Tue Oct 10 16:59:38 2017 -0700
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 13 +
 .../hadoop-yarn-ui/src/main/webapp/bower.json  |  2 ++
 .../hadoop-yarn-ui/src/main/webapp/package.json|  4 ++--
 3 files changed, 5 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6232c3ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 5f546ef..032a9a2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -129,9 +129,6 @@
 
   
 
-  
-org.codehaus.mojo
-exec-maven-plugin
   
   
 com.github.eirslett
@@ -171,16 +168,8 @@
   install
 
 
-  exec
+  bower
 
-
-  ${webappTgtDir}
-  bower
-  
---allow-root
-install
-  
-
   
 
   

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6232c3ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
index fe5f289..e1ab943 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
@@ -12,6 +12,8 @@
 "loader.js": "3.3.0",
 "qunit": "1.19.0",
 "jquery-ui": "1.11.4",
+"moment": "2.12.0",
+"moment-timezone": "0.5.0",
 "more-js": "0.8.2",
 "bootstrap": "3.3.6",
 "d3": "~3.5.6",

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6232c3ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index 2b454aa..235233c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
@@ -23,7 +23,7 @@
 "bower-shrinkwrap-resolver-ext": "0.1.0",
 "broccoli-asset-rev": "2.4.2",
 "broccoli-funnel": "1.0.1",
-"em-table": "0.7.0",
+"broccoli-merge-trees": "1.1.1",
 "ember-array-contains-helper": "1.0.2",
 "ember-bootstrap": "0.5.1",
 "ember-cli": "1.13.14",
@@ -55,7 +55,7 @@
   "dependencies": {
 "em-helpers": "^0.8.0",
 "em-table": "^0.7.0",
-"ember-cli-moment-shim": "^3.0.1",
+"ember-cli-moment-shim": "0.7.3",
 "ember-cli-numeral": "^0.2.0"
   }
 }


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[33/50] [abbrv] hadoop git commit: YARN-6196. Improve Resource Donut chart with better label in Node page of new YARN UI. Contributed by Akhil PB.

[varunsaxena]

YARN-6196. Improve Resource Donut chart with better label in Node page of new 
YARN UI. Contributed by Akhil PB.


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

Branch: refs/heads/YARN-3368_branch2
Commit: bbd98cb019a7395e91a9fee44c2c4bea2acadedf
Parents: 03511fd
Author: Sunil G 
Authored: Fri Mar 10 16:17:48 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../main/webapp/app/helpers/log-files-comma.js  | 10 -
 .../app/serializers/yarn-node-container.js  |  2 +-
 .../main/webapp/app/serializers/yarn-node.js|  4 ++--
 .../main/webapp/app/serializers/yarn-rm-node.js |  4 ++--
 .../src/main/webapp/app/templates/yarn-node.hbs | 23 +---
 .../main/webapp/app/templates/yarn-nodes.hbs|  2 +-
 .../webapp/app/templates/yarn-nodes/table.hbs   | 13 ++-
 7 files changed, 37 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
index 78dcf25..026cd7f 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
@@ -35,8 +35,16 @@ export default Ember.Helper.helper(function(params,hash) {
   var containerId = hash.containerId;
   var html = '';
   for (var i = 0; i < logFilesLen; i++) {
+var logFileName = "";
+if (logFiles[i]) {
+  if (typeof logFiles[i] === "object" && logFiles[i].containerLogFiles) {
+logFileName = logFiles[i].containerLogFiles;
+  } else if (typeof logFiles[i] === "string") {
+logFileName = logFiles[i];
+  }
+}
 html = html + '' + logFiles[i] +
+nodeAddr + '/' + containerId + '/' + logFileName + '">' + logFileName +
 '';
 if (i !== logFilesLen - 1) {
   html = html + ",";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
index 7e78987..7bcb655 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
@@ -30,7 +30,7 @@ export default DS.JSONAPISerializer.extend({
 containerId: payload.id,
 state: payload.state,
 user: payload.user,
-diagnostics: payload.diagnostics,
+diagnostics: payload.diagnostics || 'N/A',
 exitCode: payload.exitCode,
 totalMemoryNeeded: payload.totalMemoryNeededMB,
 totalVCoresNeeded: payload.totalVCoresNeeded,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbd98cb0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
index 0d9faec..10521e6 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
@@ -36,8 +36,8 @@ export default DS.JSONAPISerializer.extend({
 pmemCheckEnabled: payload.pmemCheckEnabled,
 nodeHealthy: payload.nodeHealthy,
 lastNodeUpdateTime: 
Converter.timeStampToDate(payload.lastNodeUpdateTime),
-healthReport: payload.healthReport,
-nmStartupTime: Converter.timeStampToDate(payload.nmStartupTime),
+healthReport: payload.healthReport || 'N/A',
+nmStartupTime: payload.nmStartupTime? 
Converter.timeStampToDate(payload.nmStartupTime) : '',
 nodeManagerBuildVersion: payload.nodeManagerBuildVersion,
 hadoopBuildVersion: 

[26/50] [abbrv] hadoop git commit: YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by Akhil P B.

[varunsaxena]

YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by 
Akhil P B.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0d1a53ad
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0d1a53ad
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0d1a53ad

Branch: refs/heads/YARN-3368_branch2
Commit: 0d1a53ad8e01ae4fa7b3de46f60363a14d95f8b8
Parents: d5271b0
Author: Sunil G 
Authored: Tue Jan 31 14:18:31 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../hadoop-yarn-ui/src/main/webapp/.jshintrc|  5 ++-
 .../src/main/webapp/app/adapters/abstract.js|  1 +
 .../main/webapp/app/adapters/cluster-info.js|  4 +--
 .../main/webapp/app/adapters/cluster-metric.js  |  4 +--
 .../webapp/app/adapters/yarn-app-attempt.js |  4 +--
 .../src/main/webapp/app/adapters/yarn-app.js|  6 ++--
 .../webapp/app/adapters/yarn-container-log.js   |  4 +--
 .../main/webapp/app/adapters/yarn-container.js  | 12 +++
 .../src/main/webapp/app/adapters/yarn-node.js   |  4 +--
 .../src/main/webapp/app/adapters/yarn-queue.js  |  4 +--
 .../main/webapp/app/adapters/yarn-rm-node.js|  6 ++--
 .../app/components/app-usage-donut-chart.js |  6 ++--
 .../src/main/webapp/app/components/bar-chart.js | 36 +---
 .../app/components/base-chart-component.js  |  8 ++---
 .../app/components/base-usage-donut-chart.js| 11 +++---
 .../main/webapp/app/components/donut-chart.js   | 10 +++---
 .../main/webapp/app/components/nodes-heatmap.js | 21 ++--
 ...er-app-memusage-by-nodes-stacked-barchart.js |  4 +--
 ...app-ncontainers-by-nodes-stacked-barchart.js |  4 +--
 .../app/components/queue-usage-donut-chart.js   |  4 +--
 .../main/webapp/app/components/queue-view.js| 11 +++---
 .../main/webapp/app/components/simple-table.js  |  6 ++--
 .../webapp/app/components/stacked-barchart.js   | 23 +++--
 .../main/webapp/app/components/timeline-view.js | 25 --
 .../main/webapp/app/components/tree-selector.js | 33 +-
 .../main/webapp/app/controllers/application.js  |  8 ++---
 .../src/main/webapp/app/helpers/divide.js   |  2 +-
 .../main/webapp/app/helpers/log-files-comma.js  |  5 ++-
 .../src/main/webapp/app/helpers/node-link.js|  2 +-
 .../src/main/webapp/app/helpers/node-menu.js| 10 +++---
 .../src/main/webapp/app/helpers/node-name.js|  4 +--
 .../src/main/webapp/app/initializers/loader.js  |  8 +++--
 .../main/webapp/app/models/yarn-app-attempt.js  | 17 -
 .../src/main/webapp/app/models/yarn-app.js  |  8 ++---
 .../src/main/webapp/app/models/yarn-node-app.js |  8 ++---
 .../webapp/app/models/yarn-node-container.js| 12 +++
 .../src/main/webapp/app/models/yarn-queue.js| 14 
 .../src/main/webapp/app/models/yarn-rm-node.js  | 10 +++---
 .../src/main/webapp/app/models/yarn-user.js |  2 +-
 .../src/main/webapp/app/routes/application.js   |  3 +-
 .../main/webapp/app/routes/yarn-app-attempts.js |  2 --
 .../src/main/webapp/app/routes/yarn-app.js  |  2 +-
 .../webapp/app/routes/yarn-container-log.js |  2 +-
 .../main/webapp/app/routes/yarn-queues/index.js |  2 ++
 .../webapp/app/serializers/yarn-app-attempt.js  | 23 ++---
 .../src/main/webapp/app/serializers/yarn-app.js | 13 +++
 .../app/serializers/yarn-container-log.js   |  3 +-
 .../webapp/app/serializers/yarn-container.js| 22 +---
 .../webapp/app/serializers/yarn-node-app.js | 24 ++---
 .../app/serializers/yarn-node-container.js  |  7 ++--
 .../main/webapp/app/serializers/yarn-node.js|  8 ++---
 .../main/webapp/app/serializers/yarn-queue.js   | 10 +++---
 .../main/webapp/app/serializers/yarn-rm-node.js |  7 ++--
 .../src/main/webapp/app/utils/color-utils.js|  6 ++--
 .../src/main/webapp/app/utils/converter.js  |  2 +-
 .../main/webapp/app/utils/href-address-utils.js |  2 --
 .../src/main/webapp/app/utils/mock.js   |  4 +--
 .../src/main/webapp/app/utils/sorter.js |  8 ++---
 .../src/main/webapp/ember-cli-build.js  |  2 +-
 .../unit/models/yarn-container-log-test.js  |  1 +
 .../tests/unit/models/yarn-node-app-test.js |  1 +
 .../unit/models/yarn-node-container-test.js |  1 +
 .../webapp/tests/unit/models/yarn-node-test.js  |  1 +
 .../tests/unit/models/yarn-rm-node-test.js  |  1 +
 .../unit/routes/yarn-container-log-test.js  | 24 ++---
 .../tests/unit/routes/yarn-node-app-test.js | 28 +++
 .../tests/unit/routes/yarn-node-apps-test.js| 30 
 .../unit/routes/yarn-node-container-test.js | 28 +++
 .../unit/routes/yarn-node-containers-test.js| 30 
 .../webapp/tests/unit/routes/yarn-node-test.js  |  4 +--
 .../webapp/tests/unit/routes/yarn-nodes-test.js |  2 

[36/50] [abbrv] hadoop git commit: Fixing checktyle warnings during rebase

[varunsaxena]

Fixing checktyle warnings during rebase


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3a5f1a6c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3a5f1a6c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3a5f1a6c

Branch: refs/heads/YARN-3368_branch2
Commit: 3a5f1a6c26eef809381af4852a696384794a5bc8
Parents: 17213a0
Author: vrushali 
Authored: Tue Oct 17 11:39:20 2017 -0700
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../hadoop/yarn/server/resourcemanager/ResourceManager.java| 3 ---
 .../hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js | 4 ++--
 .../src/main/webapp/app/components/donut-chart.js  | 6 +++---
 .../hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml  | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a5f1a6c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 6c013c6..75c20d6 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -30,9 +30,7 @@ import org.apache.hadoop.metrics2.MetricsSystem;
 import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
 import org.apache.hadoop.metrics2.source.JvmMetrics;
 import org.apache.hadoop.http.HttpServer2;
-import org.apache.hadoop.http.lib.StaticUserWebFilter;
 import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.security.AuthenticationFilterInitializer;
 import org.apache.hadoop.security.Groups;
 import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -47,7 +45,6 @@ import org.apache.hadoop.util.ShutdownHookManager;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.curator.ZKCuratorManager;
 import org.apache.hadoop.util.VersionInfo;
-import org.apache.hadoop.util.ZKUtil;
 import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a5f1a6c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
index 05d78eb..95245bf 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
@@ -20,7 +20,7 @@ import Ember from 'ember';
 import BaseChartComponent from 'yarn-ui/components/base-chart-component';
 
 export default BaseChartComponent.extend({
-  // data: 
+  // data:
   //[{label=label1, value=value1}, ...]
   //...
   renderBarChart: function(data, title, textWidth = 50) {
@@ -120,4 +120,4 @@ export default BaseChartComponent.extend({
 this.initChart();
 this.draw();
   }
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a5f1a6c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index b1e6ecf..ce26811 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -25,7 +25,7 @@ export default BaseChartComponent.extend({
   /*
* data = [{label="xx", value=},{...}]
*/
-  renderDonutChart: function(data, title, 

[44/50] [abbrv] hadoop git commit: YARN-6635. Refactor yarn-app pages in new YARN UI. Contributed by Akhil PB.

[varunsaxena]

YARN-6635. Refactor yarn-app pages in new YARN UI. Contributed by Akhil PB.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9e4e218f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9e4e218f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9e4e218f

Branch: refs/heads/YARN-3368_branch2
Commit: 9e4e218ff0a729b5b73c7dd67c2154eaab56dfd9
Parents: dd40f6f0
Author: Sunil G 
Authored: Tue May 30 13:52:40 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../webapp/app/controllers/app-table-columns.js |   4 +-
 .../webapp/app/controllers/yarn-app-attempt.js  |   8 +-
 .../webapp/app/controllers/yarn-app-attempts.js |  57 --
 .../src/main/webapp/app/controllers/yarn-app.js |  56 +++---
 .../webapp/app/controllers/yarn-app/attempts.js |  24 +++
 .../webapp/app/controllers/yarn-app/charts.js   |  28 +++
 .../webapp/app/controllers/yarn-app/info.js |  32 
 .../app/controllers/yarn-apps/services.js   |  31 
 .../webapp/app/controllers/yarn-flowrun/info.js |   2 +-
 .../src/main/webapp/app/router.js   |   8 +-
 .../main/webapp/app/routes/yarn-app-attempts.js |  35 
 .../src/main/webapp/app/routes/yarn-app.js  |  35 +---
 .../main/webapp/app/routes/yarn-app/attempts.js |  37 
 .../main/webapp/app/routes/yarn-app/charts.js   |  53 ++
 .../src/main/webapp/app/routes/yarn-app/info.js |  37 
 .../webapp/app/routes/yarn-apps/services.js |  33 
 .../main/webapp/app/templates/application.hbs   |   2 +-
 .../app/templates/components/app-table.hbs  |   6 +-
 .../webapp/app/templates/yarn-app-attempts.hbs  |  58 --
 .../src/main/webapp/app/templates/yarn-app.hbs  | 185 +--
 .../webapp/app/templates/yarn-app/attempts.hbs  |  29 +++
 .../webapp/app/templates/yarn-app/charts.hbs|  43 +
 .../main/webapp/app/templates/yarn-app/info.hbs | 167 +
 .../webapp/app/templates/yarn-app/loading.hbs   |  23 +++
 .../src/main/webapp/app/templates/yarn-apps.hbs |   5 +-
 .../webapp/app/templates/yarn-apps/services.hbs |  25 ---
 .../main/webapp/app/templates/yarn-services.hbs |   3 +-
 .../unit/controllers/yarn-app-attempts-test.js  |  30 ---
 .../unit/controllers/yarn-app/attempts-test.js  |  30 +++
 .../unit/controllers/yarn-app/charts-test.js|  30 +++
 .../unit/controllers/yarn-app/info-test.js  |  30 +++
 .../unit/controllers/yarn-apps/services-test.js |  30 ---
 .../tests/unit/routes/yarn-app-attempts-test.js |  29 ---
 .../tests/unit/routes/yarn-app/attempts-test.js |  29 +++
 .../tests/unit/routes/yarn-app/charts-test.js   |  29 +++
 .../tests/unit/routes/yarn-app/info-test.js |  29 +++
 36 files changed, 714 insertions(+), 578 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
index 704abfb..8a34f1a 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
@@ -38,7 +38,7 @@ export default Ember.Controller.extend({
   getCellContent: function(row) {
 return {
   displayText: row.id,
-  href: `#/yarn-app/${row.id}`
+  href: `#/yarn-app/${row.id}/info`
 };
   }
   }, {
@@ -112,7 +112,7 @@ export default Ember.Controller.extend({
   getCellContent: function(row) {
 return {
   displayText: row.get('appName'),
-  href: `#/yarn-app/${row.id}?service=${row.get('appName')}`
+  href: `#/yarn-app/${row.id}/info?service=${row.get('appName')}`
 };
   }
 }, {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e4e218f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
index fbe6fa9..1121a84 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
@@ 

[42/50] [abbrv] hadoop git commit: YARN-5146. Support for Fair Scheduler in new YARN UI. Contributed by Abdullah Yousufi.

[varunsaxena]

YARN-5146. Support for Fair Scheduler in new YARN UI. Contributed by Abdullah 
Yousufi.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a1f39c9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a1f39c9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a1f39c9

Branch: refs/heads/YARN-3368_branch2
Commit: 1a1f39c98c2598a0fd77fa995a02b18060a2ca8a
Parents: 1635741
Author: Sunil G 
Authored: Tue Aug 15 21:58:44 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../src/main/webapp/app/adapters/yarn-queue.js  |  30 -
 .../app/adapters/yarn-queue/capacity-queue.js   |  23 
 .../app/adapters/yarn-queue/fair-queue.js   |  23 
 .../app/adapters/yarn-queue/fifo-queue.js   |  23 
 .../app/adapters/yarn-queue/yarn-queue.js   |  30 +
 .../main/webapp/app/components/tree-selector.js |  19 ++-
 .../src/main/webapp/app/models/yarn-queue.js|  94 --
 .../app/models/yarn-queue/capacity-queue.js |  95 ++
 .../webapp/app/models/yarn-queue/fair-queue.js  |  79 
 .../webapp/app/models/yarn-queue/fifo-queue.js  |  52 
 .../webapp/app/models/yarn-queue/yarn-queue.js  |  23 
 .../main/webapp/app/routes/cluster-overview.js  |   4 +-
 .../src/main/webapp/app/routes/yarn-queue.js|  26 ++--
 .../src/main/webapp/app/routes/yarn-queues.js   |  12 +-
 .../main/webapp/app/routes/yarn-queues/index.js |  25 
 .../app/routes/yarn-queues/queues-selector.js   |  25 
 .../main/webapp/app/serializers/yarn-queue.js   | 129 ---
 .../serializers/yarn-queue/capacity-queue.js| 128 ++
 .../app/serializers/yarn-queue/fair-queue.js|  92 +
 .../app/serializers/yarn-queue/fifo-queue.js|  59 +
 .../app/serializers/yarn-queue/yarn-queue.js|  47 +++
 .../components/queue-configuration-table.hbs|  54 
 .../templates/components/queue-navigator.hbs|   7 +-
 .../yarn-queue/capacity-queue-conf-table.hbs|  54 
 .../yarn-queue/capacity-queue-info.hbs  |  84 
 .../components/yarn-queue/capacity-queue.hbs|  63 +
 .../yarn-queue/fair-queue-conf-table.hbs|  52 
 .../components/yarn-queue/fair-queue-info.hbs   |  66 ++
 .../components/yarn-queue/fair-queue.hbs|  63 +
 .../yarn-queue/fifo-queue-conf-table.hbs|  56 
 .../components/yarn-queue/fifo-queue-info.hbs   |  47 +++
 .../components/yarn-queue/fifo-queue.hbs|  48 +++
 .../webapp/app/templates/yarn-queue/info.hbs|  73 +--
 .../main/webapp/app/templates/yarn-queues.hbs   |  54 +---
 .../src/main/webapp/app/utils/color-utils.js|   1 -
 35 files changed, 1266 insertions(+), 494 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
deleted file mode 100644
index f2017df..000
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import AbstractAdapter from './abstract';
-
-export default AbstractAdapter.extend({
-  address: "rmWebAddress",
-  restNameSpace: "cluster",
-  serverName: "RM",
-
-  pathForType(/*modelName*/) {
-return 'scheduler'; // move to some common place, return path by modelname.
-  }
-
-});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a1f39c9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js

[50/50] [abbrv] hadoop git commit: YARN-7075. Better styling for donut charts in new YARN UI. Contributed by Da Ding.

[varunsaxena]

YARN-7075. Better styling for donut charts in new YARN UI. Contributed by Da 
Ding.


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

Branch: refs/heads/YARN-3368_branch2
Commit: da104a3e7845f39b2f02eb10c872aac84d4a0293
Parents: 1cf7ed8
Author: Sunil G 
Authored: Sat Sep 2 08:08:59 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../main/webapp/app/components/donut-chart.js   |  5 +++-
 .../src/main/webapp/app/styles/app.css  | 24 ++--
 2 files changed, 26 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/da104a3e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index 82d2d46..b1e6ecf 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -53,7 +53,10 @@ export default BaseChartComponent.extend({
 
 // 50 is for title
 var outerRadius = (h - 50 - 2 * layout.margin) / 2;
-var innerRadius = outerRadius * 0.618;
+
+// Ratio of inner radius to outer radius
+var radiusRatio = 0.75;
+var innerRadius = outerRadius * radiusRatio;
 
 var arc = d3.svg.arc()
   .innerRadius(innerRadius)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/da104a3e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
index 8b8ea56..38e25e4 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
@@ -20,6 +20,8 @@ body, html, body > .ember-view {
   height: 100%;
   overflow: visible;
   color: @text-color;
+  background: #f6f6f8;
+  font-family: "Open Sans","Helvetica Neue", sans-serif!important;
 }
 body, html {
   min-width: 1024px;
@@ -29,11 +31,11 @@ body, html {
  Over all style
  */
 text {
-  font: 16px sans-serif;
+  font-size: 14px;
 }
 
 text.small {
-  font: 8px sans-serif;
+  font-size: 8px;
 }
 
 html, body
@@ -184,6 +186,7 @@ table.dataTable thead .sorting_desc_disabled {
 
 .breadcrumb {
   padding-bottom: 3px;
+  background-color: #f6f6f8;
 }
 
 .navbar-default .navbar-nav > li > a {
@@ -268,12 +271,29 @@ td {
   margin: 0 auto -40px; // Must be same as footer & footer-frame
 }
 
+.panel {
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 15px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+  overflow: hidden;
+}
+
 .panel-default .container-fluid {
   margin-top: -45px !important;
   margin-bottom: -10px !important;
 }
 
+.panel-default > .panel-heading {
+  background-image: none;
+  background-color: #f5f5f5 !important;
+  border-radius: 15px 15px 0px 0px;
+}
+
+
 .panel-heading {
+  background-color: rgba(0, 0, 0, 0) !important;
   font-weight: bold;
 }
 


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[39/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from ATS v2 in new web UI. Contributed by Akhil PB.

[varunsaxena]

YARN-5705. Show timeline data from ATS v2 in new web UI. Contributed by Akhil 
PB.


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

Branch: refs/heads/YARN-3368_branch2
Commit: dd40f6f0cc3c6cade4143a9fa772dce868f9be99
Parents: 458ba54
Author: Sunil G 
Authored: Sun May 21 18:09:13 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../webapp/app/adapters/yarn-app-attempt.js |   4 +-
 .../webapp/app/adapters/yarn-app-flowrun.js |  33 +++
 .../webapp/app/adapters/yarn-app-timeline.js|  35 +++
 .../main/webapp/app/adapters/yarn-container.js  |  18 +-
 .../src/main/webapp/app/adapters/yarn-entity.js |  35 +++
 .../webapp/app/adapters/yarn-flow-activity.js   |  30 +++
 .../webapp/app/adapters/yarn-flowrun-brief.js   |  32 +++
 .../main/webapp/app/adapters/yarn-flowrun.js|  38 +++
 .../app/adapters/yarn-timeline-appattempt.js|  41 +++
 .../app/adapters/yarn-timeline-container.js |  40 +++
 .../main/webapp/app/components/nodes-heatmap.js |  18 +-
 .../webapp/app/components/simple-bar-chart.js   | 206 +++
 .../webapp/app/components/sunburst-chart.js | 261 +++
 .../webapp/app/controllers/yarn-apps/apps.js|   1 -
 .../app/controllers/yarn-apps/services.js   |   1 -
 .../app/controllers/yarn-flow-activity.js   | 125 +
 .../main/webapp/app/controllers/yarn-flow.js|  36 +++
 .../webapp/app/controllers/yarn-flow/info.js|  66 +
 .../webapp/app/controllers/yarn-flow/runs.js| 178 +
 .../main/webapp/app/controllers/yarn-flowrun.js |  50 
 .../webapp/app/controllers/yarn-flowrun/info.js | 157 +++
 .../app/controllers/yarn-flowrun/metrics.js | 126 +
 .../webapp/app/controllers/yarn-services.js |  12 +-
 .../src/main/webapp/app/mixins/app-attempt.js   |  66 +
 .../main/webapp/app/models/yarn-app-attempt.js  |  11 +-
 .../main/webapp/app/models/yarn-app-flowrun.js  |  52 
 .../main/webapp/app/models/yarn-app-timeline.js | 105 
 .../main/webapp/app/models/yarn-container.js|   9 +-
 .../src/main/webapp/app/models/yarn-entity.js   |  26 ++
 .../webapp/app/models/yarn-flow-activity.js |  28 ++
 .../webapp/app/models/yarn-flowrun-brief.js |  70 +
 .../src/main/webapp/app/models/yarn-flowrun.js  |  32 +++
 .../app/models/yarn-timeline-appattempt.js  | 143 ++
 .../app/models/yarn-timeline-container.js   |  63 +
 .../src/main/webapp/app/router.js   |  12 +
 .../main/webapp/app/routes/timeline-error.js|  29 +++
 .../main/webapp/app/routes/yarn-app-attempt.js  |  32 +--
 .../main/webapp/app/routes/yarn-app-attempts.js |  13 +-
 .../src/main/webapp/app/routes/yarn-app.js  |  18 +-
 .../webapp/app/routes/yarn-flow-activity.js |  37 +++
 .../src/main/webapp/app/routes/yarn-flow.js |  53 
 .../main/webapp/app/routes/yarn-flow/info.js|  22 ++
 .../main/webapp/app/routes/yarn-flow/runs.js|  22 ++
 .../webapp/app/routes/yarn-flowrun-metric.js| 107 
 .../src/main/webapp/app/routes/yarn-flowrun.js  |  58 +
 .../main/webapp/app/routes/yarn-flowrun/info.js |  22 ++
 .../webapp/app/routes/yarn-flowrun/metrics.js   |  22 ++
 .../webapp/app/serializers/yarn-app-flowrun.js  |  64 +
 .../webapp/app/serializers/yarn-app-timeline.js |  76 ++
 .../src/main/webapp/app/serializers/yarn-app.js |   3 +-
 .../main/webapp/app/serializers/yarn-entity.js  |  51 
 .../app/serializers/yarn-flow-activity.js   |  54 
 .../app/serializers/yarn-flowrun-brief.js   |  64 +
 .../main/webapp/app/serializers/yarn-flowrun.js |  63 +
 .../main/webapp/app/serializers/yarn-queue.js   |  22 +-
 .../app/serializers/yarn-timeline-appattempt.js |  69 +
 .../app/serializers/yarn-timeline-container.js  |  71 +
 .../src/main/webapp/app/styles/app.css  |  83 ++
 .../main/webapp/app/templates/application.hbs   |   6 +-
 .../webapp/app/templates/timeline-error.hbs |  22 ++
 .../webapp/app/templates/yarn-app-attempt.hbs   |  46 ++--
 .../webapp/app/templates/yarn-app-attempts.hbs  |   7 +-
 .../src/main/webapp/app/templates/yarn-app.hbs  |  51 +---
 .../src/main/webapp/app/templates/yarn-apps.hbs |   4 +-
 .../webapp/app/templates/yarn-flow-activity.hbs |  45 
 .../src/main/webapp/app/templates/yarn-flow.hbs |  49 
 .../webapp/app/templates/yarn-flow/info.hbs |  53 
 .../webapp/app/templates/yarn-flow/runs.hbs | 131 ++
 .../app/templates/yarn-flowrun-metric.hbs   |  34 +++
 .../main/webapp/app/templates/yarn-flowrun.hbs  |  49 
 .../webapp/app/templates/yarn-flowrun/info.hbs  | 128 +
 

[38/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from ATS v2 in new web UI. Contributed by Akhil PB.

[varunsaxena]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
new file mode 100644
index 000..1095cfe
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+  cluster: DS.attr('string'),
+  flowName: DS.attr('string'),
+  lastExecDate: DS.attr('string'),
+  user: DS.attr('string'),
+  flowruns: DS.attr('string'),
+  uid: DS.attr('string')
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
new file mode 100644
index 000..8d9fca3
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.Model.extend({
+  flowName: DS.attr('string'),
+  runid: DS.attr('string'),
+  shownid: DS.attr('string'),
+  type: DS.attr('string'),
+  createTime: DS.attr('string'),
+  createTimeRaw: DS.attr(),
+  endTime: DS.attr('string'),
+  endTimeRaw: DS.attr(),
+  user: DS.attr('string'),
+  uid: DS.attr('string'),
+  cpuVCores: DS.attr('number'),
+  memoryUsed: DS.attr('number'),
+
+  runDurationTs: function() {
+var duration = this.get('endTimeRaw') - this.get('createTimeRaw');
+if (duration <= 0) {
+  duration = Date.now() - this.get('createTimeRaw');
+}
+return duration;
+  }.property('createTimeRaw', 'endTimeRaw'),
+
+  getElapsedTimeVizDataForBarChart: function() {
+return {
+  label: this.get('runid'),
+  value: this.get('runDurationTs'),
+  tooltip: this.get("shownid") + "" + 
Converter.msToElapsedTimeUnit(this.get('runDurationTs')),
+  flowrunUid: this.get('uid')
+};
+  },
+
+  getCpuVCoresVizDataForBarChart: function() {
+return {
+  label: this.get('runid'),
+  value: this.get('cpuVCores'),
+  tooltip: this.get("shownid") + "" + 'CPU VCores: ' + 
this.get('cpuVCores'),
+  flowrunUid: this.get('uid')
+};
+  },
+
+  getMemoryVizDataForBarChart: function() {
+return {
+  label: this.get('runid'),
+  value: this.get('memoryUsed'),
+  tooltip: this.get("shownid") + "" + 'Memory Used: ' + 
Converter.memoryBytesToMB(this.get('memoryUsed')),
+  flowrunUid: this.get('uid')
+};
+  }
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd40f6f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js
--
diff --git 

[32/50] [abbrv] hadoop git commit: YARN-6184. Introduce loading icon in each page of new YARN UI. Contributed by Akhil PB.

[varunsaxena]

YARN-6184. Introduce loading icon in each page of new YARN UI. Contributed by 
Akhil PB.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/148c7b86
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/148c7b86
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/148c7b86

Branch: refs/heads/YARN-3368_branch2
Commit: 148c7b8689b244152a5a0a03a153ecb516a33b3b
Parents: 981ccd9
Author: Sunil G 
Authored: Wed Feb 22 11:54:32 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../main/webapp/app/components/tree-selector.js |   8 +-
 .../webapp/app/controllers/yarn-queue-apps.js   |  46 --
 .../main/webapp/app/controllers/yarn-queue.js   |  17 +++-
 .../main/webapp/app/controllers/yarn-queues.js  |   1 +
 .../src/main/webapp/app/router.js   |   6 +-
 .../main/webapp/app/routes/cluster-overview.js  |   4 +-
 .../main/webapp/app/routes/yarn-app-attempt.js  |  12 +--
 .../src/main/webapp/app/routes/yarn-apps.js |   4 +-
 .../src/main/webapp/app/routes/yarn-node.js |   4 +-
 .../src/main/webapp/app/routes/yarn-nodes.js|   4 +-
 .../main/webapp/app/routes/yarn-queue-apps.js   |  42 --
 .../src/main/webapp/app/routes/yarn-queue.js|   3 +-
 .../main/webapp/app/routes/yarn-queue/apps.js   |  22 +
 .../main/webapp/app/routes/yarn-queue/info.js   |  22 +
 .../src/main/webapp/app/routes/yarn-queues.js   |  35 +++-
 .../src/main/webapp/app/styles/app.css  |   8 ++
 .../src/main/webapp/app/templates/loading.hbs   |  23 +
 .../webapp/app/templates/yarn-apps/loading.hbs  |  23 +
 .../webapp/app/templates/yarn-queue-apps.hbs|  64 --
 .../main/webapp/app/templates/yarn-queue.hbs|  69 ++-
 .../webapp/app/templates/yarn-queue/apps.hbs|  28 +++
 .../webapp/app/templates/yarn-queue/info.hbs|  84 +++
 .../main/webapp/app/templates/yarn-queues.hbs   |   8 +-
 .../webapp/public/assets/images/spinner.gif | Bin 0 -> 33076 bytes
 .../unit/controllers/yarn-queue-apps-test.js|  30 ---
 .../tests/unit/routes/yarn-queue-apps-test.js   |  29 ---
 .../tests/unit/routes/yarn-queue/apps-test.js   |  29 +++
 .../tests/unit/routes/yarn-queue/info-test.js   |  29 +++
 28 files changed, 347 insertions(+), 307 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
index c9e735d..3d72b2f 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
@@ -128,7 +128,7 @@ export default Ember.Component.extend({
   .attr("transform", function() { return "translate(" + source.y0 + "," + 
source.x0 + ")"; })
   .on("mouseover", function(d){
 if (d.queueData.get("name") !== this.get("selected")) {
-document.location.href = "#/yarn-queues/" + 
d.queueData.get("name");
+document.location.href = "#/yarn-queues/" + 
d.queueData.get("name") + "!";
 }
 
 Ember.run.later(this, function () {
@@ -143,7 +143,7 @@ export default Ember.Component.extend({
 
   }.bind(this))
 .on("click", function (d) {
-  document.location.href = "#/yarn-queue/" + d.queueData.get("name");
+  document.location.href = "#/yarn-queue/" + d.queueData.get("name") + 
"/info";
 });
 
 nodeEnter.append("circle")
@@ -190,7 +190,7 @@ export default Ember.Component.extend({
 
 nodeUpdate.select("circle")
   .attr("r", 30)
-  .attr("href", 
+  .attr("href",
 function(d) {
   return "#/yarn-queues/" + d.queueData.get("name");
 })
@@ -294,4 +294,4 @@ export default Ember.Component.extend({
   didInsertElement: function() {
this.reDraw();
   }
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/148c7b86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js
deleted file mode 100644
index e7bedd6..000
--- 

[29/50] [abbrv] hadoop git commit: YARN-5335. Use em-table in app/nodes pages for new YARN UI. Contributed by Sunil G.

[varunsaxena]

YARN-5335. Use em-table in app/nodes pages for new YARN UI. Contributed by 
Sunil G.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/03511fda
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/03511fda
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/03511fda

Branch: refs/heads/YARN-3368_branch2
Commit: 03511fdaf8b72a0135a8d12542838bacbfa19f39
Parents: 148c7b8
Author: Sunil G 
Authored: Tue Feb 28 13:49:19 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../src/main/webapp/app/adapters/yarn-app.js|   4 +-
 .../app/components/app-usage-donut-chart.js |   1 -
 .../main/webapp/app/components/donut-chart.js   |   1 -
 .../webapp/app/controllers/app-table-columns.js |  98 +
 .../webapp/app/controllers/yarn-apps/apps.js|  25 +
 .../app/controllers/yarn-apps/services.js   |  25 +
 .../main/webapp/app/controllers/yarn-node.js|   3 +-
 .../webapp/app/controllers/yarn-nodes/table.js  | 109 +++
 .../webapp/app/controllers/yarn-queue/apps.js   |  31 ++
 .../src/main/webapp/app/models/yarn-rm-node.js  |   8 ++
 .../src/main/webapp/app/routes/yarn-apps.js |   2 -
 .../main/webapp/app/routes/yarn-apps/apps.js|   9 ++
 .../webapp/app/routes/yarn-apps/services.js |  11 ++
 .../src/main/webapp/app/routes/yarn-queue.js|   4 +-
 .../src/main/webapp/app/routes/yarn-queues.js   |   3 +-
 .../src/main/webapp/app/serializers/yarn-app.js |   3 +-
 .../webapp/app/templates/yarn-apps/apps.hbs |  13 ++-
 .../webapp/app/templates/yarn-apps/services.hbs |   4 +-
 .../webapp/app/templates/yarn-nodes/table.hbs   |  42 +--
 .../webapp/app/templates/yarn-queue/apps.hbs|   3 +-
 .../hadoop-yarn-ui/src/main/webapp/package.json |   9 +-
 .../unit/controllers/app-table-columns-test.js  |  30 +
 .../unit/controllers/yarn-apps/apps-test.js |  30 +
 .../unit/controllers/yarn-apps/services-test.js |  30 +
 .../unit/controllers/yarn-nodes/table-test.js   |  30 +
 .../unit/controllers/yarn-queue/apps-test.js|  30 +
 26 files changed, 492 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
index b34c606..fc52f7c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
@@ -25,9 +25,7 @@ export default AbstractAdapter.extend({
 
   urlForQuery(query/*, modelName*/) {
 var url = this._buildURL();
-if (query.state) {
-  url = url + '/apps/?state=' + query.state;
-}
+url = url + '/apps';
 return url;
   },
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
index 274c219..c72d934 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
@@ -36,7 +36,6 @@ export default BaseUsageDonutChart.extend({
   value: v.toFixed(2)
 });
 
-console.log(v);
 avail = avail - v;
   }
 }.bind(this));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/03511fda/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index e5699b4..82d2d46 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -54,7 +54,6 @@ export default BaseChartComponent.extend({
 // 50 is for title
 var outerRadius = (h - 50 - 2 * layout.margin) / 2;
 var 

[46/50] [abbrv] hadoop git commit: YARN-6631. Refactor loader.js in new Yarn UI. Contributed by Akhil P B.

[varunsaxena]

YARN-6631. Refactor loader.js in new Yarn UI. Contributed by Akhil P B.


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

Branch: refs/heads/YARN-3368_branch2
Commit: 16357413908c8f04a9ebe384fadc502800bc514b
Parents: 6232c3a
Author: Sunil G 
Authored: Thu Aug 10 11:53:26 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../src/main/webapp/app/initializers/loader.js  | 42 +---
 1 file changed, 19 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/16357413/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
index aa8fb07..55f6e1b 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -20,25 +20,27 @@
 
 import Ember from 'ember';
 
-function getTimeLineURL() {
-  return '/conf?name=yarn.timeline-service.webapp.address';
+function getTimeLineURL(rmhost) {
+  var url = window.location.protocol + '//' +
+(ENV.hosts.localBaseAddress? ENV.hosts.localBaseAddress + '/' : '') + 
rmhost;
+
+  url += '/conf?name=yarn.timeline-service.webapp.address';
+  Ember.Logger.log("Get Timeline Address URL: " + url);
+  return url;
 }
 
 function updateConfigs(application) {
   var hostname = window.location.hostname;
-  var rmhost = hostname +
-(window.location.port ? ':' + window.location.port: '');
-
-  Ember.Logger.log("RM Address:" + rmhost);
+  var rmhost = hostname + (window.location.port ? ':' + window.location.port: 
'');
 
   if(!ENV.hosts.rmWebAddress) {
-ENV = {
-   hosts: {
-  rmWebAddress: rmhost,
-},
-};
+ENV.hosts.rmWebAddress = rmhost;
+  } else {
+rmhost = ENV.hosts.rmWebAddress;
   }
 
+  Ember.Logger.log("RM Address: " + rmhost);
+
   if(!ENV.hosts.timelineWebAddress) {
 var timelinehost = "";
 $.ajax({
@@ -46,7 +48,7 @@ function updateConfigs(application) {
   dataType: 'json',
   async: true,
   context: this,
-  url: getTimeLineURL(),
+  url: getTimeLineURL(rmhost),
   success: function(data) {
 timelinehost = data.property.value;
 ENV.hosts.timelineWebAddress = timelinehost;
@@ -54,24 +56,18 @@ function updateConfigs(application) {
 var address = timelinehost.split(":")[0];
 var port = timelinehost.split(":")[1];
 
-Ember.Logger.log("Timeline Address from RM:" + address + ":" + port);
+Ember.Logger.log("Timeline Address from RM: " + timelinehost);
 
 if(address === "0.0.0.0" || address === "localhost") {
   var updatedAddress =  hostname + ":" + port;
-
-  /* Timeline v2 is not supporting CORS, so make as default*/
-  ENV = {
- hosts: {
-rmWebAddress: rmhost,
-timelineWebAddress: updatedAddress,
-  },
-  };
-  Ember.Logger.log("Timeline Updated Address:" + updatedAddress);
+  ENV.hosts.timelineWebAddress = updatedAddress;
+  Ember.Logger.log("Timeline Updated Address: " + updatedAddress);
 }
 application.advanceReadiness();
-  },
+  }
 });
   } else {
+Ember.Logger.log("Timeline Address: " + ENV.hosts.timelineWebAddress);
 application.advanceReadiness();
   }
 }


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[45/50] [abbrv] hadoop git commit: YARN-6386. Show decommissioning nodes in new YARN UI. Contributed by Elek Marton.

[varunsaxena]

YARN-6386. Show decommissioning nodes in new YARN UI. Contributed by Elek 
Marton.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/65b90e1e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65b90e1e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65b90e1e

Branch: refs/heads/YARN-3368_branch2
Commit: 65b90e1e1c512efb74aabb8861ebfc13c8eef8fd
Parents: 1a1f39c
Author: Sunil G 
Authored: Tue Aug 29 16:51:14 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:49 2017 +0530

--
 .../main/webapp/app/models/cluster-metric.js|  9 --
 .../src/main/webapp/app/models/yarn-rm-node.js  |  2 +-
 .../webapp/app/templates/cluster-overview.hbs   | 33 ++--
 .../main/webapp/app/templates/yarn-nodes.hbs|  2 +-
 4 files changed, 26 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
index bc6e27a..dcc0c29 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
@@ -39,6 +39,7 @@ export default DS.Model.extend({
   totalNodes: DS.attr('number'),
   lostNodes: DS.attr('number'),
   unhealthyNodes: DS.attr('number'),
+  decommissioningNodes: DS.attr('number'),
   decommissionedNodes: DS.attr('number'),
   rebootedNodes: DS.attr('number'),
   activeNodes: DS.attr('number'),
@@ -87,11 +88,15 @@ export default DS.Model.extend({
   value: this.get("unhealthyNodes")
 });
 arr.push({
+  label: "Decommissioning",
+  value: this.get("decommissioningNodes")
+});
+arr.push({
   label: "Decomissioned",
   value: this.get("decommissionedNodes")
 });
 return arr;
-  }.property("activeNodes", "unhealthyNodes", "decommissionedNodes"),
+  }.property("activeNodes", "unhealthyNodes", "decommissioningNodes", 
"decommissionedNodes"),
 
   getMemoryDataForDonutChart: function() {
 var type = "MB";
@@ -130,4 +135,4 @@ export default DS.Model.extend({
 
 return arr;
   }.property("allocatedVirtualCores", "reservedVirtualCores", 
"availableVirtualCores"),
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
index 461bf00..6baeca2 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
@@ -53,7 +53,7 @@ export default DS.Model.extend({
   nodeStateStyle: function() {
 var style = "default";
 var nodeState = this.get("state");
-if (nodeState === "REBOOTED") {
+if (nodeState === "REBOOTED" || nodeState === "DECOMMISSIONING") {
   style = "warning";
 } else if (nodeState === "UNHEALTHY" || nodeState === "DECOMMISSIONED" ||
   nodeState === "LOST" || nodeState === "SHUTDOWN") {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
index ac8f20a..e549ce5 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
@@ -86,22 +86,6 @@
 
   
 
-
-
-  
-
-  Node Managers
-
-
-  {{donut-chart 
data=model.clusterMetrics.firstObject.getNodesDataForDonutChart
-  showLabels=true
-  parentId="nodes-donut-chart"
-  ratio=0.6
-  maxHeight=350
-  colorTargets="good error warn"}}
-
-  
-
   
 
   
@@ -142,6 +126,23 @@
   
 
   
+  
+
+  

[16/50] [abbrv] hadoop git commit: YARN-5741. [YARN-3368] Update UI2 documentation for new UI2 path (Kai Sasaki and Wangda Tan via Sunil G)

[varunsaxena]

YARN-5741. [YARN-3368] Update UI2 documentation for new UI2 path (Kai Sasaki 
and Wangda Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/29fc43e5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/29fc43e5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/29fc43e5

Branch: refs/heads/YARN-3368_branch2
Commit: 29fc43e5a4e3cc32853c96a65962d969a84ab7dd
Parents: 7513315
Author: sunilg 
Authored: Tue Oct 18 23:49:55 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../src/site/markdown/YarnUI2.md| 28 +---
 1 file changed, 12 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/29fc43e5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index ff48183..f646d3d 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -18,30 +18,26 @@
 Hadoop: YARN-UI V2
 =
 
-Prerequisites
--
-
-If you run RM locally in your computer for test purpose, you need the 
following things properly installed.
-
-- Install Node.js with NPM: https://nodejs.org/download
-- After Node.js installed, install `corsproxy`: `npm install -g corsproxy`.
-
-
 Configurations
 -
 
-*In yarn-site.xml*
+*In `yarn-site.xml`*
 
 | Configuration Property | Description |
 |: |: |
-| `yarn.resourcemanager.webapp.ui2.enable` | In the server side it indicates 
whether the new YARN-UI v2 is enabled or not. Defaults to `false`. |
-| `yarn.resourcemanager.webapp.ui2.address` | Specify the address of 
ResourceManager and port which host YARN-UI v2, defaults to `localhost:8288`. |
+| `yarn.webapp.ui2.enable` | *(Required)* In the server side it indicates 
whether the new YARN-UI v2 is enabled or not. Defaults to `false`. |
+| `yarn.webapp.ui2.war-file-path` | *(Optional)* WAR file path for launching 
yarn UI2 web application. By default this is empty and YARN will lookup 
required war file from classpath |
 
-*In $HADOOP_PREFIX/share/hadoop/yarn/webapps/rm/config/configs.env*
+Please note that, If you run YARN daemons locally in your machine for test 
purpose,
+you need the following configurations added to `yarn-site.xml` to enable cross
+origin (CORS) support.
 
-- Update timelineWebAddress and rmWebAddress to the actual addresses run 
resource manager and timeline server
-- If you run RM locally in you computer just for test purpose, you need to 
keep `corsproxy` running. Otherwise, you need to set `localBaseAddress` to 
empty.
+| Configuration Property | Value | Description |
+|: |: |: |
+| `yarn.timeline-service.http-cross-origin.enabled` | true | Enable CORS 
support for Timeline Server  |
+| `yarn.resourcemanager.webapp.cross-origin.enabled` | true | Enable CORS 
support for Resource Manager  |
+| `yarn.nodemanager.webapp.cross-origin.enabled` | true | Enable CORS support 
for Node Manager  |
 
 Use it
 -
-Open your browser, go to `rm-address:8288` and try it!
+Open your browser, go to `rm-address:8088/ui2` and try it!


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[18/50] [abbrv] hadoop git commit: YARN-6291. Introduce query parameters (sort, filter, etc.) for tables to keep state on refresh/navigation in new YARN UI. Contributed by Gergely Novák.

[varunsaxena]

YARN-6291. Introduce query parameters (sort, filter, etc.) for tables to keep 
state on refresh/navigation in new YARN UI. Contributed by Gergely Novák.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/458ba54e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/458ba54e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/458ba54e

Branch: refs/heads/YARN-3368_branch2
Commit: 458ba54ea5fee0f2abf041e020f8c28fcc6d8650
Parents: c069f4f
Author: Sunil G 
Authored: Mon Apr 24 13:28:57 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../src/main/webapp/app/controllers/yarn-apps/apps.js | 10 ++
 .../src/main/webapp/app/controllers/yarn-apps/services.js | 10 ++
 .../src/main/webapp/app/controllers/yarn-nodes/table.js   |  8 
 .../src/main/webapp/app/templates/yarn-apps/apps.hbs  |  2 +-
 .../src/main/webapp/app/templates/yarn-apps/services.hbs  |  2 +-
 .../src/main/webapp/app/templates/yarn-nodes/table.hbs|  2 +-
 6 files changed, 31 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/458ba54e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
index 0b0be20..44a7c1c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
@@ -16,7 +16,17 @@
  * limitations under the License.
  */
 
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+import TableDefinition from 'em-table/utils/table-definition';
 import AppTableController from '../app-table-columns';
 
 export default AppTableController.extend({
+  queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 
'rowCount'],
+  tableDefinition: TableDefinition.create(),
+  searchText: Ember.computed.alias('tableDefinition.searchText'),
+  sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+  sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+  pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+  rowCount: Ember.computed.alias('tableDefinition.rowCount')
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/458ba54e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
index 0b0be20..44a7c1c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
@@ -16,7 +16,17 @@
  * limitations under the License.
  */
 
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+import TableDefinition from 'em-table/utils/table-definition';
 import AppTableController from '../app-table-columns';
 
 export default AppTableController.extend({
+  queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 
'rowCount'],
+  tableDefinition: TableDefinition.create(),
+  searchText: Ember.computed.alias('tableDefinition.searchText'),
+  sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+  sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+  pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+  rowCount: Ember.computed.alias('tableDefinition.rowCount')
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/458ba54e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
index 3b7b0f6..3fae596 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
@@ -19,8 +19,16 @@
 
 import Ember from 'ember';
 import ColumnDef 

[21/50] [abbrv] hadoop git commit: YARN-5779. [YARN-3368] Addendum patch to document limits/notes of the new YARN UI . (Sunil G via Sreenath Somarajapuram)

[varunsaxena]

YARN-5779. [YARN-3368] Addendum patch to document limits/notes of the new YARN 
UI . (Sunil G via Sreenath Somarajapuram)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6c680322
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c680322
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c680322

Branch: refs/heads/YARN-3368_branch2
Commit: 6c6803229160298914c176324bb31c020e33d7aa
Parents: 9ebb57d
Author: Sreenath Somarajapuram 
Authored: Fri Oct 28 18:20:55 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c680322/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index 9f82031..e7853bf 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -38,6 +38,9 @@ origin (CORS) support.
 | `yarn.resourcemanager.webapp.cross-origin.enabled` | true | Enable CORS 
support for Resource Manager  |
 | `yarn.nodemanager.webapp.cross-origin.enabled` | true | Enable CORS support 
for Node Manager  |
 
+Also please ensure that CORS related configurations are enabled in 
`core-site.xml`.
+Kindly refer 
[here](https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-common/HttpAuthentication.html)
+
 Use it
 -
 Open your browser, go to `rm-address:8088/ui2` and try it!


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[14/50] [abbrv] hadoop git commit: YARN-5682. [YARN-3368] Fix maven build to keep all generated or downloaded files in target folder (Wangda Tan via Sunil G)

[varunsaxena]

YARN-5682. [YARN-3368] Fix maven build to keep all generated or downloaded 
files in target folder (Wangda Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8222307c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8222307c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8222307c

Branch: refs/heads/YARN-3368_branch2
Commit: 8222307c300a028102f9e7fd882b9b3f8f93eb6e
Parents: e5c0219
Author: sunilg 
Authored: Tue Oct 4 21:07:42 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../hadoop-yarn/hadoop-yarn-ui/pom.xml  | 54 
 hadoop-yarn-project/hadoop-yarn/pom.xml |  2 +-
 2 files changed, 34 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/8222307c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index fcca48a..e59e9bf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -31,7 +31,7 @@
 
   
 war
-src/main/webapp
+${basedir}/target/src/main/webapp
 node
 v0.12.2
 2.10.0
@@ -84,10 +84,10 @@
   false
   
 
-  
${basedir}/src/main/webapp/bower_components
+  ${webappTgtDir}/bower_components
 
 
-  ${basedir}/src/main/webapp/node_modules
+  ${webappTgtDir}/node_modules
 
   
 
@@ -109,6 +109,33 @@
 
   
 
+  
+  
+org.apache.maven.plugins
+maven-antrun-plugin
+
+  
+prepare-source-code
+generate-sources
+
+  run
+
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+
   
   
 exec-maven-plugin
@@ -121,7 +148,7 @@
   exec
 
 
-  ${webappDir}
+  ${webappTgtDir}
   npm
   
 install
@@ -135,7 +162,7 @@
   exec
 
 
-  ${webappDir}
+  ${webappTgtDir}
   bower
   
 --allow-root
@@ -150,7 +177,7 @@
   exec
 
 
-  ${webappDir}
+  ${webappTgtDir}
   ember
   
 build
@@ -160,21 +187,6 @@
   
 
   
-  
-cleanup tmp
-generate-sources
-
-  exec
-
-
-  ${webappDir}
-  rm
-  
--rf
-tmp
-  
-
-  
 
   
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8222307c/hadoop-yarn-project/hadoop-yarn/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/pom.xml
index 147bd9a..03404f1 100644
--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
@@ -230,7 +230,6 @@
   
 
   
-hadoop-yarn-ui
 hadoop-yarn-api
 hadoop-yarn-common
 hadoop-yarn-server
@@ -238,5 +237,6 @@
 hadoop-yarn-site
 hadoop-yarn-client
 hadoop-yarn-registry
+hadoop-yarn-ui
   
 


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[07/50] [abbrv] hadoop git commit: Updating pom to be 2.9.0-SNAPSHOT instead of 3.0

[varunsaxena]

Updating pom to be 2.9.0-SNAPSHOT instead of 3.0


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1510fea0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1510fea0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1510fea0

Branch: refs/heads/YARN-3368_branch2
Commit: 1510fea0622f90ae4b7c288d661e6f2520bec72b
Parents: 62aedbf
Author: vrushali 
Authored: Wed Sep 6 21:59:10 2017 -0700
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1510fea0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 2933a76..7dcc42e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -20,12 +20,12 @@
   
 hadoop-yarn
 org.apache.hadoop
-3.0.0-alpha2-SNAPSHOT
+2.9.0-SNAPSHOT
   
   4.0.0
   org.apache.hadoop
   hadoop-yarn-ui
-  3.0.0-alpha2-SNAPSHOT
+  2.9.0-SNAPSHOT
   Apache Hadoop YARN UI
   ${packaging.type}
 


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[19/50] [abbrv] hadoop git commit: YARN-6402. Move 'Long Running Services' to an independent tab at top level for new Yarn UI. Contributed by Akhil PB.

[varunsaxena]

YARN-6402. Move 'Long Running Services' to an independent tab at top level for 
new Yarn UI. Contributed by Akhil PB.


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

Branch: refs/heads/YARN-3368_branch2
Commit: c069f4f9371967fd3aac25ab0af5afc29d940e38
Parents: bef6b2f
Author: Sunil G 
Authored: Thu Apr 20 12:33:53 2017 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../src/main/webapp/app/adapters/yarn-app.js|   2 +-
 .../webapp/app/components/em-table-html-cell.js |  23 ++
 .../main/webapp/app/components/timeline-view.js |  13 +-
 .../webapp/app/controllers/app-table-columns.js | 213 ---
 .../webapp/app/controllers/yarn-app-attempt.js  |  32 ++-
 .../webapp/app/controllers/yarn-app-attempts.js |  23 +-
 .../src/main/webapp/app/controllers/yarn-app.js |  21 +-
 .../webapp/app/controllers/yarn-apps/apps.js|   3 -
 .../app/controllers/yarn-apps/services.js   |   3 -
 .../webapp/app/controllers/yarn-services.js |  79 ++-
 .../src/main/webapp/app/models/yarn-app.js  |   6 +-
 .../src/main/webapp/app/router.js   |   1 +
 .../src/main/webapp/app/routes/yarn-services.js |  34 +++
 .../src/main/webapp/app/styles/app.css  |   9 +
 .../main/webapp/app/templates/application.hbs   |  13 +-
 .../templates/components/app-attempt-table.hbs  |   8 +-
 .../templates/components/container-table.hbs|   2 +-
 .../templates/components/em-table-html-cell.hbs |  23 ++
 .../app/templates/components/timeline-view.hbs  |   8 +-
 .../webapp/app/templates/yarn-app-attempts.hbs  |   8 +-
 .../src/main/webapp/app/templates/yarn-app.hbs  |  12 +-
 .../src/main/webapp/app/templates/yarn-apps.hbs |   4 -
 .../main/webapp/app/templates/yarn-services.hbs |  86 
 .../src/main/webapp/app/utils/converter.js  |  24 +++
 .../components/em-table-html-cell-test.js   |  43 
 .../tests/unit/routes/yarn-services-test.js |  29 +++
 26 files changed, 594 insertions(+), 128 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
index fc52f7c..111e468 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
@@ -23,7 +23,7 @@ export default AbstractAdapter.extend({
   restNameSpace: "cluster",
   serverName: "RM",
 
-  urlForQuery(query/*, modelName*/) {
+  urlForQuery(/*query, modelName*/) {
 var url = this._buildURL();
 url = url + '/apps';
 return url;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
new file mode 100644
index 000..56fc68a
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  content: null
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c069f4f9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js

[05/50] [abbrv] hadoop git commit: YARN-5504. [YARN-3368] Fix YARN UI build pom.xml (Sreenath Somarajapuram via Sunil G)

[varunsaxena]

YARN-5504. [YARN-3368] Fix YARN UI build pom.xml (Sreenath Somarajapuram via 
Sunil G)


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

Branch: refs/heads/YARN-3368_branch2
Commit: ade1dd96b562ddb75c4f432bd2ba8828844f2995
Parents: 1510fea
Author: sunilg 
Authored: Thu Aug 25 23:21:29 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../hadoop-yarn/hadoop-yarn-ui/pom.xml  | 59 +---
 .../src/main/webapp/ember-cli-build.js  |  2 +-
 .../hadoop-yarn-ui/src/main/webapp/package.json |  3 +-
 3 files changed, 17 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ade1dd96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 7dcc42e..8162bdd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -35,7 +35,7 @@
 node
 v0.12.2
 2.10.0
-false
+false
   
 
   
@@ -60,19 +60,20 @@
   
 
   
- maven-clean-plugin
- 3.0.0
- 
-false
-
-   
-  
${basedir}/src/main/webapp/bower_components
-   
-   
-  
${basedir}/src/main/webapp/node_modules
-   
-
- 
+maven-clean-plugin
+3.0.0
+
+  ${keep-ui-build-cache}
+  false
+  
+
+  
${basedir}/src/main/webapp/bower_components
+
+
+  ${basedir}/src/main/webapp/node_modules
+
+  
+
   
 
   
@@ -126,21 +127,6 @@
 
   
   
-generate-sources
-bower --allow-root install
-
-  exec
-
-
-  ${webappDir}
-  bower
-  
---allow-root
-install
-  
-
-  
-  
 ember build
 generate-sources
 
@@ -158,21 +144,6 @@
 
   
   
-ember test
-generate-resources
-
-  exec
-
-
-  ${skipTests}
-  ${webappDir}
-  ember
-  
-test
-  
-
-  
-  
 cleanup tmp
 generate-sources
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ade1dd96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
index d21cc3e..7736c75 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
@@ -22,7 +22,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = function(defaults) {
   var app = new EmberApp(defaults, {
-// Add options here
+hinting: false
   });
 
   
app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ade1dd96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index baa473a..6a4eb16 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
@@ -9,8 +9,7 @@
   },
   "scripts": {
 "build": "ember build",
-"start": "ember server",
-"test": "ember test"
+"start": "ember server"
   },
   "repository": "",
   "engines": {


-
To unsubscribe, 

[09/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix ASF warnings. (Wangda Tan via Sunil G)

[varunsaxena]

YARN-4849. Addendum patch to fix ASF warnings. (Wangda Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/542f661c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/542f661c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/542f661c

Branch: refs/heads/YARN-3368_branch2
Commit: 542f661cc1dfd210cac5818e3cc96c1af34beb02
Parents: dd8ad34
Author: sunilg 
Authored: Wed Aug 31 23:43:02 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../assets/images/datatables/Sorting icons.psd | Bin 27490 -> 0 bytes
 .../public/assets/images/datatables/favicon.ico| Bin 894 -> 0 bytes
 .../public/assets/images/datatables/sort_asc.png   | Bin 160 -> 0 bytes
 .../assets/images/datatables/sort_asc_disabled.png | Bin 148 -> 0 bytes
 .../public/assets/images/datatables/sort_both.png  | Bin 201 -> 0 bytes
 .../public/assets/images/datatables/sort_desc.png  | Bin 158 -> 0 bytes
 .../images/datatables/sort_desc_disabled.png   | Bin 146 -> 0 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/Sorting
 icons.psd
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/Sorting
 icons.psd 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/Sorting
 icons.psd
deleted file mode 100644
index 53b2e06..000
Binary files 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/Sorting
 icons.psd and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/favicon.ico
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/favicon.ico
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/favicon.ico
deleted file mode 100644
index 6eeaa2a..000
Binary files 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/favicon.ico
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc.png
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc.png
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc.png
deleted file mode 100644
index e1ba61a..000
Binary files 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc_disabled.png
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc_disabled.png
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc_disabled.png
deleted file mode 100644
index fb11dfe..000
Binary files 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_asc_disabled.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_both.png
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_both.png
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_both.png
deleted file mode 100644
index af5bc7c..000
Binary files 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_both.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hadoop/blob/542f661c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc.png
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc.png
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc.png
deleted file mode 100644
index 0e156de..000
Binary files 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/public/assets/images/datatables/sort_desc.png
 and /dev/null 

[13/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to remove unwanted files from rat exclusions. (Wangda Tan via Sunil G)

[varunsaxena]

YARN-4849. Addendum patch to remove unwanted files from rat exclusions. (Wangda 
Tan via Sunil G)


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

Branch: refs/heads/YARN-3368_branch2
Commit: f1de967c6731d7a697c97040d55fdc7ed1cc2d76
Parents: c0c124c
Author: sunilg 
Authored: Fri Oct 14 18:23:04 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../hadoop-yarn/hadoop-yarn-ui/pom.xml  | 14 
 .../src/main/webapp/.editorconfig   | 34 
 2 files changed, 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1de967c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index e59e9bf..54bfe3f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -46,32 +46,18 @@
 apache-rat-plugin
 
   
-src/main/webapp/node_modules/**/*
-src/main/webapp/bower_components/**/*
 src/main/webapp/jsconfig.json
 src/main/webapp/bower.json
 src/main/webapp/package.json
 src/main/webapp/testem.json
-
-src/main/webapp/dist/**/*
-src/main/webapp/tmp/**/*
 src/main/webapp/public/assets/images/**/*
 src/main/webapp/public/assets/images/*
 src/main/webapp/public/robots.txt
-
-public/assets/images/**/*
 public/crossdomain.xml
-
-src/main/webapp/.tmp/**/*
 src/main/webapp/.bowerrc
-src/main/webapp/.editorconfig
 src/main/webapp/.ember-cli
-src/main/webapp/.gitignore
 src/main/webapp/.jshintrc
-src/main/webapp/.travis.yml
 src/main/webapp/.watchmanconfig
-src/main/webapp/tests/.jshintrc
-src/main/webapp/blueprints/.jshintrc
   
 
   

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1de967c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
deleted file mode 100644
index 47c5438..000
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.js]
-indent_style = space
-indent_size = 2
-
-[*.hbs]
-insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[23/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to improve pom for yarn-ui. (Wangda Tan via Sunil G)

[varunsaxena]

YARN-4849. Addendum patch to improve pom for yarn-ui. (Wangda Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/011402e3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/011402e3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/011402e3

Branch: refs/heads/YARN-3368_branch2
Commit: 011402e304499a56fc8bd0905fa2742956e0f5ca
Parents: 4fba66c
Author: sunilg 
Authored: Fri Nov 4 20:24:43 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:48 2017 +0530

--
 .../hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md| 4 
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/011402e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index e7853bf..609ebe1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -18,6 +18,10 @@
 Hadoop: YARN-UI V2
 =
 
+Prerequisites
+-
+Please make sure Hadoop is built by passing -Pyarn-ui to Maven (reference to 
BUILDING.txt for more details)
+
 Configurations
 -
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/011402e3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 54bfe3f..5f6eda9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -30,7 +30,7 @@
   ${packaging.type}
 
   
-war
+pom
 ${basedir}/target/src/main/webapp
 node
 v0.12.2


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[06/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix license. (Wangda Tan via Sunil G)

[varunsaxena]

YARN-4849. Addendum patch to fix license. (Wangda Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/62aedbf4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/62aedbf4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/62aedbf4

Branch: refs/heads/YARN-3368_branch2
Commit: 62aedbf416e942ac9b5209d2d4a4c18ba16429fe
Parents: 4833621
Author: sunilg 
Authored: Wed Aug 24 16:28:34 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 LICENSE.txt | 84 ++--
 1 file changed, 51 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/62aedbf4/LICENSE.txt
--
diff --git a/LICENSE.txt b/LICENSE.txt
index 8f418af..04d2daa 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -2315,35 +2315,53 @@ jamon-runtime 2.3.1
  Your choice of the MPL or the alternative licenses, if any, specified
  by the Initial Developer in the file described in Exhibit A.
 
-For Apache Hadoop YARN Web UI component: 
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/
--
-The Apache Hadoop YARN Web UI component bundles the following files under the 
MIT License:
-
- - ember v2.2.0 (http://emberjs.com/) - Copyright (c) 2014 Yehuda Katz, Tom 
Dale and Ember.js contributors
- - ember-data v2.1.0 (https://github.com/emberjs/data) - Copyright (C) 
2011-2014 Tilde, Inc. and contributors, Portions Copyright (C) 2011 
LivingSocial Inc.
- - ember-resolver v2.0.3 (https://github.com/ember-cli/ember-resolver) - 
Copyright (c) 2013 Stefan Penner and Ember App Kit Contributors
- - bootstrap v3.3.6 (http://getbootstrap.com) - Copyright (c) 2011-2014 
Twitter, Inc
- - jquery v2.1.4 (http://jquery.org) - Copyright 2005, 2014 jQuery Foundation 
and other contributors
- - jquery-ui v1.11.4 (http://jqueryui.com/) - Copyright 2014 jQuery Foundation 
and other contributors
- - datatables v1.10.8 (https://datatables.net/)
- - moment v2.10.6 (http://momentjs.com/) - Copyright (c) 2011-2015 Tim Wood, 
Iskren Chernev, Moment.js contributors
- - em-helpers v0.5.8 (https://github.com/sreenaths/em-helpers)
- - ember-array-contains-helper v1.0.2 
(https://github.com/bmeurant/ember-array-contains-helper)
- - ember-cli-app-version v0.5.8 
(https://github.com/EmberSherpa/ember-cli-app-version) - Authored by Taras 
Mankovski 
- - ember-cli-babel v5.1.6 (https://github.com/babel/ember-cli-babel) - 
Authored by Stefan Penner 
- - ember-cli-content-security-policy v0.4.0 
(https://github.com/rwjblue/ember-cli-content-security-policy)
- - ember-cli-dependency-checker v1.2.0 
(https://github.com/quaertym/ember-cli-dependency-checker) - Authored by Emre 
Unal
- - ember-cli-htmlbars v1.0.2 (https://github.com/ember-cli/ember-cli-htmlbars) 
- Authored by Robert Jackson 
- - ember-cli-htmlbars-inline-precompile v0.3.1 
(https://github.com/pangratz/ember-cli-htmlbars-inline-precompile) - Authored 
by Clemens Müller 
- - ember-cli-ic-ajax v0.2.1 (https://github.com/rwjblue/ember-cli-ic-ajax) - 
Authored by Robert Jackson 
- - ember-cli-inject-live-reload v1.4.0 
(https://github.com/rwjblue/ember-cli-inject-live-reload) - Authored by Robert 
Jackson 
- - ember-cli-qunit v1.2.1 (https://github.com/ember-cli/ember-cli-qunit) - 
Authored by Robert Jackson 
- - ember-cli-release v0.2.8 (https://github.com/lytics/ember-cli-release) - 
Authored by Robert Jackson 
- - ember-cli-sri v1.2.1 (https://github.com/jonathanKingston/ember-cli-sri) - 
Authored by Jonathan Kingston
- - ember-cli-uglify v1.2.0 (github.com/ember-cli/ember-cli-uglify) - Authored 
by Robert Jackson 
- - ember-d3 v0.1.0 (https://github.com/brzpegasus/ember-d3) - Authored by 
Estelle DeBlois
- - ember-truth-helpers v1.2.0 
(https://github.com/jmurphyau/ember-truth-helpers)
- - select2 v4.0.0 (https://select2.github.io/)
+The binary distribution of this product bundles these dependencies under the
+following license:
+bootstrap v3.3.6
+broccoli-asset-rev v2.4.2
+broccoli-funnel v1.0.1
+datatables v1.10.8
+em-helpers v0.5.13
+em-table v0.1.6
+ember v2.2.0
+ember-array-contains-helper v1.0.2
+ember-bootstrap v0.5.1
+ember-cli v1.13.13
+ember-cli-app-version v1.0.0
+ember-cli-babel v5.1.6
+ember-cli-content-security-policy v0.4.0
+ember-cli-dependency-checker v1.2.0
+ember-cli-htmlbars v1.0.2
+ember-cli-htmlbars-inline-precompile v0.3.1
+ember-cli-ic-ajax v0.2.1
+ember-cli-inject-live-reload v1.4.0
+ember-cli-jquery-ui v0.0.20
+ember-cli-qunit 

[08/50] [abbrv] hadoop git commit: YARN-5583. [YARN-3368] Fix wrong paths in .gitignore (Sreenath Somarajapuram via Sunil G)

[varunsaxena]

YARN-5583. [YARN-3368] Fix wrong paths in .gitignore (Sreenath Somarajapuram 
via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9e609b80
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9e609b80
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9e609b80

Branch: refs/heads/YARN-3368_branch2
Commit: 9e609b805bc3e8a8ba24d688fe3755d41e253d61
Parents: ade1dd9
Author: sunilg 
Authored: Tue Aug 30 20:27:59 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e609b80/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 66f7a1f..fb67e69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,8 +37,8 @@ 
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.sass-cache
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/connect.lock
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/coverage/*
 
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/libpeerconnection.log
-hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webappnpm-debug.log
-hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapptestem.log
+hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/npm-debug.log
+hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/testem.log
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/dist
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/tmp
 yarnregistry.pdf


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[04/50] [abbrv] hadoop git commit: YARN-5598. [YARN-3368] Fix create-release to be able to generate bits for the new yarn-ui (Wangda Tan via Sunil G)

[varunsaxena]

YARN-5598. [YARN-3368] Fix create-release to be able to generate bits for the 
new yarn-ui (Wangda Tan via Sunil G)


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

Branch: refs/heads/YARN-3368_branch2
Commit: b428cf8985d727d6e4eb893272471294634aa7a9
Parents: 542f661
Author: sunilg 
Authored: Tue Sep 6 23:15:59 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 dev-support/bin/create-release |   2 +-
 dev-support/create-release.sh  | 144 
 dev-support/docker/Dockerfile  |   6 +-
 3 files changed, 6 insertions(+), 146 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b428cf89/dev-support/bin/create-release
--
diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release
index 8b138e5..39c9133 100755
--- a/dev-support/bin/create-release
+++ b/dev-support/bin/create-release
@@ -541,7 +541,7 @@ function makearelease
   # shellcheck disable=SC2046
   run_and_redirect "${LOGDIR}/mvn_install.log" \
 "${MVN}" "${MVN_ARGS[@]}" install \
-  -Pdist,src \
+  -Pdist,src,yarn-ui \
   "${signflags[@]}" \
   -DskipTests -Dtar $(hadoop_native_flags)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b428cf89/dev-support/create-release.sh
--
diff --git a/dev-support/create-release.sh b/dev-support/create-release.sh
deleted file mode 100755
index 792a805..000
--- a/dev-support/create-release.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Function to probe the exit code of the script commands, 
-# and stop in the case of failure with an contextual error 
-# message.
-run() {
-  echo "\$ ${@}"
-  "${@}"
-  exitCode=$?
-  if [[ $exitCode != 0 ]]; then
-echo
-echo "Failed! running ${@} in `pwd`"
-echo
-exit $exitCode
-  fi
-}
-
-doMD5() {
-  MD5CMD="md5sum"
-  which $MD5CMD
-  if [[ $? != 0 ]]; then
-MD5CMD="md5"
-  fi
-  run $MD5CMD ${1} > ${1}.md5
-}
-
-# If provided, the created release artifacts will be tagged with it 
-# (use RC#, i.e: RC0). Do not use a label to create the final release 
-# artifact.
-RC_LABEL=$1
-
-# Extract Hadoop version from POM
-HADOOP_VERSION=`cat pom.xml | grep "" | head -1 | sed 's|^ 
*||' | sed 's|.*$||'`
-
-# Setup git
-GIT=${GIT:-git}
-
-echo
-echo "*"
-echo
-echo "Hadoop version to create release artifacts: ${HADOOP_VERSION}"
-echo 
-echo "Release Candidate Label: ${RC_LABEL}"
-echo
-echo "*"
-echo
-
-if [[ ! -z ${RC_LABEL} ]]; then
-  RC_LABEL="-${RC_LABEL}"
-fi
-
-# Get Maven command
-if [ -z "$MAVEN_HOME" ]; then
-  MVN=mvn
-else
-  MVN=$MAVEN_HOME/bin/mvn
-fi
-
-ARTIFACTS_DIR="target/artifacts"
-
-# git clean to clear any remnants from previous build
-run ${GIT} clean -xdf
-
-# mvn clean for sanity
-run ${MVN} clean
-
-# Create staging dir for release artifacts
-run mkdir -p ${ARTIFACTS_DIR}
-
-# Create RAT report
-run ${MVN} apache-rat:check
-
-# Create SRC and BIN tarballs for release,
-# Using 'install’ goal instead of 'package' so artifacts are available 
-# in the Maven local cache for the site generation
-run ${MVN} install -Pdist,src,native,yarn-ui -DskipTests -Dtar
-
-# Create site for release
-run ${MVN} site site:stage -Pdist -Psrc
-run mkdir -p target/staging/hadoop-project/hadoop-project-dist/hadoop-yarn
-run mkdir -p target/staging/hadoop-project/hadoop-project-dist/hadoop-mapreduce
-run cp ./hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html 
target/staging/hadoop-project/hadoop-project-dist/hadoop-common/
-run cp ./hadoop-common-project/hadoop-common/CHANGES.txt 

[12/50] [abbrv] hadoop git commit: YARN-5779. [YARN-3368] Document limits/notes of the new YARN UI (Wangda Tan via Sunil G)

[varunsaxena]

YARN-5779. [YARN-3368] Document limits/notes of the new YARN UI (Wangda Tan via 
Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/43f0627a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/43f0627a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/43f0627a

Branch: refs/heads/YARN-3368_branch2
Commit: 43f0627a8e185a89a6c7a24f8d181637db7845ba
Parents: 29fc43e
Author: sunilg 
Authored: Wed Oct 26 21:58:30 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/43f0627a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index f646d3d..9f82031 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -41,3 +41,8 @@ origin (CORS) support.
 Use it
 -
 Open your browser, go to `rm-address:8088/ui2` and try it!
+
+Notes
+-
+
+- This UI framework is not verified under security environment, please use 
with caution under security environment.


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[01/50] [abbrv] hadoop git commit: YARN-5500. [YARN-3368] ‘Master node' link under application tab is broken. (Akhil P B Tan via Sunil G)

[varunsaxena]

Repository: hadoop
Updated Branches:
  refs/heads/YARN-3368_branch2 [created] 3a5f1a6c2


YARN-5500. [YARN-3368]  ‘Master node' link under application tab is broken. 
(Akhil P B Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/94c53e79
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/94c53e79
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/94c53e79

Branch: refs/heads/YARN-3368_branch2
Commit: 94c53e7985fffd68bad056275447028c3d53f5dc
Parents: addc399
Author: sunilg 
Authored: Thu Oct 27 14:19:44 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 .../src/main/webapp/app/controllers/yarn-app.js | 9 -
 .../src/main/webapp/app/templates/yarn-app.hbs  | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/94c53e79/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
index f6b9404..309c895 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
@@ -33,6 +33,13 @@ export default Ember.Controller.extend({
   routeName: 'yarn-app',
   model: appId
 }];
-  })
+  }),
 
+  amHostHttpAddressFormatted: function() {
+var amHostAddress = this.get('model.app.amHostHttpAddress');
+if (amHostAddress.indexOf('http://') < 0) {
+  amHostAddress = 'http://' + amHostAddress;
+}
+return amHostAddress;
+  }.property('model.app.amHostHttpAddress')
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/94c53e79/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
index 9e92fc1..acf00d1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
@@ -172,8 +172,8 @@
 
   
   
-Link
-Link
+Link
+Link
 {{model.app.amNodeLabelExpression}}
   
   


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[02/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix document. (Wangda Tan via Sunil G)

[varunsaxena]

YARN-4849. Addendum patch to fix document. (Wangda Tan via Sunil G)


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

Branch: refs/heads/YARN-3368_branch2
Commit: 48336218d4fddfb388ca0b60d3147ef1bafc2170
Parents: a4021c9
Author: sunilg 
Authored: Wed Aug 24 16:10:19 2016 +0530
Committer: Varun Saxena 
Committed: Wed Oct 18 02:06:47 2017 +0530

--
 BUILDING.txt|  2 +-
 .../src/site/markdown/YarnUI2.md| 36 +++-
 2 files changed, 21 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/48336218/BUILDING.txt
--
diff --git a/BUILDING.txt b/BUILDING.txt
index 527e5cf..bf6122b 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -130,7 +130,7 @@ Maven build goals:
   * Use -Psrc to create a project source TAR.GZ
   * Use -Dtar to create a TAR with the distribution (using -Pdist)
   * Use -Preleasedocs to include the changelog and release docs (requires 
Internet connectivity)
-  * Use -Pyarn-ui to build YARN UI v2. (Requires Internet connectivity, and it 
is for dev use only)
+  * Use -Pyarn-ui to build YARN UI v2. (Requires Internet connectivity)
 
  Snappy build options:
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/48336218/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index 575ebc7..ff48183 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -17,27 +17,31 @@
 
 Hadoop: YARN-UI V2
 =
-*This is a WIP project, nobody should use it in production.*
 
 Prerequisites
 -
 
-You will need the following things properly installed on your computer.
+If you run RM locally in your computer for test purpose, you need the 
following things properly installed.
 
-* Install Node.js with NPM: https://nodejs.org/download/
-* After Node.js installed, install bower: `npm install -g bower`.
-* Install Ember-cli: `npm install -g ember-cli`
+- Install Node.js with NPM: https://nodejs.org/download
+- After Node.js installed, install `corsproxy`: `npm install -g corsproxy`.
 
-BUILD
-
-* Please refer to BUILDING.txt in the top directory and pass -Pyarn-ui to 
build UI-related code
-* Execute `mvn test -Pyarn-ui` to run unit tests
 
-Try it
---
+Configurations
+-
+
+*In yarn-site.xml*
+
+| Configuration Property | Description |
+|: |: |
+| `yarn.resourcemanager.webapp.ui2.enable` | In the server side it indicates 
whether the new YARN-UI v2 is enabled or not. Defaults to `false`. |
+| `yarn.resourcemanager.webapp.ui2.address` | Specify the address of 
ResourceManager and port which host YARN-UI v2, defaults to `localhost:8288`. |
 
-* Packaging and deploying Hadoop in this branch
-* In 
`hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/config.js`, 
change `timelineWebUrl` and `rmWebUrl` to your YARN RM/Timeline server web 
address. 
-* If you are running YARN RM in your localhost, you should update 
`localBaseUrl` to `localhost:1337/`, install `npm install -g corsproxy` and run 
`corsproxy` to avoid CORS errors. More details: 
`https://www.npmjs.com/package/corsproxy`. 
-* Run `ember serve` under 
`hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/`
-* Visit your app at [http://localhost:4200](http://localhost:4200).
+*In $HADOOP_PREFIX/share/hadoop/yarn/webapps/rm/config/configs.env*
+
+- Update timelineWebAddress and rmWebAddress to the actual addresses run 
resource manager and timeline server
+- If you run RM locally in you computer just for test purpose, you need to 
keep `corsproxy` running. Otherwise, you need to set `localBaseAddress` to 
empty.
+
+Use it
+-
+Open your browser, go to `rm-address:8288` and try it!


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[hadoop] Git Push Summary

[varunsaxena]

Repository: hadoop
Updated Branches:
  refs/heads/YARN-5355_branch2 [deleted] 5e1584fc9

-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[45/50] [abbrv] hadoop git commit: YARN-6386. Show decommissioning nodes in new YARN UI. Contributed by Elek Marton.

[vrushali]

YARN-6386. Show decommissioning nodes in new YARN UI. Contributed by Elek 
Marton.


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

Branch: refs/heads/YARN-5355_branch2
Commit: e0644c5b337d92ebc9076be4881d94ad1ba1671b
Parents: 7c551c9
Author: Sunil G 
Authored: Tue Aug 29 16:51:14 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:40:02 2017 -0700

--
 .../main/webapp/app/models/cluster-metric.js|  9 --
 .../src/main/webapp/app/models/yarn-rm-node.js  |  2 +-
 .../webapp/app/templates/cluster-overview.hbs   | 33 ++--
 .../main/webapp/app/templates/yarn-nodes.hbs|  2 +-
 4 files changed, 26 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0644c5b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
index bc6e27a..dcc0c29 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
@@ -39,6 +39,7 @@ export default DS.Model.extend({
   totalNodes: DS.attr('number'),
   lostNodes: DS.attr('number'),
   unhealthyNodes: DS.attr('number'),
+  decommissioningNodes: DS.attr('number'),
   decommissionedNodes: DS.attr('number'),
   rebootedNodes: DS.attr('number'),
   activeNodes: DS.attr('number'),
@@ -87,11 +88,15 @@ export default DS.Model.extend({
   value: this.get("unhealthyNodes")
 });
 arr.push({
+  label: "Decommissioning",
+  value: this.get("decommissioningNodes")
+});
+arr.push({
   label: "Decomissioned",
   value: this.get("decommissionedNodes")
 });
 return arr;
-  }.property("activeNodes", "unhealthyNodes", "decommissionedNodes"),
+  }.property("activeNodes", "unhealthyNodes", "decommissioningNodes", 
"decommissionedNodes"),
 
   getMemoryDataForDonutChart: function() {
 var type = "MB";
@@ -130,4 +135,4 @@ export default DS.Model.extend({
 
 return arr;
   }.property("allocatedVirtualCores", "reservedVirtualCores", 
"availableVirtualCores"),
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0644c5b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
index 461bf00..6baeca2 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
@@ -53,7 +53,7 @@ export default DS.Model.extend({
   nodeStateStyle: function() {
 var style = "default";
 var nodeState = this.get("state");
-if (nodeState === "REBOOTED") {
+if (nodeState === "REBOOTED" || nodeState === "DECOMMISSIONING") {
   style = "warning";
 } else if (nodeState === "UNHEALTHY" || nodeState === "DECOMMISSIONED" ||
   nodeState === "LOST" || nodeState === "SHUTDOWN") {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0644c5b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
index ac8f20a..e549ce5 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
@@ -86,22 +86,6 @@
 
   
 
-
-
-  
-
-  Node Managers
-
-
-  {{donut-chart 
data=model.clusterMetrics.firstObject.getNodesDataForDonutChart
-  showLabels=true
-  parentId="nodes-donut-chart"
-  ratio=0.6
-  maxHeight=350
-  colorTargets="good error warn"}}
-
-  
-
   
 
   
@@ -142,6 +126,23 @@
   
 
   
+  
+
+  
+ 

[40/50] [abbrv] hadoop git commit: YARN-6458. Use yarn package manager to lock down dependency versions for new web UI. Contributed by Sreenath Somarajapuram.

[vrushali]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f8d6ad25/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
new file mode 100644
index 000..948feb9
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
@@ -0,0 +1,4983 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abbrev@1:
+  version "1.1.0"
+  resolved 
"https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f;
+
+abbrev@~1.0.7:
+  version "1.0.9"
+  resolved 
"https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135;
+
+accepts@~1.3.3:
+  version "1.3.3"
+  resolved 
"https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca;
+  dependencies:
+mime-types "~2.1.11"
+negotiator "0.6.1"
+
+acorn@^4.0.3:
+  version "4.0.11"
+  resolved 
"https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0;
+
+after@0.8.1:
+  version "0.8.1"
+  resolved 
"https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627;
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved 
"https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117;
+  dependencies:
+kind-of "^3.0.2"
+longest "^1.0.1"
+repeat-string "^1.5.2"
+
+alter@~0.2.0:
+  version "0.2.0"
+  resolved 
"https://registry.yarnpkg.com/alter/-/alter-0.2.0.tgz#c7588808617572034aae62480af26b1d4d1cb3cd;
+  dependencies:
+stable "~0.1.3"
+
+amd-name-resolver@0.0.2:
+  version "0.0.2"
+  resolved 
"https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.2.tgz#7bee4e112aabeecc2e14429c4ca750c55d8e5ecd;
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved 
"https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5;
+
+ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+  version "0.2.1"
+  resolved 
"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9;
+
+ansi-regex@^1.0.0:
+  version "1.1.1"
+  resolved 
"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d;
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved 
"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df;
+
+ansi-styles@^1.1.0:
+  version "1.1.0"
+  resolved 
"https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de;
+
+ansi-styles@^2.0.1, ansi-styles@^2.1.0, ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved 
"https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe;
+
+ansi-styles@~1.0.0:
+  version "1.0.0"
+  resolved 
"https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178;
+
+ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1:
+  version "0.3.1"
+  resolved 
"https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21;
+
+ansicolors@~0.2.1:
+  version "0.2.1"
+  resolved 
"https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef;
+
+ansicolors@~0.3.2:
+  version "0.3.2"
+  resolved 
"https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979;
+
+ansistyles@~0.1.3:
+  version "0.1.3"
+  resolved 
"https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539;
+
+anymatch@^1.3.0:
+  version "1.3.0"
+  resolved 
"https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507;
+  dependencies:
+arrify "^1.0.0"
+micromatch "^2.1.5"
+
+archy@~1.0.0:
+  version "1.0.0"
+  resolved 
"https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40;
+
+are-we-there-yet@~1.0.0:
+  version "1.0.6"
+  resolved 
"https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c;
+  dependencies:
+delegates "^1.0.0"
+readable-stream "^2.0.0 || ^1.1.13"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved 
"https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d;
+  dependencies:
+delegates "^1.0.0"
+readable-stream "^2.0.6"
+
+argparse@^1.0.7, argparse@~1.0.2:
+  version "1.0.9"
+  resolved 
"https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86;
+  dependencies:
+sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  

[48/50] [abbrv] hadoop git commit: YARN-7022. Improve click interaction in queue topology in new YARN UI. Contributed by Abdullah Yousufi.

[vrushali]

YARN-7022. Improve click interaction in queue topology in new YARN UI. 
Contributed by Abdullah Yousufi.


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

Branch: refs/heads/YARN-5355_branch2
Commit: afeeaa6149ed09dc9b5c4a35e1d260e63060d8de
Parents: c27e76d
Author: Sunil G 
Authored: Tue Sep 5 08:06:43 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:40:04 2017 -0700

--
 .../src/main/webapp/app/components/tree-selector.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/afeeaa61/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
index 1a81a32..6788582 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
@@ -129,7 +129,7 @@ export default Ember.Component.extend({
 var nodeEnter = node.enter().append("g")
   .attr("class", "node")
   .attr("transform", function() { return "translate(" + source.y0 + "," + 
source.x0 + ")"; })
-  .on("mouseover", function(d){
+  .on("click", function(d){
 if (d.queueData.get("name") !== this.get("selected")) {
 document.location.href = "#/yarn-queues/" + 
d.queueData.get("name") + "!";
 }
@@ -145,7 +145,7 @@ export default Ember.Component.extend({
 }, 100);
 
   }.bind(this))
-.on("click", function (d) {
+.on("dblclick", function (d) {
   document.location.href = "#/yarn-queue/" + d.queueData.get("name") + 
"/info";
 });
 


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[38/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from ATS v2 in new web UI. Contributed by Akhil PB.

[vrushali]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba3c2cd2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
new file mode 100644
index 000..1095cfe
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+  cluster: DS.attr('string'),
+  flowName: DS.attr('string'),
+  lastExecDate: DS.attr('string'),
+  user: DS.attr('string'),
+  flowruns: DS.attr('string'),
+  uid: DS.attr('string')
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba3c2cd2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
new file mode 100644
index 000..8d9fca3
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import DS from 'ember-data';
+import Converter from 'yarn-ui/utils/converter';
+
+export default DS.Model.extend({
+  flowName: DS.attr('string'),
+  runid: DS.attr('string'),
+  shownid: DS.attr('string'),
+  type: DS.attr('string'),
+  createTime: DS.attr('string'),
+  createTimeRaw: DS.attr(),
+  endTime: DS.attr('string'),
+  endTimeRaw: DS.attr(),
+  user: DS.attr('string'),
+  uid: DS.attr('string'),
+  cpuVCores: DS.attr('number'),
+  memoryUsed: DS.attr('number'),
+
+  runDurationTs: function() {
+var duration = this.get('endTimeRaw') - this.get('createTimeRaw');
+if (duration <= 0) {
+  duration = Date.now() - this.get('createTimeRaw');
+}
+return duration;
+  }.property('createTimeRaw', 'endTimeRaw'),
+
+  getElapsedTimeVizDataForBarChart: function() {
+return {
+  label: this.get('runid'),
+  value: this.get('runDurationTs'),
+  tooltip: this.get("shownid") + "" + 
Converter.msToElapsedTimeUnit(this.get('runDurationTs')),
+  flowrunUid: this.get('uid')
+};
+  },
+
+  getCpuVCoresVizDataForBarChart: function() {
+return {
+  label: this.get('runid'),
+  value: this.get('cpuVCores'),
+  tooltip: this.get("shownid") + "" + 'CPU VCores: ' + 
this.get('cpuVCores'),
+  flowrunUid: this.get('uid')
+};
+  },
+
+  getMemoryVizDataForBarChart: function() {
+return {
+  label: this.get('runid'),
+  value: this.get('memoryUsed'),
+  tooltip: this.get("shownid") + "" + 'Memory Used: ' + 
Converter.memoryBytesToMB(this.get('memoryUsed')),
+  flowrunUid: this.get('uid')
+};
+  }
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba3c2cd2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js
--
diff --git 

[37/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from ATS v2 in new web UI. Contributed by Akhil PB.

[vrushali]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba3c2cd2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
new file mode 100644
index 000..b700464
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
@@ -0,0 +1,53 @@
+{{!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--}}
+
+Flow Information
+
+  
+
+  
+
+  Flow Name
+  {{flowInfo.flowName}}
+
+
+  User
+  {{flowInfo.user}}
+
+
+  Flow ID
+  {{flowInfo.flowUid}}
+
+
+  First Run Started
+  {{flowInfo.firstRunStarted}}
+
+
+  Last Run Finished
+  {{flowInfo.lastRunFinished}}
+
+{{#if flowInfo.lastExecutionDate}}
+  
+Last Execution Date
+{{flowInfo.lastExecutionDate}}
+  
+{{/if}}
+  
+
+  
+

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba3c2cd2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
new file mode 100644
index 000..96d9e63
--- /dev/null
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
@@ -0,0 +1,131 @@
+{{!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--}}
+
+
+
+  {{#if (or (or elapsedTimeVizData.length cpuVCoresVizData.length) 
memoryVizData.length)}}
+  
+
+  Add Metrics Widget 
+
+
+  {{#if elapsedTimeVizData.length}}
+
+  
+
+  {{#if vizWidgets.runDuration}}
+
+  {{/if}}
+
+Flow Run Vs Run Duration
+  
+
+  {{/if}}
+  {{#if cpuVCoresVizData.length}}
+
+  
+
+  {{#if vizWidgets.cpuVcores}}
+
+  {{/if}}
+
+Flow Run Vs Cpu Vcores
+  
+
+  {{/if}}
+  {{#if memoryVizData.length}}
+
+  
+
+  {{#if vizWidgets.memoryUsed}}
+
+  {{/if}}
+
+Flow Run Vs Memory Used
+  
+
+  {{/if}}
+
+  
+  {{/if}}
+
+  Flow Runs
+  {{em-table columns=columns rows=model.flowRuns definition=tableDefinition}}
+
+  
+{{#if (and elapsedTimeVizData.length vizWidgets.runDuration)}}
+  
+
+  
+
+Flow Run Vs Run Duration
+{{simple-bar-chart
+  class="chart-panel"
+  data=elapsedTimeVizData
+  xAxisTickFormatter=flowrunIdFormatter
+  yAxisTickFormatter=elapsedTimeFormatter
+  xAxisText="Flow Run"
+  yAxisText="Run Duration"
+  onBarChartClickCallback=onBarChartClick
+}}
+  

[47/50] [abbrv] hadoop git commit: YARN-7071. Add vcores and number of containers in new YARN UI node heat map. Contributed by Abdullah Yousufi.

[vrushali]

YARN-7071. Add vcores and number of containers in new YARN UI node heat map. 
Contributed by Abdullah Yousufi.


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

Branch: refs/heads/YARN-5355_branch2
Commit: d89508feb5022d20b2b261249eaf27ca23e0a227
Parents: e0644c5
Author: Sunil G 
Authored: Fri Sep 1 20:46:39 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:40:03 2017 -0700

--
 .../main/webapp/app/components/nodes-heatmap.js | 62 ++--
 .../src/main/webapp/app/models/yarn-rm-node.js  |  4 +-
 .../app/templates/components/nodes-heatmap.hbs  |  3 +
 .../webapp/app/templates/yarn-nodes/heatmap.hbs |  2 +-
 4 files changed, 61 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d89508fe/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
index 3acc5de..a1df480 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
@@ -27,6 +27,10 @@ export default BaseChartComponent.extend({
   RACK_MARGIN: 20,
   filter: "",
   selectedCategory: 0,
+  memoryLabel: "Memory",
+  cpuLabel: "VCores",
+  containersLabel: "Containers",
+  totalContainers: 0,
 
   bindTP: function(element, cell) {
 element.on("mouseover", function() {
@@ -75,8 +79,7 @@ export default BaseChartComponent.extend({
   return true;
 }
 
-var usage = node.get("usedMemoryMB") /
-  (node.get("usedMemoryMB") + node.get("availMemoryMB"));
+var usage = this.calcUsage(node);
 var lowerLimit = (this.selectedCategory - 1) * 0.2;
 var upperLimit = this.selectedCategory * 0.2;
 if (lowerLimit <= usage && usage <= upperLimit) {
@@ -89,6 +92,7 @@ export default BaseChartComponent.extend({
   //[{label=label1, value=value1}, ...]
   //...
   renderCells: function (model, title) {
+var selectedOption = d3.select("select").property("value");
 var data = [];
 model.forEach(function (o) {
   data.push(o);
@@ -149,6 +153,7 @@ export default BaseChartComponent.extend({
 
 var chartXOffset = -1;
 
+this.totalContainers = 0;
 for (i = 0; i < racksArray.length; i++) {
   text = g.append("text")
 .text(racksArray[i])
@@ -166,6 +171,7 @@ export default BaseChartComponent.extend({
 var rack = data[j].get("rack");
 
 if (rack === racksArray[i]) {
+  this.totalContainers += data[j].get("numContainers");
   this.addNode(g, xOffset, yOffset, colorFunc, data[j]);
   xOffset += this.CELL_MARGIN + this.CELL_WIDTH;
   if (xOffset + this.CELL_MARGIN + this.CELL_WIDTH >= layout.x2 -
@@ -192,7 +198,7 @@ export default BaseChartComponent.extend({
 
 layout.y2 = yOffset + layout.margin;
 this.adjustMaxHeight(layout.y2);
-this.renderTitleAndBG(g, title, layout, false);
+this.renderTitleAndBG(g, title + selectedOption + ")" , layout, false);
   },
 
   addNode: function (g, xOffset, yOffset, colorFunc, data) {
@@ -200,10 +206,9 @@ export default BaseChartComponent.extend({
   .attr("y", yOffset)
   .attr("x", xOffset)
   .attr("height", this.CELL_HEIGHT)
-  .attr("fill", colorFunc(data.get("usedMemoryMB") /
-(data.get("usedMemoryMB") + data.get("availMemoryMB"
+  .attr("fill", colorFunc(this.calcUsage(data)))
   .attr("width", this.CELL_WIDTH)
-  .attr("tooltiptext", data.get("toolTipText"));
+  .attr("tooltiptext", data.get("toolTipText") + 
this.getToolTipText(data));
 
 if (this.isNodeSelected(data)) {
   rect.style("opacity", 0.8);
@@ -243,6 +248,18 @@ export default BaseChartComponent.extend({
   },
 
   didInsertElement: function () {
+var parentId = this.get("parentId");
+var self = this;
+var optionsData = [this.memoryLabel, this.cpuLabel, this.containersLabel];
+d3.select("#heatmap-select")
+  .on('change', function() {
+self.renderCells(self.get("model"), self.get("title"), 
self.get("textWidth"));
+  })
+  .selectAll('option')
+  .data(optionsData).enter()
+  .append('option')
+  .text(function (d) { return d; });
+
 this.draw();
   },
 
@@ -252,5 +269,38 @@ export default BaseChartComponent.extend({
   

[36/50] [abbrv] hadoop git commit: YARN-6635. Refactor yarn-app pages in new YARN UI. Contributed by Akhil PB.

[vrushali]

YARN-6635. Refactor yarn-app pages in new YARN UI. Contributed by Akhil PB.


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

Branch: refs/heads/YARN-5355_branch2
Commit: bb3892583f9ce0c986b62ad1694d7b53cac7f501
Parents: ba3c2cd
Author: Sunil G 
Authored: Tue May 30 13:52:40 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:40:00 2017 -0700

--
 .../webapp/app/controllers/app-table-columns.js |   4 +-
 .../webapp/app/controllers/yarn-app-attempt.js  |   8 +-
 .../webapp/app/controllers/yarn-app-attempts.js |  57 --
 .../src/main/webapp/app/controllers/yarn-app.js |  56 +++---
 .../webapp/app/controllers/yarn-app/attempts.js |  24 +++
 .../webapp/app/controllers/yarn-app/charts.js   |  28 +++
 .../webapp/app/controllers/yarn-app/info.js |  32 
 .../app/controllers/yarn-apps/services.js   |  31 
 .../webapp/app/controllers/yarn-flowrun/info.js |   2 +-
 .../src/main/webapp/app/router.js   |   8 +-
 .../main/webapp/app/routes/yarn-app-attempts.js |  35 
 .../src/main/webapp/app/routes/yarn-app.js  |  35 +---
 .../main/webapp/app/routes/yarn-app/attempts.js |  37 
 .../main/webapp/app/routes/yarn-app/charts.js   |  53 ++
 .../src/main/webapp/app/routes/yarn-app/info.js |  37 
 .../webapp/app/routes/yarn-apps/services.js |  33 
 .../main/webapp/app/templates/application.hbs   |   2 +-
 .../app/templates/components/app-table.hbs  |   6 +-
 .../webapp/app/templates/yarn-app-attempts.hbs  |  58 --
 .../src/main/webapp/app/templates/yarn-app.hbs  | 185 +--
 .../webapp/app/templates/yarn-app/attempts.hbs  |  29 +++
 .../webapp/app/templates/yarn-app/charts.hbs|  43 +
 .../main/webapp/app/templates/yarn-app/info.hbs | 167 +
 .../webapp/app/templates/yarn-app/loading.hbs   |  23 +++
 .../src/main/webapp/app/templates/yarn-apps.hbs |   5 +-
 .../webapp/app/templates/yarn-apps/services.hbs |  25 ---
 .../main/webapp/app/templates/yarn-services.hbs |   3 +-
 .../unit/controllers/yarn-app-attempts-test.js  |  30 ---
 .../unit/controllers/yarn-app/attempts-test.js  |  30 +++
 .../unit/controllers/yarn-app/charts-test.js|  30 +++
 .../unit/controllers/yarn-app/info-test.js  |  30 +++
 .../unit/controllers/yarn-apps/services-test.js |  30 ---
 .../tests/unit/routes/yarn-app-attempts-test.js |  29 ---
 .../tests/unit/routes/yarn-app/attempts-test.js |  29 +++
 .../tests/unit/routes/yarn-app/charts-test.js   |  29 +++
 .../tests/unit/routes/yarn-app/info-test.js |  29 +++
 36 files changed, 714 insertions(+), 578 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb389258/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
index 704abfb..8a34f1a 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
@@ -38,7 +38,7 @@ export default Ember.Controller.extend({
   getCellContent: function(row) {
 return {
   displayText: row.id,
-  href: `#/yarn-app/${row.id}`
+  href: `#/yarn-app/${row.id}/info`
 };
   }
   }, {
@@ -112,7 +112,7 @@ export default Ember.Controller.extend({
   getCellContent: function(row) {
 return {
   displayText: row.get('appName'),
-  href: `#/yarn-app/${row.id}?service=${row.get('appName')}`
+  href: `#/yarn-app/${row.id}/info?service=${row.get('appName')}`
 };
   }
 }, {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb389258/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
index fbe6fa9..1121a84 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
@@ -34,10 

[46/50] [abbrv] hadoop git commit: YARN-7075. Better styling for donut charts in new YARN UI. Contributed by Da Ding.

[vrushali]

YARN-7075. Better styling for donut charts in new YARN UI. Contributed by Da 
Ding.


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

Branch: refs/heads/YARN-5355_branch2
Commit: c27e76d55ffa4ae400078dbddd86c3d7b2bc39f0
Parents: d89508f
Author: Sunil G 
Authored: Sat Sep 2 08:08:59 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:40:03 2017 -0700

--
 .../main/webapp/app/components/donut-chart.js   |  5 +++-
 .../src/main/webapp/app/styles/app.css  | 24 ++--
 2 files changed, 26 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c27e76d5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index 82d2d46..b1e6ecf 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -53,7 +53,10 @@ export default BaseChartComponent.extend({
 
 // 50 is for title
 var outerRadius = (h - 50 - 2 * layout.margin) / 2;
-var innerRadius = outerRadius * 0.618;
+
+// Ratio of inner radius to outer radius
+var radiusRatio = 0.75;
+var innerRadius = outerRadius * radiusRatio;
 
 var arc = d3.svg.arc()
   .innerRadius(innerRadius)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c27e76d5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
index 8b8ea56..38e25e4 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.css
@@ -20,6 +20,8 @@ body, html, body > .ember-view {
   height: 100%;
   overflow: visible;
   color: @text-color;
+  background: #f6f6f8;
+  font-family: "Open Sans","Helvetica Neue", sans-serif!important;
 }
 body, html {
   min-width: 1024px;
@@ -29,11 +31,11 @@ body, html {
  Over all style
  */
 text {
-  font: 16px sans-serif;
+  font-size: 14px;
 }
 
 text.small {
-  font: 8px sans-serif;
+  font-size: 8px;
 }
 
 html, body
@@ -184,6 +186,7 @@ table.dataTable thead .sorting_desc_disabled {
 
 .breadcrumb {
   padding-bottom: 3px;
+  background-color: #f6f6f8;
 }
 
 .navbar-default .navbar-nav > li > a {
@@ -268,12 +271,29 @@ td {
   margin: 0 auto -40px; // Must be same as footer & footer-frame
 }
 
+.panel {
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 15px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+  overflow: hidden;
+}
+
 .panel-default .container-fluid {
   margin-top: -45px !important;
   margin-bottom: -10px !important;
 }
 
+.panel-default > .panel-heading {
+  background-image: none;
+  background-color: #f5f5f5 !important;
+  border-radius: 15px 15px 0px 0px;
+}
+
+
 .panel-heading {
+  background-color: rgba(0, 0, 0, 0) !important;
   font-weight: bold;
 }
 


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[44/50] [abbrv] hadoop git commit: YARN-5146. Support for Fair Scheduler in new YARN UI. Contributed by Abdullah Yousufi.

[vrushali]

YARN-5146. Support for Fair Scheduler in new YARN UI. Contributed by Abdullah 
Yousufi.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7c551c9e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7c551c9e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7c551c9e

Branch: refs/heads/YARN-5355_branch2
Commit: 7c551c9eef804831dc2e822b0a23f0f17b24792e
Parents: 874d223
Author: Sunil G 
Authored: Tue Aug 15 21:58:44 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:40:02 2017 -0700

--
 .../src/main/webapp/app/adapters/yarn-queue.js  |  30 -
 .../app/adapters/yarn-queue/capacity-queue.js   |  23 
 .../app/adapters/yarn-queue/fair-queue.js   |  23 
 .../app/adapters/yarn-queue/fifo-queue.js   |  23 
 .../app/adapters/yarn-queue/yarn-queue.js   |  30 +
 .../main/webapp/app/components/tree-selector.js |  19 ++-
 .../src/main/webapp/app/models/yarn-queue.js|  94 --
 .../app/models/yarn-queue/capacity-queue.js |  95 ++
 .../webapp/app/models/yarn-queue/fair-queue.js  |  79 
 .../webapp/app/models/yarn-queue/fifo-queue.js  |  52 
 .../webapp/app/models/yarn-queue/yarn-queue.js  |  23 
 .../main/webapp/app/routes/cluster-overview.js  |   4 +-
 .../src/main/webapp/app/routes/yarn-queue.js|  26 ++--
 .../src/main/webapp/app/routes/yarn-queues.js   |  12 +-
 .../main/webapp/app/routes/yarn-queues/index.js |  25 
 .../app/routes/yarn-queues/queues-selector.js   |  25 
 .../main/webapp/app/serializers/yarn-queue.js   | 129 ---
 .../serializers/yarn-queue/capacity-queue.js| 128 ++
 .../app/serializers/yarn-queue/fair-queue.js|  92 +
 .../app/serializers/yarn-queue/fifo-queue.js|  59 +
 .../app/serializers/yarn-queue/yarn-queue.js|  47 +++
 .../components/queue-configuration-table.hbs|  54 
 .../templates/components/queue-navigator.hbs|   7 +-
 .../yarn-queue/capacity-queue-conf-table.hbs|  54 
 .../yarn-queue/capacity-queue-info.hbs  |  84 
 .../components/yarn-queue/capacity-queue.hbs|  63 +
 .../yarn-queue/fair-queue-conf-table.hbs|  52 
 .../components/yarn-queue/fair-queue-info.hbs   |  66 ++
 .../components/yarn-queue/fair-queue.hbs|  63 +
 .../yarn-queue/fifo-queue-conf-table.hbs|  56 
 .../components/yarn-queue/fifo-queue-info.hbs   |  47 +++
 .../components/yarn-queue/fifo-queue.hbs|  48 +++
 .../webapp/app/templates/yarn-queue/info.hbs|  73 +--
 .../main/webapp/app/templates/yarn-queues.hbs   |  54 +---
 .../src/main/webapp/app/utils/color-utils.js|   1 -
 35 files changed, 1266 insertions(+), 494 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c551c9e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
deleted file mode 100644
index f2017df..000
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import AbstractAdapter from './abstract';
-
-export default AbstractAdapter.extend({
-  address: "rmWebAddress",
-  restNameSpace: "cluster",
-  serverName: "RM",
-
-  pathForType(/*modelName*/) {
-return 'scheduler'; // move to some common place, return path by modelname.
-  }
-
-});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c551c9e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js
--
diff 

[50/50] [abbrv] hadoop git commit: Fixing checktyle warnings during rebase

[vrushali]

Fixing checktyle warnings during rebase


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5e1584fc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5e1584fc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5e1584fc

Branch: refs/heads/YARN-5355_branch2
Commit: 5e1584fc938f282d18ccd4560d0e3a0f0118fb16
Parents: a12c8e1
Author: vrushali 
Authored: Tue Oct 17 11:39:20 2017 -0700
Committer: vrushali 
Committed: Tue Oct 17 11:40:05 2017 -0700

--
 .../hadoop/yarn/server/resourcemanager/ResourceManager.java| 3 ---
 .../hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js | 4 ++--
 .../src/main/webapp/app/components/donut-chart.js  | 6 +++---
 .../hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml  | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e1584fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 6c013c6..75c20d6 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -30,9 +30,7 @@ import org.apache.hadoop.metrics2.MetricsSystem;
 import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
 import org.apache.hadoop.metrics2.source.JvmMetrics;
 import org.apache.hadoop.http.HttpServer2;
-import org.apache.hadoop.http.lib.StaticUserWebFilter;
 import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.security.AuthenticationFilterInitializer;
 import org.apache.hadoop.security.Groups;
 import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -47,7 +45,6 @@ import org.apache.hadoop.util.ShutdownHookManager;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.curator.ZKCuratorManager;
 import org.apache.hadoop.util.VersionInfo;
-import org.apache.hadoop.util.ZKUtil;
 import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ApplicationId;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e1584fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
index 05d78eb..95245bf 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
@@ -20,7 +20,7 @@ import Ember from 'ember';
 import BaseChartComponent from 'yarn-ui/components/base-chart-component';
 
 export default BaseChartComponent.extend({
-  // data: 
+  // data:
   //[{label=label1, value=value1}, ...]
   //...
   renderBarChart: function(data, title, textWidth = 50) {
@@ -120,4 +120,4 @@ export default BaseChartComponent.extend({
 this.initChart();
 this.draw();
   }
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e1584fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index b1e6ecf..ce26811 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -25,7 +25,7 @@ export default BaseChartComponent.extend({
   /*
* data = [{label="xx", value=},{...}]
*/
-  renderDonutChart: function(data, title, showLabels = 

[18/50] [abbrv] hadoop git commit: YARN-5497. [YARN-3368] Use different color for Undefined and Succeeded for Final State in applications page. (Akhil P B Tan via Sunil G)

[vrushali]

YARN-5497. [YARN-3368] Use different color for Undefined and Succeeded for 
Final State in applications page. (Akhil P B Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/394da1e1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/394da1e1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/394da1e1

Branch: refs/heads/YARN-5355_branch2
Commit: 394da1e1fbb641530b4b01c61b0ea2cd85effca6
Parents: 1f2adfd
Author: sunilg 
Authored: Thu Oct 27 14:45:23 2016 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:51 2017 -0700

--
 .../hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/394da1e1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
index 0a5df87..8b5474f 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
@@ -86,14 +86,17 @@ export default DS.Model.extend({
   }.property("progress"),
 
   finalStatusStyle: function() {
-var style = "default";
 var finalStatus = this.get("finalStatus");
+var style = "";
+
 if (finalStatus == "KILLED") {
   style = "warning";
 } else if (finalStatus == "FAILED") {
   style = "danger";
-} else {
+} else if (finalStatus == "SUCCEEDED") {
   style = "success";
+} else {
+  style = "default";
 }
 
 return "label label-" + style;


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[39/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from ATS v2 in new web UI. Contributed by Akhil PB.

[vrushali]

YARN-5705. Show timeline data from ATS v2 in new web UI. Contributed by Akhil 
PB.


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

Branch: refs/heads/YARN-5355_branch2
Commit: ba3c2cd2b768603c6976c44073385794b42801f9
Parents: 63d2191
Author: Sunil G 
Authored: Sun May 21 18:09:13 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:40:00 2017 -0700

--
 .../webapp/app/adapters/yarn-app-attempt.js |   4 +-
 .../webapp/app/adapters/yarn-app-flowrun.js |  33 +++
 .../webapp/app/adapters/yarn-app-timeline.js|  35 +++
 .../main/webapp/app/adapters/yarn-container.js  |  18 +-
 .../src/main/webapp/app/adapters/yarn-entity.js |  35 +++
 .../webapp/app/adapters/yarn-flow-activity.js   |  30 +++
 .../webapp/app/adapters/yarn-flowrun-brief.js   |  32 +++
 .../main/webapp/app/adapters/yarn-flowrun.js|  38 +++
 .../app/adapters/yarn-timeline-appattempt.js|  41 +++
 .../app/adapters/yarn-timeline-container.js |  40 +++
 .../main/webapp/app/components/nodes-heatmap.js |  18 +-
 .../webapp/app/components/simple-bar-chart.js   | 206 +++
 .../webapp/app/components/sunburst-chart.js | 261 +++
 .../webapp/app/controllers/yarn-apps/apps.js|   1 -
 .../app/controllers/yarn-apps/services.js   |   1 -
 .../app/controllers/yarn-flow-activity.js   | 125 +
 .../main/webapp/app/controllers/yarn-flow.js|  36 +++
 .../webapp/app/controllers/yarn-flow/info.js|  66 +
 .../webapp/app/controllers/yarn-flow/runs.js| 178 +
 .../main/webapp/app/controllers/yarn-flowrun.js |  50 
 .../webapp/app/controllers/yarn-flowrun/info.js | 157 +++
 .../app/controllers/yarn-flowrun/metrics.js | 126 +
 .../webapp/app/controllers/yarn-services.js |  12 +-
 .../src/main/webapp/app/mixins/app-attempt.js   |  66 +
 .../main/webapp/app/models/yarn-app-attempt.js  |  11 +-
 .../main/webapp/app/models/yarn-app-flowrun.js  |  52 
 .../main/webapp/app/models/yarn-app-timeline.js | 105 
 .../main/webapp/app/models/yarn-container.js|   9 +-
 .../src/main/webapp/app/models/yarn-entity.js   |  26 ++
 .../webapp/app/models/yarn-flow-activity.js |  28 ++
 .../webapp/app/models/yarn-flowrun-brief.js |  70 +
 .../src/main/webapp/app/models/yarn-flowrun.js  |  32 +++
 .../app/models/yarn-timeline-appattempt.js  | 143 ++
 .../app/models/yarn-timeline-container.js   |  63 +
 .../src/main/webapp/app/router.js   |  12 +
 .../main/webapp/app/routes/timeline-error.js|  29 +++
 .../main/webapp/app/routes/yarn-app-attempt.js  |  32 +--
 .../main/webapp/app/routes/yarn-app-attempts.js |  13 +-
 .../src/main/webapp/app/routes/yarn-app.js  |  18 +-
 .../webapp/app/routes/yarn-flow-activity.js |  37 +++
 .../src/main/webapp/app/routes/yarn-flow.js |  53 
 .../main/webapp/app/routes/yarn-flow/info.js|  22 ++
 .../main/webapp/app/routes/yarn-flow/runs.js|  22 ++
 .../webapp/app/routes/yarn-flowrun-metric.js| 107 
 .../src/main/webapp/app/routes/yarn-flowrun.js  |  58 +
 .../main/webapp/app/routes/yarn-flowrun/info.js |  22 ++
 .../webapp/app/routes/yarn-flowrun/metrics.js   |  22 ++
 .../webapp/app/serializers/yarn-app-flowrun.js  |  64 +
 .../webapp/app/serializers/yarn-app-timeline.js |  76 ++
 .../src/main/webapp/app/serializers/yarn-app.js |   3 +-
 .../main/webapp/app/serializers/yarn-entity.js  |  51 
 .../app/serializers/yarn-flow-activity.js   |  54 
 .../app/serializers/yarn-flowrun-brief.js   |  64 +
 .../main/webapp/app/serializers/yarn-flowrun.js |  63 +
 .../main/webapp/app/serializers/yarn-queue.js   |  22 +-
 .../app/serializers/yarn-timeline-appattempt.js |  69 +
 .../app/serializers/yarn-timeline-container.js  |  71 +
 .../src/main/webapp/app/styles/app.css  |  83 ++
 .../main/webapp/app/templates/application.hbs   |   6 +-
 .../webapp/app/templates/timeline-error.hbs |  22 ++
 .../webapp/app/templates/yarn-app-attempt.hbs   |  46 ++--
 .../webapp/app/templates/yarn-app-attempts.hbs  |   7 +-
 .../src/main/webapp/app/templates/yarn-app.hbs  |  51 +---
 .../src/main/webapp/app/templates/yarn-apps.hbs |   4 +-
 .../webapp/app/templates/yarn-flow-activity.hbs |  45 
 .../src/main/webapp/app/templates/yarn-flow.hbs |  49 
 .../webapp/app/templates/yarn-flow/info.hbs |  53 
 .../webapp/app/templates/yarn-flow/runs.hbs | 131 ++
 .../app/templates/yarn-flowrun-metric.hbs   |  34 +++
 .../main/webapp/app/templates/yarn-flowrun.hbs  |  49 
 .../webapp/app/templates/yarn-flowrun/info.hbs  | 128 +
 

[33/50] [abbrv] hadoop git commit: YARN-5153. Add a toggle button to switch between timeline view / table view for containers and application-attempts in new YARN UI. Contributed by Akhil PB.

[vrushali]

YARN-5153. Add a toggle button to switch between timeline view / table view for 
containers and application-attempts in new YARN UI. Contributed by Akhil PB.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0c9356d2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0c9356d2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0c9356d2

Branch: refs/heads/YARN-5355_branch2
Commit: 0c9356d230b1a1e90d9df3346e67518c640c34e2
Parents: 72eb9fd
Author: Sunil G 
Authored: Mon Apr 10 13:35:08 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:58 2017 -0700

--
 .../webapp/app/components/app-attempt-table.js  |   7 -
 .../main/webapp/app/components/timeline-view.js | 199 ++-
 .../main/webapp/app/helpers/prepend-protocol.js |  29 +++
 .../templates/components/app-attempt-table.hbs  |  36 ++--
 .../templates/components/container-table.hbs|  22 +-
 .../app/templates/components/timeline-view.hbs  |  61 --
 .../tests/unit/helpers/prepend-protocol-test.js |  28 +++
 7 files changed, 331 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c9356d2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
index 3c43037..8828275 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
@@ -19,11 +19,4 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-  nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', 
function() {
-var nodeHttpAddress = this.get('attempt.nodeHttpAddress');
-if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) {
-  nodeHttpAddress = 'http://' + nodeHttpAddress;
-}
-return nodeHttpAddress;
-  })
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c9356d2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
index d730a43..4a33d5b 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
@@ -18,6 +18,7 @@
 
 import Ember from 'ember';
 import Converter from 'yarn-ui/utils/converter';
+import ColumnDef from 'em-table/utils/column-definition';
 
 export default Ember.Component.extend({
   canvas: {
@@ -31,6 +32,8 @@ export default Ember.Component.extend({
   modelArr: [],
   colors: d3.scale.category10().range(),
   _selected: undefined,
+  gridColumns: [],
+  gridRows: [],
 
   selected: function() {
 return this._selected;
@@ -276,5 +279,199 @@ export default Ember.Component.extend({
 if (this.modelArr.length > 0) {
   this.setSelected(this.modelArr[0]);
 }
+
+if (this.get('attemptModel')) {
+  this.setAttemptsGridColumnsAndRows();
+} else {
+  this.setContainersGridColumnsAndRows();
+}
+  },
+
+  setAttemptsGridColumnsAndRows: function() {
+var self = this;
+var columns = [];
+
+columns.push({
+  id: 'id',
+  headerTitle: 'Attempt ID',
+  contentPath: 'id',
+  cellComponentName: 'em-table-linked-cell',
+  minWidth: '300px',
+  getCellContent: function(row) {
+return {
+  displayText: row.get('id'),
+  routeName: 'yarn-app-attempt',
+  id: row.get('id')
+};
+  }
+}, {
+  id: 'attemptStartedTime',
+  headerTitle: 'Started Time',
+  contentPath: 'attemptStartedTime'
+}, {
+  id: 'finishedTime',
+  headerTitle: 'Finished Time',
+  contentPath: 'finishedTime',
+  getCellContent: function(row) {
+if (row.get('finishedTs')) {
+  return row.get('finishedTime');
+}
+return 'N/A';
+  }
+}, {
+  id: 'elapsedTime',
+  headerTitle: 'Elapsed Time',
+  contentPath: 'elapsedTime'
+}, {
+  id: 'appMasterContainerId',
+  headerTitle: 'AM Container ID',
+  contentPath: 'appMasterContainerId',
+  minWidth: '300px'
+}, {
+  id: 'amNodeId',
+  headerTitle: 'AM 

[35/50] [abbrv] hadoop git commit: YARN-6291. Introduce query parameters (sort, filter, etc.) for tables to keep state on refresh/navigation in new YARN UI. Contributed by Gergely Novák.

[vrushali]

YARN-6291. Introduce query parameters (sort, filter, etc.) for tables to keep 
state on refresh/navigation in new YARN UI. Contributed by Gergely Novák.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63d21913
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63d21913
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63d21913

Branch: refs/heads/YARN-5355_branch2
Commit: 63d21913d86e6a95df72ebaa6b4f2d064292e5c5
Parents: 0de57ec
Author: Sunil G 
Authored: Mon Apr 24 13:28:57 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:59 2017 -0700

--
 .../src/main/webapp/app/controllers/yarn-apps/apps.js | 10 ++
 .../src/main/webapp/app/controllers/yarn-apps/services.js | 10 ++
 .../src/main/webapp/app/controllers/yarn-nodes/table.js   |  8 
 .../src/main/webapp/app/templates/yarn-apps/apps.hbs  |  2 +-
 .../src/main/webapp/app/templates/yarn-apps/services.hbs  |  2 +-
 .../src/main/webapp/app/templates/yarn-nodes/table.hbs|  2 +-
 6 files changed, 31 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/63d21913/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
index 0b0be20..44a7c1c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
@@ -16,7 +16,17 @@
  * limitations under the License.
  */
 
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+import TableDefinition from 'em-table/utils/table-definition';
 import AppTableController from '../app-table-columns';
 
 export default AppTableController.extend({
+  queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 
'rowCount'],
+  tableDefinition: TableDefinition.create(),
+  searchText: Ember.computed.alias('tableDefinition.searchText'),
+  sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+  sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+  pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+  rowCount: Ember.computed.alias('tableDefinition.rowCount')
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/63d21913/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
index 0b0be20..44a7c1c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/services.js
@@ -16,7 +16,17 @@
  * limitations under the License.
  */
 
+import Ember from 'ember';
+import ColumnDef from 'em-table/utils/column-definition';
+import TableDefinition from 'em-table/utils/table-definition';
 import AppTableController from '../app-table-columns';
 
 export default AppTableController.extend({
+  queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 
'rowCount'],
+  tableDefinition: TableDefinition.create(),
+  searchText: Ember.computed.alias('tableDefinition.searchText'),
+  sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+  sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+  pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+  rowCount: Ember.computed.alias('tableDefinition.rowCount')
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/63d21913/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
index 3b7b0f6..3fae596 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
@@ -19,8 +19,16 @@
 
 import Ember from 'ember';
 import ColumnDef from 

[20/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to improve pom for yarn-ui. (Wangda Tan via Sunil G)

[vrushali]

YARN-4849. Addendum patch to improve pom for yarn-ui. (Wangda Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f545853
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f545853
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f545853

Branch: refs/heads/YARN-5355_branch2
Commit: 5f5458531292f276ff3b0f6d9fed2909c9b083b1
Parents: 232d7bb
Author: sunilg 
Authored: Fri Nov 4 20:24:43 2016 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:52 2017 -0700

--
 .../hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md| 4 
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f545853/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
index e7853bf..609ebe1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnUI2.md
@@ -18,6 +18,10 @@
 Hadoop: YARN-UI V2
 =
 
+Prerequisites
+-
+Please make sure Hadoop is built by passing -Pyarn-ui to Maven (reference to 
BUILDING.txt for more details)
+
 Configurations
 -
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f545853/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 54bfe3f..5f6eda9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -30,7 +30,7 @@
   ${packaging.type}
 
   
-war
+pom
 ${basedir}/target/src/main/webapp
 node
 v0.12.2


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[28/50] [abbrv] hadoop git commit: YARN-6184. Introduce loading icon in each page of new YARN UI. Contributed by Akhil PB.

[vrushali]

YARN-6184. Introduce loading icon in each page of new YARN UI. Contributed by 
Akhil PB.


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

Branch: refs/heads/YARN-5355_branch2
Commit: e66f956fab38c52a679f08a86181a05316bc2dc3
Parents: 478de67
Author: Sunil G 
Authored: Wed Feb 22 11:54:32 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:55 2017 -0700

--
 .../main/webapp/app/components/tree-selector.js |   8 +-
 .../webapp/app/controllers/yarn-queue-apps.js   |  46 --
 .../main/webapp/app/controllers/yarn-queue.js   |  17 +++-
 .../main/webapp/app/controllers/yarn-queues.js  |   1 +
 .../src/main/webapp/app/router.js   |   6 +-
 .../main/webapp/app/routes/cluster-overview.js  |   4 +-
 .../main/webapp/app/routes/yarn-app-attempt.js  |  12 +--
 .../src/main/webapp/app/routes/yarn-apps.js |   4 +-
 .../src/main/webapp/app/routes/yarn-node.js |   4 +-
 .../src/main/webapp/app/routes/yarn-nodes.js|   4 +-
 .../main/webapp/app/routes/yarn-queue-apps.js   |  42 --
 .../src/main/webapp/app/routes/yarn-queue.js|   3 +-
 .../main/webapp/app/routes/yarn-queue/apps.js   |  22 +
 .../main/webapp/app/routes/yarn-queue/info.js   |  22 +
 .../src/main/webapp/app/routes/yarn-queues.js   |  35 +++-
 .../src/main/webapp/app/styles/app.css  |   8 ++
 .../src/main/webapp/app/templates/loading.hbs   |  23 +
 .../webapp/app/templates/yarn-apps/loading.hbs  |  23 +
 .../webapp/app/templates/yarn-queue-apps.hbs|  64 --
 .../main/webapp/app/templates/yarn-queue.hbs|  69 ++-
 .../webapp/app/templates/yarn-queue/apps.hbs|  28 +++
 .../webapp/app/templates/yarn-queue/info.hbs|  84 +++
 .../main/webapp/app/templates/yarn-queues.hbs   |   8 +-
 .../webapp/public/assets/images/spinner.gif | Bin 0 -> 33076 bytes
 .../unit/controllers/yarn-queue-apps-test.js|  30 ---
 .../tests/unit/routes/yarn-queue-apps-test.js   |  29 ---
 .../tests/unit/routes/yarn-queue/apps-test.js   |  29 +++
 .../tests/unit/routes/yarn-queue/info-test.js   |  29 +++
 28 files changed, 347 insertions(+), 307 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e66f956f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
index c9e735d..3d72b2f 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
@@ -128,7 +128,7 @@ export default Ember.Component.extend({
   .attr("transform", function() { return "translate(" + source.y0 + "," + 
source.x0 + ")"; })
   .on("mouseover", function(d){
 if (d.queueData.get("name") !== this.get("selected")) {
-document.location.href = "#/yarn-queues/" + 
d.queueData.get("name");
+document.location.href = "#/yarn-queues/" + 
d.queueData.get("name") + "!";
 }
 
 Ember.run.later(this, function () {
@@ -143,7 +143,7 @@ export default Ember.Component.extend({
 
   }.bind(this))
 .on("click", function (d) {
-  document.location.href = "#/yarn-queue/" + d.queueData.get("name");
+  document.location.href = "#/yarn-queue/" + d.queueData.get("name") + 
"/info";
 });
 
 nodeEnter.append("circle")
@@ -190,7 +190,7 @@ export default Ember.Component.extend({
 
 nodeUpdate.select("circle")
   .attr("r", 30)
-  .attr("href", 
+  .attr("href",
 function(d) {
   return "#/yarn-queues/" + d.queueData.get("name");
 })
@@ -294,4 +294,4 @@ export default Ember.Component.extend({
   didInsertElement: function() {
this.reDraw();
   }
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e66f956f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue-apps.js
deleted file mode 100644
index e7bedd6..000
--- 

[29/50] [abbrv] hadoop git commit: YARN-6196. Improve Resource Donut chart with better label in Node page of new YARN UI. Contributed by Akhil PB.

[vrushali]

YARN-6196. Improve Resource Donut chart with better label in Node page of new 
YARN UI. Contributed by Akhil PB.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/87f06443
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/87f06443
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/87f06443

Branch: refs/heads/YARN-5355_branch2
Commit: 87f0644353c43bcdb62b0187314e68be97aa3478
Parents: 6d26c5f
Author: Sunil G 
Authored: Fri Mar 10 16:17:48 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:56 2017 -0700

--
 .../main/webapp/app/helpers/log-files-comma.js  | 10 -
 .../app/serializers/yarn-node-container.js  |  2 +-
 .../main/webapp/app/serializers/yarn-node.js|  4 ++--
 .../main/webapp/app/serializers/yarn-rm-node.js |  4 ++--
 .../src/main/webapp/app/templates/yarn-node.hbs | 23 +---
 .../main/webapp/app/templates/yarn-nodes.hbs|  2 +-
 .../webapp/app/templates/yarn-nodes/table.hbs   | 13 ++-
 7 files changed, 37 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/87f06443/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
index 78dcf25..026cd7f 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
@@ -35,8 +35,16 @@ export default Ember.Helper.helper(function(params,hash) {
   var containerId = hash.containerId;
   var html = '';
   for (var i = 0; i < logFilesLen; i++) {
+var logFileName = "";
+if (logFiles[i]) {
+  if (typeof logFiles[i] === "object" && logFiles[i].containerLogFiles) {
+logFileName = logFiles[i].containerLogFiles;
+  } else if (typeof logFiles[i] === "string") {
+logFileName = logFiles[i];
+  }
+}
 html = html + '' + logFiles[i] +
+nodeAddr + '/' + containerId + '/' + logFileName + '">' + logFileName +
 '';
 if (i !== logFilesLen - 1) {
   html = html + ",";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/87f06443/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
index 7e78987..7bcb655 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
@@ -30,7 +30,7 @@ export default DS.JSONAPISerializer.extend({
 containerId: payload.id,
 state: payload.state,
 user: payload.user,
-diagnostics: payload.diagnostics,
+diagnostics: payload.diagnostics || 'N/A',
 exitCode: payload.exitCode,
 totalMemoryNeeded: payload.totalMemoryNeededMB,
 totalVCoresNeeded: payload.totalVCoresNeeded,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/87f06443/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
index 0d9faec..10521e6 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
@@ -36,8 +36,8 @@ export default DS.JSONAPISerializer.extend({
 pmemCheckEnabled: payload.pmemCheckEnabled,
 nodeHealthy: payload.nodeHealthy,
 lastNodeUpdateTime: 
Converter.timeStampToDate(payload.lastNodeUpdateTime),
-healthReport: payload.healthReport,
-nmStartupTime: Converter.timeStampToDate(payload.nmStartupTime),
+healthReport: payload.healthReport || 'N/A',
+nmStartupTime: payload.nmStartupTime? 
Converter.timeStampToDate(payload.nmStartupTime) : '',
 nodeManagerBuildVersion: payload.nodeManagerBuildVersion,
 hadoopBuildVersion: 

[10/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to remove unwanted files from rat exclusions. (Wangda Tan via Sunil G)

[vrushali]

YARN-4849. Addendum patch to remove unwanted files from rat exclusions. (Wangda 
Tan via Sunil G)


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

Branch: refs/heads/YARN-5355_branch2
Commit: e4b0f2202c06279cf481e51c02d4428eb061add8
Parents: 4424a05
Author: sunilg 
Authored: Fri Oct 14 18:23:04 2016 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:48 2017 -0700

--
 .../hadoop-yarn/hadoop-yarn-ui/pom.xml  | 14 
 .../src/main/webapp/.editorconfig   | 34 
 2 files changed, 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4b0f220/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index e59e9bf..54bfe3f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -46,32 +46,18 @@
 apache-rat-plugin
 
   
-src/main/webapp/node_modules/**/*
-src/main/webapp/bower_components/**/*
 src/main/webapp/jsconfig.json
 src/main/webapp/bower.json
 src/main/webapp/package.json
 src/main/webapp/testem.json
-
-src/main/webapp/dist/**/*
-src/main/webapp/tmp/**/*
 src/main/webapp/public/assets/images/**/*
 src/main/webapp/public/assets/images/*
 src/main/webapp/public/robots.txt
-
-public/assets/images/**/*
 public/crossdomain.xml
-
-src/main/webapp/.tmp/**/*
 src/main/webapp/.bowerrc
-src/main/webapp/.editorconfig
 src/main/webapp/.ember-cli
-src/main/webapp/.gitignore
 src/main/webapp/.jshintrc
-src/main/webapp/.travis.yml
 src/main/webapp/.watchmanconfig
-src/main/webapp/tests/.jshintrc
-src/main/webapp/blueprints/.jshintrc
   
 
   

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4b0f220/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
deleted file mode 100644
index 47c5438..000
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.js]
-indent_style = space
-indent_size = 2
-
-[*.hbs]
-insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[15/50] [abbrv] hadoop git commit: YARN-5500. [YARN-3368] ‘Master node' link under application tab is broken. (Akhil P B Tan via Sunil G)

[vrushali]

YARN-5500. [YARN-3368]  ‘Master node' link under application tab is broken. 
(Akhil P B Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1f2adfd2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1f2adfd2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1f2adfd2

Branch: refs/heads/YARN-5355_branch2
Commit: 1f2adfd20d657c7067f34be00337ee2075a6ddcd
Parents: e038047
Author: sunilg 
Authored: Thu Oct 27 14:19:44 2016 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:50 2017 -0700

--
 .../src/main/webapp/app/controllers/yarn-app.js | 9 -
 .../src/main/webapp/app/templates/yarn-app.hbs  | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f2adfd2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
index f6b9404..309c895 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
@@ -33,6 +33,13 @@ export default Ember.Controller.extend({
   routeName: 'yarn-app',
   model: appId
 }];
-  })
+  }),
 
+  amHostHttpAddressFormatted: function() {
+var amHostAddress = this.get('model.app.amHostHttpAddress');
+if (amHostAddress.indexOf('http://') < 0) {
+  amHostAddress = 'http://' + amHostAddress;
+}
+return amHostAddress;
+  }.property('model.app.amHostHttpAddress')
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f2adfd2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
index 9e92fc1..acf00d1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
@@ -172,8 +172,8 @@
 
   
   
-Link
-Link
+Link
+Link
 {{model.app.amNodeLabelExpression}}
   
   


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[26/50] [abbrv] hadoop git commit: YARN-5917. Make navigation link active when selecting sub tabs in 'Applications' and 'Nodes' page for new UI. Contributed by Kai Sasaki.

[vrushali]

YARN-5917. Make navigation link active when selecting sub tabs in 
'Applications' and 'Nodes' page for new UI. Contributed by Kai Sasaki.


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

Branch: refs/heads/YARN-5355_branch2
Commit: a9ab59a2a69ffed1fd113aa9a4f3ca25219e0091
Parents: 3b28766
Author: Sunil G 
Authored: Tue Feb 7 21:45:40 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:54 2017 -0700

--
 .../src/main/webapp/app/templates/application.hbs| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9ab59a2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
index 7783db4..4a2ba38 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
@@ -46,13 +46,13 @@
   (current)
 {{/link-to}}
   {{/link-to}}
-  {{#link-to 'yarn-apps.apps' tagName="li"}}
-{{#link-to 'yarn-apps.apps' class="navigation-link"}}Applications
+  {{#link-to 'yarn-apps.apps' tagName="li" currentWhen="yarn-apps.apps 
yarn-apps.services"}}
+{{#link-to 'yarn-apps.apps' class="navigation-link" 
currentWhen="yarn-apps.apps yarn-apps.services"}}Applications
   (current)
 {{/link-to}}
   {{/link-to}}
-  {{#link-to 'yarn-nodes.table' tagName="li"}}
-{{#link-to 'yarn-nodes.table' class="navigation-link"}}Nodes
+  {{#link-to 'yarn-nodes.table' tagName="li" 
currentWhen="yarn-nodes.table yarn-nodes.heatmap"}}
+{{#link-to 'yarn-nodes.table' class="navigation-link" 
currentWhen="yarn-nodes.table yarn-nodes.heatmap"}}Nodes
   (current)
 {{/link-to}}
   {{/link-to}}


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[43/50] [abbrv] hadoop git commit: YARN-6631. Refactor loader.js in new Yarn UI. Contributed by Akhil P B.

[vrushali]

YARN-6631. Refactor loader.js in new Yarn UI. Contributed by Akhil P B.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/874d223e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/874d223e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/874d223e

Branch: refs/heads/YARN-5355_branch2
Commit: 874d223e2d3a5ca7feafb276a50a1f082fafc348
Parents: 931ea0c
Author: Sunil G 
Authored: Thu Aug 10 11:53:26 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:40:01 2017 -0700

--
 .../src/main/webapp/app/initializers/loader.js  | 42 +---
 1 file changed, 19 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/874d223e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
index aa8fb07..55f6e1b 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -20,25 +20,27 @@
 
 import Ember from 'ember';
 
-function getTimeLineURL() {
-  return '/conf?name=yarn.timeline-service.webapp.address';
+function getTimeLineURL(rmhost) {
+  var url = window.location.protocol + '//' +
+(ENV.hosts.localBaseAddress? ENV.hosts.localBaseAddress + '/' : '') + 
rmhost;
+
+  url += '/conf?name=yarn.timeline-service.webapp.address';
+  Ember.Logger.log("Get Timeline Address URL: " + url);
+  return url;
 }
 
 function updateConfigs(application) {
   var hostname = window.location.hostname;
-  var rmhost = hostname +
-(window.location.port ? ':' + window.location.port: '');
-
-  Ember.Logger.log("RM Address:" + rmhost);
+  var rmhost = hostname + (window.location.port ? ':' + window.location.port: 
'');
 
   if(!ENV.hosts.rmWebAddress) {
-ENV = {
-   hosts: {
-  rmWebAddress: rmhost,
-},
-};
+ENV.hosts.rmWebAddress = rmhost;
+  } else {
+rmhost = ENV.hosts.rmWebAddress;
   }
 
+  Ember.Logger.log("RM Address: " + rmhost);
+
   if(!ENV.hosts.timelineWebAddress) {
 var timelinehost = "";
 $.ajax({
@@ -46,7 +48,7 @@ function updateConfigs(application) {
   dataType: 'json',
   async: true,
   context: this,
-  url: getTimeLineURL(),
+  url: getTimeLineURL(rmhost),
   success: function(data) {
 timelinehost = data.property.value;
 ENV.hosts.timelineWebAddress = timelinehost;
@@ -54,24 +56,18 @@ function updateConfigs(application) {
 var address = timelinehost.split(":")[0];
 var port = timelinehost.split(":")[1];
 
-Ember.Logger.log("Timeline Address from RM:" + address + ":" + port);
+Ember.Logger.log("Timeline Address from RM: " + timelinehost);
 
 if(address === "0.0.0.0" || address === "localhost") {
   var updatedAddress =  hostname + ":" + port;
-
-  /* Timeline v2 is not supporting CORS, so make as default*/
-  ENV = {
- hosts: {
-rmWebAddress: rmhost,
-timelineWebAddress: updatedAddress,
-  },
-  };
-  Ember.Logger.log("Timeline Updated Address:" + updatedAddress);
+  ENV.hosts.timelineWebAddress = updatedAddress;
+  Ember.Logger.log("Timeline Updated Address: " + updatedAddress);
 }
 application.advanceReadiness();
-  },
+  }
 });
   } else {
+Ember.Logger.log("Timeline Address: " + ENV.hosts.timelineWebAddress);
 application.advanceReadiness();
   }
 }


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[23/50] [abbrv] hadoop git commit: YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by Akhil P B.

[vrushali]

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b287669/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
index 1c5b7b3..766c5c7 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue.js
@@ -49,7 +49,7 @@ export default DS.JSONAPISerializer.extend({
   relationshipUserData.push({
 type: "YarnUser",
 id: u.username + "_" + payload.queueName,
-  })
+  });
 });
   }
 
@@ -85,12 +85,12 @@ export default DS.JSONAPISerializer.extend({
   return {
 queue: this._super(store, primaryModelClass, fixedPayload, id, 
requestType),
 includedData: includedData
-  }
+  };
 },
 
 handleQueue(store, primaryModelClass, payload, id, requestType) {
   var data = [];
-  var includedData = []
+  var includedData = [];
   var result = this.normalizeSingleResponse(store, primaryModelClass,
 payload, id, requestType);
 
@@ -112,8 +112,8 @@ export default DS.JSONAPISerializer.extend({
 
   return {
 data: data,
-includedData, includedData
-  }
+includedData: includedData
+  };
 },
 
 normalizeArrayResponse(store, primaryModelClass, payload, id,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b287669/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
index 6feab36..ad50621 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import Ember from 'ember';
 import DS from 'ember-data';
 import Converter from 'yarn-ui/utils/converter';
 
@@ -48,16 +47,14 @@ export default DS.JSONAPISerializer.extend({
 return fixedPayload;
   },
 
-  normalizeSingleResponse(store, primaryModelClass, payload, id,
-  requestType) {
+  normalizeSingleResponse(store, primaryModelClass, payload, id/*, 
requestType*/) {
 // payload is of the form {"nodeInfo":{}}
 var p = this.internalNormalizeSingleResponse(store,
 primaryModelClass, payload, id);
 return { data: p };
   },
 
-  normalizeArrayResponse(store, primaryModelClass, payload, id,
-  requestType) {
+  normalizeArrayResponse(store, primaryModelClass, payload/*, id, 
requestType*/) {
 // expected response is of the form { data: [ {}, {} ] }
 var normalizedArrayResponse = {};
 if (payload.nodes) {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b287669/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
index b96ec16..6c0cfee 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
@@ -16,8 +16,6 @@
  * limitations under the License.
  */
 
-import Constants from 'yarn-ui/constants';
-
 export default {
   preDefinedColors : ["#1f77b4", "#aec7e8", "#ffbb78",
 "#98df8a", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b",
@@ -43,14 +41,14 @@ export default {
   startIdx = Math.max(nColors - colorsTarget.length, 0);
 }
 
-for (var i = 0; i < colorsTarget.length; i++) {
+for (i = 0; i < colorsTarget.length; i++) {
   if (i + startIdx < nColors) {
 colors[i + startIdx] = this.getColorByTarget(colorsTarget[i]);
   }
 }
 
 var idx = 0;
-for (var i = 0; i < nColors; i++) {
+for (i = 0; i < nColors; i++) {
   if (!colors[i]) {
 colors[i] = this.preDefinedColors[i % this.preDefinedColors.length];
 idx ++;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b287669/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
--
diff --git 

[16/50] [abbrv] hadoop git commit: YARN-5772. [YARN-3368] Replace old Hadoop logo with new one (Akhil P B Tan via Sunil G)

[vrushali]

YARN-5772. [YARN-3368] Replace old Hadoop logo with new one (Akhil P B Tan via 
Sunil G)


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

Branch: refs/heads/YARN-5355_branch2
Commit: e038047206f389c65046ede99ee4510dfc3038cd
Parents: 6c37367
Author: sunilg 
Authored: Thu Oct 27 10:45:47 2016 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:50 2017 -0700

--
 .../webapp/public/assets/images/hadoop_logo.png | Bin 26495 -> 31716 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e0380472/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
index 275d39e..d481395 100644
Binary files 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
 and 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
 differ


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[06/50] [abbrv] hadoop git commit: YARN-5598. [YARN-3368] Fix create-release to be able to generate bits for the new yarn-ui (Wangda Tan via Sunil G)

[vrushali]

YARN-5598. [YARN-3368] Fix create-release to be able to generate bits for the 
new yarn-ui (Wangda Tan via Sunil G)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4e1b37fa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4e1b37fa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4e1b37fa

Branch: refs/heads/YARN-5355_branch2
Commit: 4e1b37fa75d9b17293acff4ffc32246afb2b302d
Parents: 9aa4317
Author: sunilg 
Authored: Tue Sep 6 23:15:59 2016 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:46 2017 -0700

--
 dev-support/bin/create-release |   2 +-
 dev-support/create-release.sh  | 144 
 dev-support/docker/Dockerfile  |   6 +-
 3 files changed, 6 insertions(+), 146 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e1b37fa/dev-support/bin/create-release
--
diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release
index 8b138e5..39c9133 100755
--- a/dev-support/bin/create-release
+++ b/dev-support/bin/create-release
@@ -541,7 +541,7 @@ function makearelease
   # shellcheck disable=SC2046
   run_and_redirect "${LOGDIR}/mvn_install.log" \
 "${MVN}" "${MVN_ARGS[@]}" install \
-  -Pdist,src \
+  -Pdist,src,yarn-ui \
   "${signflags[@]}" \
   -DskipTests -Dtar $(hadoop_native_flags)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e1b37fa/dev-support/create-release.sh
--
diff --git a/dev-support/create-release.sh b/dev-support/create-release.sh
deleted file mode 100755
index 792a805..000
--- a/dev-support/create-release.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Function to probe the exit code of the script commands, 
-# and stop in the case of failure with an contextual error 
-# message.
-run() {
-  echo "\$ ${@}"
-  "${@}"
-  exitCode=$?
-  if [[ $exitCode != 0 ]]; then
-echo
-echo "Failed! running ${@} in `pwd`"
-echo
-exit $exitCode
-  fi
-}
-
-doMD5() {
-  MD5CMD="md5sum"
-  which $MD5CMD
-  if [[ $? != 0 ]]; then
-MD5CMD="md5"
-  fi
-  run $MD5CMD ${1} > ${1}.md5
-}
-
-# If provided, the created release artifacts will be tagged with it 
-# (use RC#, i.e: RC0). Do not use a label to create the final release 
-# artifact.
-RC_LABEL=$1
-
-# Extract Hadoop version from POM
-HADOOP_VERSION=`cat pom.xml | grep "" | head -1 | sed 's|^ 
*||' | sed 's|.*$||'`
-
-# Setup git
-GIT=${GIT:-git}
-
-echo
-echo "*"
-echo
-echo "Hadoop version to create release artifacts: ${HADOOP_VERSION}"
-echo 
-echo "Release Candidate Label: ${RC_LABEL}"
-echo
-echo "*"
-echo
-
-if [[ ! -z ${RC_LABEL} ]]; then
-  RC_LABEL="-${RC_LABEL}"
-fi
-
-# Get Maven command
-if [ -z "$MAVEN_HOME" ]; then
-  MVN=mvn
-else
-  MVN=$MAVEN_HOME/bin/mvn
-fi
-
-ARTIFACTS_DIR="target/artifacts"
-
-# git clean to clear any remnants from previous build
-run ${GIT} clean -xdf
-
-# mvn clean for sanity
-run ${MVN} clean
-
-# Create staging dir for release artifacts
-run mkdir -p ${ARTIFACTS_DIR}
-
-# Create RAT report
-run ${MVN} apache-rat:check
-
-# Create SRC and BIN tarballs for release,
-# Using 'install’ goal instead of 'package' so artifacts are available 
-# in the Maven local cache for the site generation
-run ${MVN} install -Pdist,src,native,yarn-ui -DskipTests -Dtar
-
-# Create site for release
-run ${MVN} site site:stage -Pdist -Psrc
-run mkdir -p target/staging/hadoop-project/hadoop-project-dist/hadoop-yarn
-run mkdir -p target/staging/hadoop-project/hadoop-project-dist/hadoop-mapreduce
-run cp ./hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html 
target/staging/hadoop-project/hadoop-project-dist/hadoop-common/
-run cp ./hadoop-common-project/hadoop-common/CHANGES.txt 

[09/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix javadocs. (Sunil G via wangda)

[vrushali]

 YARN-4849. Addendum patch to fix javadocs. (Sunil G via wangda)


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

Branch: refs/heads/YARN-5355_branch2
Commit: fbb20a5461497e71b54d7563412ba24b3ebd2db0
Parents: 4e1b37f
Author: Wangda Tan 
Authored: Fri Sep 9 10:54:37 2016 -0700
Committer: vrushali 
Committed: Tue Oct 17 11:39:47 2017 -0700

--
 .../hadoop/yarn/server/resourcemanager/ResourceManager.java| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/fbb20a54/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 077cc1b..a26bc0c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -1013,6 +1013,12 @@ public class ResourceManager extends CompositeService 
implements Recoverable {
* Return a HttpServer.Builder that the journalnode / namenode / secondary
* namenode can use to initialize their HTTP / HTTPS server.
*
+   * @param conf configuration object
+   * @param httpAddr HTTP address
+   * @param httpsAddr HTTPS address
+   * @param name  Name of the server
+   * @throws IOException from Builder
+   * @return builder object
*/
   public static HttpServer2.Builder httpServerTemplateForRM(Configuration conf,
   final InetSocketAddress httpAddr, final InetSocketAddress httpsAddr,


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[24/50] [abbrv] hadoop git commit: YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by Akhil P B.

[vrushali]

YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by 
Akhil P B.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3b287669
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3b287669
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3b287669

Branch: refs/heads/YARN-5355_branch2
Commit: 3b2876690e248801705191ef064e0cc3c426ee36
Parents: 7eb3f8a
Author: Sunil G 
Authored: Tue Jan 31 14:18:31 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:53 2017 -0700

--
 .../hadoop-yarn-ui/src/main/webapp/.jshintrc|  5 ++-
 .../src/main/webapp/app/adapters/abstract.js|  1 +
 .../main/webapp/app/adapters/cluster-info.js|  4 +--
 .../main/webapp/app/adapters/cluster-metric.js  |  4 +--
 .../webapp/app/adapters/yarn-app-attempt.js |  4 +--
 .../src/main/webapp/app/adapters/yarn-app.js|  6 ++--
 .../webapp/app/adapters/yarn-container-log.js   |  4 +--
 .../main/webapp/app/adapters/yarn-container.js  | 12 +++
 .../src/main/webapp/app/adapters/yarn-node.js   |  4 +--
 .../src/main/webapp/app/adapters/yarn-queue.js  |  4 +--
 .../main/webapp/app/adapters/yarn-rm-node.js|  6 ++--
 .../app/components/app-usage-donut-chart.js |  6 ++--
 .../src/main/webapp/app/components/bar-chart.js | 36 +---
 .../app/components/base-chart-component.js  |  8 ++---
 .../app/components/base-usage-donut-chart.js| 11 +++---
 .../main/webapp/app/components/donut-chart.js   | 10 +++---
 .../main/webapp/app/components/nodes-heatmap.js | 21 ++--
 ...er-app-memusage-by-nodes-stacked-barchart.js |  4 +--
 ...app-ncontainers-by-nodes-stacked-barchart.js |  4 +--
 .../app/components/queue-usage-donut-chart.js   |  4 +--
 .../main/webapp/app/components/queue-view.js| 11 +++---
 .../main/webapp/app/components/simple-table.js  |  6 ++--
 .../webapp/app/components/stacked-barchart.js   | 23 +++--
 .../main/webapp/app/components/timeline-view.js | 25 --
 .../main/webapp/app/components/tree-selector.js | 33 +-
 .../main/webapp/app/controllers/application.js  |  8 ++---
 .../src/main/webapp/app/helpers/divide.js   |  2 +-
 .../main/webapp/app/helpers/log-files-comma.js  |  5 ++-
 .../src/main/webapp/app/helpers/node-link.js|  2 +-
 .../src/main/webapp/app/helpers/node-menu.js| 10 +++---
 .../src/main/webapp/app/helpers/node-name.js|  4 +--
 .../src/main/webapp/app/initializers/loader.js  |  8 +++--
 .../main/webapp/app/models/yarn-app-attempt.js  | 17 -
 .../src/main/webapp/app/models/yarn-app.js  |  8 ++---
 .../src/main/webapp/app/models/yarn-node-app.js |  8 ++---
 .../webapp/app/models/yarn-node-container.js| 12 +++
 .../src/main/webapp/app/models/yarn-queue.js| 14 
 .../src/main/webapp/app/models/yarn-rm-node.js  | 10 +++---
 .../src/main/webapp/app/models/yarn-user.js |  2 +-
 .../src/main/webapp/app/routes/application.js   |  3 +-
 .../main/webapp/app/routes/yarn-app-attempts.js |  2 --
 .../src/main/webapp/app/routes/yarn-app.js  |  2 +-
 .../webapp/app/routes/yarn-container-log.js |  2 +-
 .../main/webapp/app/routes/yarn-queues/index.js |  2 ++
 .../webapp/app/serializers/yarn-app-attempt.js  | 23 ++---
 .../src/main/webapp/app/serializers/yarn-app.js | 13 +++
 .../app/serializers/yarn-container-log.js   |  3 +-
 .../webapp/app/serializers/yarn-container.js| 22 +---
 .../webapp/app/serializers/yarn-node-app.js | 24 ++---
 .../app/serializers/yarn-node-container.js  |  7 ++--
 .../main/webapp/app/serializers/yarn-node.js|  8 ++---
 .../main/webapp/app/serializers/yarn-queue.js   | 10 +++---
 .../main/webapp/app/serializers/yarn-rm-node.js |  7 ++--
 .../src/main/webapp/app/utils/color-utils.js|  6 ++--
 .../src/main/webapp/app/utils/converter.js  |  2 +-
 .../main/webapp/app/utils/href-address-utils.js |  2 --
 .../src/main/webapp/app/utils/mock.js   |  4 +--
 .../src/main/webapp/app/utils/sorter.js |  8 ++---
 .../src/main/webapp/ember-cli-build.js  |  2 +-
 .../unit/models/yarn-container-log-test.js  |  1 +
 .../tests/unit/models/yarn-node-app-test.js |  1 +
 .../unit/models/yarn-node-container-test.js |  1 +
 .../webapp/tests/unit/models/yarn-node-test.js  |  1 +
 .../tests/unit/models/yarn-rm-node-test.js  |  1 +
 .../unit/routes/yarn-container-log-test.js  | 24 ++---
 .../tests/unit/routes/yarn-node-app-test.js | 28 +++
 .../tests/unit/routes/yarn-node-apps-test.js| 30 
 .../unit/routes/yarn-node-container-test.js | 28 +++
 .../unit/routes/yarn-node-containers-test.js| 30 
 .../webapp/tests/unit/routes/yarn-node-test.js  |  4 +--
 .../webapp/tests/unit/routes/yarn-nodes-test.js |  2 +-
 71 

[25/50] [abbrv] hadoop git commit: YARN-5912. Fix breadcrumb issues for various pages in new YARN UI. Contributed by Akhil P B.

[vrushali]

YARN-5912. Fix breadcrumb issues for various pages in new YARN UI. Contributed 
by Akhil P B.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/850b84b3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/850b84b3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/850b84b3

Branch: refs/heads/YARN-5355_branch2
Commit: 850b84b3b8f790b9e2c0d9f65e338ccce85438b0
Parents: a9ab59a
Author: Sunil G 
Authored: Tue Feb 14 22:29:21 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:54 2017 -0700

--
 .../webapp/app/controllers/yarn-app-attempt.js  |  2 +-
 .../webapp/app/controllers/yarn-app-attempts.js |  2 +-
 .../src/main/webapp/app/controllers/yarn-app.js |  2 +-
 .../main/webapp/app/controllers/yarn-apps.js|  2 +-
 .../app/controllers/yarn-container-log.js   |  7 +++-
 .../webapp/app/controllers/yarn-node-app.js |  7 +++-
 .../webapp/app/controllers/yarn-node-apps.js|  2 +-
 .../app/controllers/yarn-node-container.js  | 39 
 .../app/controllers/yarn-node-containers.js |  2 +-
 .../main/webapp/app/controllers/yarn-node.js|  2 +-
 .../webapp/app/controllers/yarn-services.js |  2 +-
 .../src/main/webapp/app/models/yarn-app.js  |  2 +-
 .../src/main/webapp/app/routes/yarn-node-app.js |  2 +-
 .../webapp/app/routes/yarn-node-container.js|  2 +-
 .../controllers/yarn-node-container-test.js | 30 +++
 15 files changed, 90 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/850b84b3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
index a458842..4c02361 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
   routeName: 'application'
 },{
   text: "Applications",
-  routeName: 'yarn-apps'
+  routeName: 'yarn-apps.apps'
 }, {
   text: `App [${appId}]`,
   routeName: 'yarn-app',

http://git-wip-us.apache.org/repos/asf/hadoop/blob/850b84b3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
index 9ebc2a6..92de2f9 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempts.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
   routeName: 'application'
 },{
   text: "Applications",
-  routeName: 'yarn-apps'
+  routeName: 'yarn-apps.apps'
 }, {
   text: `App [${appId}]`,
   routeName: 'yarn-app',

http://git-wip-us.apache.org/repos/asf/hadoop/blob/850b84b3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
index 309c895..9c1cb5d 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
@@ -27,7 +27,7 @@ export default Ember.Controller.extend({
   routeName: 'application'
 },{
   text: "Applications",
-  routeName: 'yarn-apps'
+  routeName: 'yarn-apps.apps'
 }, {
   text: `App [${appId}]`,
   routeName: 'yarn-app',

http://git-wip-us.apache.org/repos/asf/hadoop/blob/850b84b3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
index 396f83b..18bf682 100644
--- 

[41/50] [abbrv] hadoop git commit: YARN-6458. Use yarn package manager to lock down dependency versions for new web UI. Contributed by Sreenath Somarajapuram.

[vrushali]

YARN-6458. Use yarn package manager to lock down dependency versions for new 
web UI. Contributed by Sreenath Somarajapuram.


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

Branch: refs/heads/YARN-5355_branch2
Commit: f8d6ad25ca18d853da27f68c5f801b4f1c3d83b8
Parents: bb38925
Author: Sunil G 
Authored: Sun Jun 4 22:05:14 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:40:01 2017 -0700

--
 .../hadoop-yarn/hadoop-yarn-ui/README.md|   64 +
 .../hadoop-yarn/hadoop-yarn-ui/pom.xml  |  171 +-
 .../hadoop-yarn-ui/src/main/webapp/.bowerrc |5 +-
 .../src/main/webapp/WEB-INF/wro.xml |9 +
 .../src/main/webapp/bower-shrinkwrap.json   |   66 +
 .../src/main/webapp/ember-cli-build.js  |   16 +-
 .../hadoop-yarn-ui/src/main/webapp/package.json |   15 +-
 .../hadoop-yarn-ui/src/main/webapp/yarn.lock| 4983 ++
 8 files changed, 5275 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f8d6ad25/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
new file mode 100644
index 000..f67f351
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
@@ -0,0 +1,64 @@
+
+
+# Yarn UI
+
+The Yarn UI is an Ember based web-app that provides visualization of the 
applications running on the Apache Hadoop YARN framework.
+
+## Configurations
+
+* You can point the UI to custom locations by setting the environment 
variables in `src/main/webapp/config/configs.env`
+
+## Development
+
+All the following commands must be run inside `src/main/webapp`.
+
+### Prerequisites
+
+You will need the following things properly installed on your computer.
+
+* Install [Yarn](https://yarnpkg.com) v0.21.3
+* Install [Bower](http://bower.io/) v1.7.7
+* Install all dependencies by running `yarn install` & `bower install`
+
+### Running UI
+
+* `yarn start`
+* Visit your app at [http://localhost:4200](http://localhost:4200).
+
+### Building
+
+* `yarn run build` (production)
+* Files would be stored in "dist/"
+
+### Adding new dependencies
+
+**Warning: Do not edit the _package.json_ or _bower.json_ files manually. This 
could make them out-of-sync with the respective lock or shrinkwrap files.**
+
+Yarn UI has replaced NPM with Yarn package manager. And hence Yarn would be 
used to manage dependencies defined in package.json.
+
+* Please use the Yarn and Bower command-line tools to add new dependencies. 
And the tool version must be same as those defined in Prerequisites section.
+* Once any dependency is added:
+  *  If it's in package.json. Make sure that the respective, and only those 
changes are reflected in yarn.lock file.
+  *  If it's in bower.json. Make sure that the respective, and only those 
changes are reflected in bower-shrinkwrap.json file.
+* Commands to add using CLI tools:
+  * Yarn: yarn add [package-name]
+  * Bower: bower install --save [package-name]
+
+### Adding new routes (pages), controllers, components etc.
+
+* Use ember-cli blueprint generator - [Ember 
CLI](http://ember-cli.com/extending/#generators-and-blueprints)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f8d6ad25/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
--
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 5f6eda9..5f546ef 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -27,15 +27,16 @@
   hadoop-yarn-ui
   2.9.0-SNAPSHOT
   Apache Hadoop YARN UI
-  ${packaging.type}
+  ${packagingType}
 
   
-pom
-${basedir}/target/src/main/webapp
-node
-v0.12.2
-2.10.0
-false
+pom
+
+${basedir}/target/webapp
+${basedir}/target/webapp/node/node
+node/yarn/dist/bin/yarn.js
+
+false
   
 
   
@@ -48,7 +49,9 @@
   
 src/main/webapp/jsconfig.json
 src/main/webapp/bower.json
+src/main/webapp/bower-shrinkwrap.json
 src/main/webapp/package.json
+src/main/webapp/yarn.lock
 src/main/webapp/testem.json
 src/main/webapp/public/assets/images/**/*
 src/main/webapp/public/assets/images/*
@@ -58,6 +61,7 @@
 src/main/webapp/.ember-cli
 src/main/webapp/.jshintrc
   

[32/50] [abbrv] hadoop git commit: YARN-6258. localBaseAddress for CORS proxy configuration is not working when suffixed with forward slash in new YARN UI. Contributed by Gergely Novák.

[vrushali]

YARN-6258. localBaseAddress for CORS proxy configuration is not working when 
suffixed with forward slash in new YARN UI. Contributed by Gergely Novák.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/72eb9fd0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/72eb9fd0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/72eb9fd0

Branch: refs/heads/YARN-5355_branch2
Commit: 72eb9fd0ca60a954c1f641fc0be5fe8786e91266
Parents: 9c1cc96
Author: Sunil G 
Authored: Fri Apr 7 11:42:50 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:57 2017 -0700

--
 .../hadoop-yarn-ui/src/main/webapp/app/services/hosts.js   | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/72eb9fd0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
index 19863e1..807844e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
@@ -61,7 +61,11 @@ export default Ember.Service.extend({
   },
 
   localBaseAddress: Ember.computed(function () {
-return this.localAddress();
+var url = this.localAddress();
+if (url.endsWith('/')) {
+  url = url.slice(0, -1);
+}
+return url;
   }),
 
   timelineWebAddress: Ember.computed(function () {


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[11/50] [abbrv] hadoop git commit: YARN-5698. [YARN-3368] Launch new YARN UI under hadoop web app port. (Sunil G via wangda)

[vrushali]

YARN-5698. [YARN-3368] Launch new YARN UI under hadoop web app port. (Sunil G 
via wangda)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4424a05c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4424a05c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4424a05c

Branch: refs/heads/YARN-5355_branch2
Commit: 4424a05cb9e64843a9fea1c089ea39a18aedb09d
Parents: 2f5a5c1
Author: Wangda Tan 
Authored: Wed Oct 12 13:22:20 2016 -0700
Committer: vrushali 
Committed: Tue Oct 17 11:39:48 2017 -0700

--
 .../hadoop/yarn/conf/YarnConfiguration.java | 21 ++
 .../org/apache/hadoop/yarn/webapp/WebApps.java  |  8 +++
 .../src/main/resources/yarn-default.xml | 20 ++
 .../server/resourcemanager/ResourceManager.java | 70 +++-
 .../src/main/webapp/config/default-config.js|  4 +-
 5 files changed, 57 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4424a05c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index 224e030..69dd080 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -301,25 +301,12 @@ public class YarnConfiguration extends Configuration {
   /**
* Enable YARN WebApp V2.
*/
-  public static final String RM_WEBAPP_UI2_ENABLE = RM_PREFIX
+  public static final String YARN_WEBAPP_UI2_ENABLE = "yarn."
   + "webapp.ui2.enable";
-  public static final boolean DEFAULT_RM_WEBAPP_UI2_ENABLE = false;
+  public static final boolean DEFAULT_YARN_WEBAPP_UI2_ENABLE = false;
 
-  /** The address of the RM web ui2 application. */
-  public static final String RM_WEBAPP_UI2_ADDRESS = RM_PREFIX
-  + "webapp.ui2.address";
-
-  public static final int DEFAULT_RM_WEBAPP_UI2_PORT = 8288;
-  public static final String DEFAULT_RM_WEBAPP_UI2_ADDRESS = "0.0.0.0:" +
-  DEFAULT_RM_WEBAPP_UI2_PORT;
-  
-  /** The https address of the RM web ui2 application.*/
-  public static final String RM_WEBAPP_UI2_HTTPS_ADDRESS =
-  RM_PREFIX + "webapp.ui2.https.address";
-
-  public static final int DEFAULT_RM_WEBAPP_UI2_HTTPS_PORT = 8290;
-  public static final String DEFAULT_RM_WEBAPP_UI2_HTTPS_ADDRESS = "0.0.0.0:"
-  + DEFAULT_RM_WEBAPP_UI2_HTTPS_PORT;
+  public static final String YARN_WEBAPP_UI2_WARFILE_PATH = "yarn."
+  + "webapp.ui2.war-file-path";
 
   public static final String RM_RESOURCE_TRACKER_ADDRESS =
 RM_PREFIX + "resource-tracker.address";

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4424a05c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
index 9c96339..0dc6354 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
@@ -44,6 +44,7 @@ import 
org.apache.hadoop.security.http.RestCsrfPreventionFilter;
 import org.apache.hadoop.security.http.XFrameOptionsFilter;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+import org.mortbay.jetty.webapp.WebAppContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -393,8 +394,15 @@ public class WebApps {
 }
 
 public WebApp start(WebApp webapp) {
+  return start(webapp, null);
+}
+
+public WebApp start(WebApp webapp, WebAppContext ui2Context) {
   WebApp webApp = build(webapp);
   HttpServer2 httpServer = webApp.httpServer();
+  if (ui2Context != null) {
+httpServer.addContext(ui2Context, true);
+  }
   try {
 httpServer.start();
 LOG.info("Web app " + name + " started at "

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4424a05c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml

[30/50] [abbrv] hadoop git commit: YARN-5335. Use em-table in app/nodes pages for new YARN UI. Contributed by Sunil G.

[vrushali]

YARN-5335. Use em-table in app/nodes pages for new YARN UI. Contributed by 
Sunil G.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6d26c5f5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6d26c5f5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6d26c5f5

Branch: refs/heads/YARN-5355_branch2
Commit: 6d26c5f5350b8129ec2699612b2ef1cf357f7558
Parents: e66f956
Author: Sunil G 
Authored: Tue Feb 28 13:49:19 2017 +0530
Committer: vrushali 
Committed: Tue Oct 17 11:39:56 2017 -0700

--
 .../src/main/webapp/app/adapters/yarn-app.js|   4 +-
 .../app/components/app-usage-donut-chart.js |   1 -
 .../main/webapp/app/components/donut-chart.js   |   1 -
 .../webapp/app/controllers/app-table-columns.js |  98 +
 .../webapp/app/controllers/yarn-apps/apps.js|  25 +
 .../app/controllers/yarn-apps/services.js   |  25 +
 .../main/webapp/app/controllers/yarn-node.js|   3 +-
 .../webapp/app/controllers/yarn-nodes/table.js  | 109 +++
 .../webapp/app/controllers/yarn-queue/apps.js   |  31 ++
 .../src/main/webapp/app/models/yarn-rm-node.js  |   8 ++
 .../src/main/webapp/app/routes/yarn-apps.js |   2 -
 .../main/webapp/app/routes/yarn-apps/apps.js|   9 ++
 .../webapp/app/routes/yarn-apps/services.js |  11 ++
 .../src/main/webapp/app/routes/yarn-queue.js|   4 +-
 .../src/main/webapp/app/routes/yarn-queues.js   |   3 +-
 .../src/main/webapp/app/serializers/yarn-app.js |   3 +-
 .../webapp/app/templates/yarn-apps/apps.hbs |  13 ++-
 .../webapp/app/templates/yarn-apps/services.hbs |   4 +-
 .../webapp/app/templates/yarn-nodes/table.hbs   |  42 +--
 .../webapp/app/templates/yarn-queue/apps.hbs|   3 +-
 .../hadoop-yarn-ui/src/main/webapp/package.json |   9 +-
 .../unit/controllers/app-table-columns-test.js  |  30 +
 .../unit/controllers/yarn-apps/apps-test.js |  30 +
 .../unit/controllers/yarn-apps/services-test.js |  30 +
 .../unit/controllers/yarn-nodes/table-test.js   |  30 +
 .../unit/controllers/yarn-queue/apps-test.js|  30 +
 26 files changed, 492 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6d26c5f5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
index b34c606..fc52f7c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
@@ -25,9 +25,7 @@ export default AbstractAdapter.extend({
 
   urlForQuery(query/*, modelName*/) {
 var url = this._buildURL();
-if (query.state) {
-  url = url + '/apps/?state=' + query.state;
-}
+url = url + '/apps';
 return url;
   },
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6d26c5f5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
index 274c219..c72d934 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
@@ -36,7 +36,6 @@ export default BaseUsageDonutChart.extend({
   value: v.toFixed(2)
 });
 
-console.log(v);
 avail = avail - v;
   }
 }.bind(this));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6d26c5f5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
index e5699b4..82d2d46 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
@@ -54,7 +54,6 @@ export default BaseChartComponent.extend({
 // 50 is for title
 var outerRadius = (h - 50 - 2 * layout.margin) / 2;
 var innerRadius