[hadoop] branch branch-3.3 updated: YARN-11383. Workflow priority mappings is case sensitive (#5171)
This is an automated email from the ASF dual-hosted git repository.
varunsaxena pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 157af0cb225 YARN-11383. Workflow priority mappings is case sensitive
(#5171)
157af0cb225 is described below
commit 157af0cb225e5a6f52761533c0d24f1960f9239b
Author: Varun Saxena
AuthorDate: Sun Mar 5 21:25:16 2023 +0530
YARN-11383. Workflow priority mappings is case sensitive (#5171)
Contributed by Aparajita Choudhary
(cherry picked from commit 2a0dc2ab2f5fb46dc540ed440d6c8b2896dd195b)
---
.../capacity/WorkflowPriorityMappingsManager.java| 20 ++--
...TestCapacitySchedulerWorkflowPriorityMapping.java | 16 +---
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
index fa6977aadff..b338d9af25e 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
@@ -56,8 +56,8 @@ public class WorkflowPriorityMappingsManager {
private boolean overrideWithPriorityMappings = false;
// Map of queue to a map of workflow ID to priority
- private Map> priorityMappings =
- new HashMap>();
+ private Map> priorityMappings =
+ new HashMap<>();
public static class WorkflowPriorityMapping {
String workflowID;
@@ -115,10 +115,9 @@ public class WorkflowPriorityMappingsManager {
*
* @return workflowID to priority mappings for a queue
*/
- public Map>
+ public Map>
getWorkflowPriorityMappings() {
-Map> mappings =
-new HashMap>();
+Map> mappings = new HashMap<>();
Collection workflowMappings = conf.getWorkflowPriorityMappings();
for (String workflowMapping : workflowMappings) {
@@ -127,9 +126,9 @@ public class WorkflowPriorityMappingsManager {
if (mapping != null) {
if (!mappings.containsKey(mapping.queue)) {
mappings.put(mapping.queue,
- new HashMap());
+ new HashMap());
}
-mappings.get(mapping.queue).put(mapping.workflowID, mapping);
+mappings.get(mapping.queue).put(mapping.workflowID, mapping.priority);
}
}
return mappings;
@@ -150,8 +149,9 @@ public class WorkflowPriorityMappingsManager {
}
WorkflowPriorityMapping mapping;
try {
- mapping = new WorkflowPriorityMapping(mappingArray[0], mappingArray[1],
- Priority.newInstance(Integer.parseInt(mappingArray[2])));
+ //Converting workflow id to lowercase as yarn converts application tags
also to lowercase
+ mapping = new
WorkflowPriorityMapping(StringUtils.toLowerCase(mappingArray[0]),
+ mappingArray[1],
Priority.newInstance(Integer.parseInt(mappingArray[2])));
} catch (NumberFormatException e) {
throw new IllegalArgumentException(
"Illegal workflow priority for mapping " + mappingString);
@@ -168,7 +168,7 @@ public class WorkflowPriorityMappingsManager {
String queuePath = queue.getQueuePath();
if (priorityMappings.containsKey(queuePath)
&& priorityMappings.get(queuePath).containsKey(workflowID)) {
- return priorityMappings.get(queuePath).get(workflowID).priority;
+ return priorityMappings.get(queuePath).get(workflowID);
} else {
queue = queue.getParent();
return getMappedPriority(workflowID, queue);
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
index 63fc37e9978..ab48be5a2b4 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-serve
[hadoop] branch trunk updated: YARN-11383. Workflow priority mappings is case sensitive (#5171)
This is an automated email from the ASF dual-hosted git repository.
varunsaxena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2a0dc2ab2f5 YARN-11383. Workflow priority mappings is case sensitive
(#5171)
2a0dc2ab2f5 is described below
commit 2a0dc2ab2f5fb46dc540ed440d6c8b2896dd195b
Author: Varun Saxena
AuthorDate: Sun Mar 5 21:25:16 2023 +0530
YARN-11383. Workflow priority mappings is case sensitive (#5171)
Contributed by Aparajita Choudhary
---
.../capacity/WorkflowPriorityMappingsManager.java| 20 ++--
...TestCapacitySchedulerWorkflowPriorityMapping.java | 16 +---
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
index e9a52d21b4f..ec05b134911 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
@@ -56,8 +56,8 @@ public class WorkflowPriorityMappingsManager {
private boolean overrideWithPriorityMappings = false;
// Map of queue to a map of workflow ID to priority
- private Map> priorityMappings =
- new HashMap>();
+ private Map> priorityMappings =
+ new HashMap<>();
public static class WorkflowPriorityMapping {
String workflowID;
@@ -115,10 +115,9 @@ public class WorkflowPriorityMappingsManager {
*
* @return workflowID to priority mappings for a queue
*/
- public Map>
+ public Map>
getWorkflowPriorityMappings() {
-Map> mappings =
-new HashMap>();
+Map> mappings = new HashMap<>();
Collection workflowMappings = conf.getWorkflowPriorityMappings();
for (String workflowMapping : workflowMappings) {
@@ -127,9 +126,9 @@ public class WorkflowPriorityMappingsManager {
if (mapping != null) {
if (!mappings.containsKey(mapping.queue)) {
mappings.put(mapping.queue,
- new HashMap());
+ new HashMap());
}
-mappings.get(mapping.queue).put(mapping.workflowID, mapping);
+mappings.get(mapping.queue).put(mapping.workflowID, mapping.priority);
}
}
return mappings;
@@ -150,8 +149,9 @@ public class WorkflowPriorityMappingsManager {
}
WorkflowPriorityMapping mapping;
try {
- mapping = new WorkflowPriorityMapping(mappingArray[0], mappingArray[1],
- Priority.newInstance(Integer.parseInt(mappingArray[2])));
+ //Converting workflow id to lowercase as yarn converts application tags
also to lowercase
+ mapping = new
WorkflowPriorityMapping(StringUtils.toLowerCase(mappingArray[0]),
+ mappingArray[1],
Priority.newInstance(Integer.parseInt(mappingArray[2])));
} catch (NumberFormatException e) {
throw new IllegalArgumentException(
"Illegal workflow priority for mapping " + mappingString);
@@ -168,7 +168,7 @@ public class WorkflowPriorityMappingsManager {
String queuePath = queue.getQueuePath();
if (priorityMappings.containsKey(queuePath)
&& priorityMappings.get(queuePath).containsKey(workflowID)) {
- return priorityMappings.get(queuePath).get(workflowID).priority;
+ return priorityMappings.get(queuePath).get(workflowID);
} else {
queue = queue.getParent();
return getMappedPriority(workflowID, queue);
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
index 442c952ba12..d1931b71939 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache
[hadoop] branch branch-2 updated: YARN-9825. Changes for initializing placement rules with ResourceScheduler in branch-2. Contributed by Jonathan Hung.
This is an automated email from the ASF dual-hosted git repository.
varunsaxena pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new c9a4630 YARN-9825. Changes for initializing placement rules with
ResourceScheduler in branch-2. Contributed by Jonathan Hung.
c9a4630 is described below
commit c9a46308a1bfac9278b19e179bf3132603d52e99
Author: Varun Saxena
AuthorDate: Fri Sep 13 17:03:47 2019 +0530
YARN-9825. Changes for initializing placement rules with ResourceScheduler
in branch-2. Contributed by Jonathan Hung.
---
.../resourcemanager/placement/PlacementRule.java | 9 ++--
.../placement/UserGroupMappingPlacementRule.java | 62 +-
.../scheduler/capacity/CapacityScheduler.java | 44 +--
3 files changed, 78 insertions(+), 37 deletions(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementRule.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementRule.java
index 47dc48a..805fcf7 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementRule.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/PlacementRule.java
@@ -18,20 +18,19 @@
package org.apache.hadoop.yarn.server.resourcemanager.placement;
-import java.util.Map;
+import java.io.IOException;
import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
import org.apache.hadoop.yarn.exceptions.YarnException;
-import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
public abstract class PlacementRule {
public String getName() {
return this.getClass().getName();
}
- public void initialize(Map parameters, RMContext rmContext)
- throws YarnException {
- }
+ public abstract boolean initialize(
+ ResourceScheduler scheduler) throws IOException;
/**
* Get queue for a given application
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java
index d617d16..bac419d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java
@@ -32,6 +32,14 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
import
org.apache.hadoop.yarn.server.resourcemanager.placement.UserGroupMappingPlacementRule.QueueMapping.MappingType;
import com.google.common.annotations.VisibleForTesting;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CSQueue;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerContext;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerQueueManager;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.LeafQueue;
+
public class UserGroupMappingPlacementRule extends PlacementRule {
private static final Log LOG = LogFactory
@@ -95,6 +103,10 @@ public class UserGroupMappingPlacementRule extends
PlacementRule {
}
}
+ public UserGroupMappingPlacementRule(){
+this(false, null, null);
+ }
+
public UserGroupMappingPlacementRule(boolean overrideWithQueueMappings,
List newMappings, Groups groups) {
this.mappings = newMappings;
@@ -156,7 +168,55 @@ public class UserGroupMappingPlacementRule extends
PlacementRule {
return queueName;
}
-
+
+ @VisibleForTesting
+ @Override
+ public boolean initialize(ResourceScheduler scheduler)
+ throws IOException {
+if (!(scheduler instanceof CapacityScheduler)) {
+ throw new IOException
hadoop git commit: YARN-7662. [ATSv2] Define new set of configurations for reader and collectors to bind (Rohith Sharma K S via Varun Saxena)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 df3212aad -> d72d2440f
YARN-7662. [ATSv2] Define new set of configurations for reader and collectors
to bind (Rohith Sharma K S via Varun Saxena)
(cherry picked from commit c0aeb666a4d43aac196569d9ec6768d62139d2b9)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d72d2440
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d72d2440
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d72d2440
Branch: refs/heads/branch-2
Commit: d72d2440f4357d0377666d36104bc6eed60d1780
Parents: df3212a
Author: Varun Saxena
Authored: Tue Dec 19 22:29:24 2017 +0530
Committer: Varun Saxena
Committed: Tue Dec 19 22:51:56 2017 +0530
--
.../hadoop/yarn/conf/YarnConfiguration.java | 45 +++-
.../hadoop/yarn/webapp/util/WebAppUtils.java| 39 ++---
.../src/main/resources/yarn-default.xml | 25 +++
.../security/TestTimelineAuthFilterForV2.java | 3 +-
.../AbstractTimelineReaderHBaseTestBase.java| 2 +-
.../collector/NodeTimelineCollectorManager.java | 23 +++---
.../reader/TimelineReaderServer.java| 25 ---
.../reader/TestTimelineReaderServer.java| 6 +--
.../reader/TestTimelineReaderWebServices.java | 2 +-
.../src/site/markdown/TimelineServiceV2.md.vm | 6 +--
10 files changed, 146 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d72d2440/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 4820903..77fdf18 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
@@ -2221,6 +2221,9 @@ public class YarnConfiguration extends Configuration {
/**
* Settings for timeline service v2.0.
*/
+ public static final String TIMELINE_SERVICE_READER_PREFIX =
+ TIMELINE_SERVICE_PREFIX + "reader.";
+
public static final String TIMELINE_SERVICE_WRITER_CLASS =
TIMELINE_SERVICE_PREFIX + "writer.class";
@@ -2229,7 +2232,7 @@ public class YarnConfiguration extends Configuration {
+ ".storage.HBaseTimelineWriterImpl";
public static final String TIMELINE_SERVICE_READER_CLASS =
- TIMELINE_SERVICE_PREFIX + "reader.class";
+ TIMELINE_SERVICE_READER_PREFIX + "class";
public static final String DEFAULT_TIMELINE_SERVICE_READER_CLASS =
"org.apache.hadoop.yarn.server.timelineservice" +
@@ -3262,6 +3265,46 @@ public class YarnConfiguration extends Configuration {
public static final String TIMELINE_XFS_OPTIONS =
TIMELINE_XFS_PREFIX + "xframe-options";
+ /**
+ * Settings for timeline reader.
+ */
+ public static final String TIMELINE_SERVICE_READER_BIND_HOST =
+ TIMELINE_SERVICE_READER_PREFIX + "bind-host";
+
+ public static final String TIMELINE_SERVICE_READER_WEBAPP_ADDRESS =
+ TIMELINE_SERVICE_READER_PREFIX + "webapp.address";
+ public static final String DEFAULT_TIMELINE_SERVICE_READER_WEBAPP_ADDRESS =
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS;
+
+ public static final String TIMELINE_SERVICE_READER_WEBAPP_HTTPS_ADDRESS =
+ TIMELINE_SERVICE_READER_PREFIX + "webapp.https.address";
+ public static final String
+ DEFAULT_TIMELINE_SERVICE_READER_WEBAPP_HTTPS_ADDRESS =
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS;
+
+ /**
+ * Marked collector properties as Private since it run as auxillary service.
+ */
+ public static final String TIMELINE_SERVICE_COLLECTOR_PREFIX =
+ TIMELINE_SERVICE_PREFIX + "collector.";
+
+ @Private
+ public static final String TIMELINE_SERVICE_COLLECTOR_BIND_HOST =
+ TIMELINE_SERVICE_COLLECTOR_PREFIX + "bind-host";
+
+ @Private
+ public static final String TIMELINE_SERVICE_COLLECTOR_WEBAPP_ADDRESS =
+ TIMELINE_SERVICE_COLLECTOR_PREFIX + "webapp.address";
+ public static final String DEFAULT_TIMELINE_SERVICE_COLLECTOR_WEBAPP_ADDRESS
=
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS;
+
+ @Private
+ public static final String TIMELINE_SERVICE_COLLECTOR_WEBAPP_HTTPS_ADDRESS =
+ TIMELINE_SERVICE_COLLECTOR_PREFIX + "webapp.https.address";
+ public static final String
+ DEFAULT_TIMELINE_SERVICE_COLLECTOR_WEBAPP_
hadoop git commit: YARN-7662. [ATSv2] Define new set of configurations for reader and collectors to bind (Rohith Sharma K S via Varun Saxena)
Repository: hadoop
Updated Branches:
refs/heads/branch-3.0 f7b3950f2 -> f92ea6836
YARN-7662. [ATSv2] Define new set of configurations for reader and collectors
to bind (Rohith Sharma K S via Varun Saxena)
(cherry picked from commit c0aeb666a4d43aac196569d9ec6768d62139d2b9)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f92ea683
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f92ea683
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f92ea683
Branch: refs/heads/branch-3.0
Commit: f92ea683676aaca32a6c7ecd29b8f54c7455e8bf
Parents: f7b3950
Author: Varun Saxena
Authored: Tue Dec 19 22:29:24 2017 +0530
Committer: Varun Saxena
Committed: Tue Dec 19 22:41:52 2017 +0530
--
.../hadoop/yarn/conf/YarnConfiguration.java | 45 +++-
.../hadoop/yarn/webapp/util/WebAppUtils.java| 39 ++---
.../src/main/resources/yarn-default.xml | 25 +++
.../security/TestTimelineAuthFilterForV2.java | 3 +-
.../AbstractTimelineReaderHBaseTestBase.java| 2 +-
.../collector/NodeTimelineCollectorManager.java | 23 +++---
.../reader/TimelineReaderServer.java| 25 ---
.../reader/TestTimelineReaderServer.java| 6 +--
.../reader/TestTimelineReaderWebServices.java | 2 +-
.../src/site/markdown/TimelineServiceV2.md | 6 +--
10 files changed, 146 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f92ea683/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 2b6854c..58ba3e6 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
@@ -2276,6 +2276,9 @@ public class YarnConfiguration extends Configuration {
/**
* Settings for timeline service v2.0.
*/
+ public static final String TIMELINE_SERVICE_READER_PREFIX =
+ TIMELINE_SERVICE_PREFIX + "reader.";
+
public static final String TIMELINE_SERVICE_WRITER_CLASS =
TIMELINE_SERVICE_PREFIX + "writer.class";
@@ -2284,7 +2287,7 @@ public class YarnConfiguration extends Configuration {
+ ".storage.HBaseTimelineWriterImpl";
public static final String TIMELINE_SERVICE_READER_CLASS =
- TIMELINE_SERVICE_PREFIX + "reader.class";
+ TIMELINE_SERVICE_READER_PREFIX + "class";
public static final String DEFAULT_TIMELINE_SERVICE_READER_CLASS =
"org.apache.hadoop.yarn.server.timelineservice.storage" +
@@ -3298,6 +3301,46 @@ public class YarnConfiguration extends Configuration {
public static final String TIMELINE_XFS_OPTIONS =
TIMELINE_XFS_PREFIX + "xframe-options";
+ /**
+ * Settings for timeline reader.
+ */
+ public static final String TIMELINE_SERVICE_READER_BIND_HOST =
+ TIMELINE_SERVICE_READER_PREFIX + "bind-host";
+
+ public static final String TIMELINE_SERVICE_READER_WEBAPP_ADDRESS =
+ TIMELINE_SERVICE_READER_PREFIX + "webapp.address";
+ public static final String DEFAULT_TIMELINE_SERVICE_READER_WEBAPP_ADDRESS =
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS;
+
+ public static final String TIMELINE_SERVICE_READER_WEBAPP_HTTPS_ADDRESS =
+ TIMELINE_SERVICE_READER_PREFIX + "webapp.https.address";
+ public static final String
+ DEFAULT_TIMELINE_SERVICE_READER_WEBAPP_HTTPS_ADDRESS =
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS;
+
+ /**
+ * Marked collector properties as Private since it run as auxillary service.
+ */
+ public static final String TIMELINE_SERVICE_COLLECTOR_PREFIX =
+ TIMELINE_SERVICE_PREFIX + "collector.";
+
+ @Private
+ public static final String TIMELINE_SERVICE_COLLECTOR_BIND_HOST =
+ TIMELINE_SERVICE_COLLECTOR_PREFIX + "bind-host";
+
+ @Private
+ public static final String TIMELINE_SERVICE_COLLECTOR_WEBAPP_ADDRESS =
+ TIMELINE_SERVICE_COLLECTOR_PREFIX + "webapp.address";
+ public static final String DEFAULT_TIMELINE_SERVICE_COLLECTOR_WEBAPP_ADDRESS
=
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS;
+
+ @Private
+ public static final String TIMELINE_SERVICE_COLLECTOR_WEBAPP_HTTPS_ADDRESS =
+ TIMELINE_SERVICE_COLLECTOR_PREFIX + "webapp.https.address";
+ public static final String
+ DEFAULT_TIMELINE_SERVICE_COLLE
hadoop git commit: YARN-7662. [ATSv2] Define new set of configurations for reader and collectors to bind (Rohith Sharma K S via Varun Saxena)
Repository: hadoop
Updated Branches:
refs/heads/trunk fe5b057c8 -> c0aeb666a
YARN-7662. [ATSv2] Define new set of configurations for reader and collectors
to bind (Rohith Sharma K S via Varun Saxena)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c0aeb666
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c0aeb666
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c0aeb666
Branch: refs/heads/trunk
Commit: c0aeb666a4d43aac196569d9ec6768d62139d2b9
Parents: fe5b057
Author: Varun Saxena
Authored: Tue Dec 19 22:29:24 2017 +0530
Committer: Varun Saxena
Committed: Tue Dec 19 22:29:24 2017 +0530
--
.../hadoop/yarn/conf/YarnConfiguration.java | 45 +++-
.../hadoop/yarn/webapp/util/WebAppUtils.java| 39 ++---
.../src/main/resources/yarn-default.xml | 24 +++
.../security/TestTimelineAuthFilterForV2.java | 3 +-
.../AbstractTimelineReaderHBaseTestBase.java| 2 +-
.../collector/NodeTimelineCollectorManager.java | 23 +++---
.../reader/TimelineReaderServer.java| 25 ---
.../reader/TestTimelineReaderServer.java| 6 +--
.../reader/TestTimelineReaderWebServices.java | 2 +-
.../src/site/markdown/TimelineServiceV2.md | 6 +--
10 files changed, 145 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0aeb666/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 e57f988..1b6bd0e 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
@@ -2389,6 +2389,9 @@ public class YarnConfiguration extends Configuration {
/**
* Settings for timeline service v2.0.
*/
+ public static final String TIMELINE_SERVICE_READER_PREFIX =
+ TIMELINE_SERVICE_PREFIX + "reader.";
+
public static final String TIMELINE_SERVICE_WRITER_CLASS =
TIMELINE_SERVICE_PREFIX + "writer.class";
@@ -2397,7 +2400,7 @@ public class YarnConfiguration extends Configuration {
+ ".storage.HBaseTimelineWriterImpl";
public static final String TIMELINE_SERVICE_READER_CLASS =
- TIMELINE_SERVICE_PREFIX + "reader.class";
+ TIMELINE_SERVICE_READER_PREFIX + "class";
public static final String DEFAULT_TIMELINE_SERVICE_READER_CLASS =
"org.apache.hadoop.yarn.server.timelineservice.storage" +
@@ -3422,6 +3425,46 @@ public class YarnConfiguration extends Configuration {
public static final String TIMELINE_XFS_OPTIONS =
TIMELINE_XFS_PREFIX + "xframe-options";
+ /**
+ * Settings for timeline reader.
+ */
+ public static final String TIMELINE_SERVICE_READER_BIND_HOST =
+ TIMELINE_SERVICE_READER_PREFIX + "bind-host";
+
+ public static final String TIMELINE_SERVICE_READER_WEBAPP_ADDRESS =
+ TIMELINE_SERVICE_READER_PREFIX + "webapp.address";
+ public static final String DEFAULT_TIMELINE_SERVICE_READER_WEBAPP_ADDRESS =
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS;
+
+ public static final String TIMELINE_SERVICE_READER_WEBAPP_HTTPS_ADDRESS =
+ TIMELINE_SERVICE_READER_PREFIX + "webapp.https.address";
+ public static final String
+ DEFAULT_TIMELINE_SERVICE_READER_WEBAPP_HTTPS_ADDRESS =
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS;
+
+ /**
+ * Marked collector properties as Private since it run as auxillary service.
+ */
+ public static final String TIMELINE_SERVICE_COLLECTOR_PREFIX =
+ TIMELINE_SERVICE_PREFIX + "collector.";
+
+ @Private
+ public static final String TIMELINE_SERVICE_COLLECTOR_BIND_HOST =
+ TIMELINE_SERVICE_COLLECTOR_PREFIX + "bind-host";
+
+ @Private
+ public static final String TIMELINE_SERVICE_COLLECTOR_WEBAPP_ADDRESS =
+ TIMELINE_SERVICE_COLLECTOR_PREFIX + "webapp.address";
+ public static final String DEFAULT_TIMELINE_SERVICE_COLLECTOR_WEBAPP_ADDRESS
=
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS;
+
+ @Private
+ public static final String TIMELINE_SERVICE_COLLECTOR_WEBAPP_HTTPS_ADDRESS =
+ TIMELINE_SERVICE_COLLECTOR_PREFIX + "webapp.https.address";
+ public static final String
+ DEFAULT_TIMELINE_SERVICE_COLLECTOR_WEBAPP_HTTPS_ADDRESS =
+ DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS;
+
public YarnConfiguration() {
super();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c
hadoop git commit: YARN-7380. Fix findbugs warning in timeline service on branch-2 (Vrushali C via Varun Saxena).
Repository: hadoop
Updated Branches:
refs/heads/branch-2 2654d9973 -> e1b3bbde6
YARN-7380. Fix findbugs warning in timeline service on branch-2 (Vrushali C via
Varun Saxena).
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e1b3bbde
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e1b3bbde
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e1b3bbde
Branch: refs/heads/branch-2
Commit: e1b3bbde60aba23be718d8a9215cbde206c095f9
Parents: 2654d99
Author: Varun Saxena
Authored: Sun Oct 29 16:38:20 2017 +0530
Committer: Varun Saxena
Committed: Sun Oct 29 16:38:20 2017 +0530
--
.../yarn/server/timelineservice/storage/common/ColumnHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e1b3bbde/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
index 9f95d44..15c3f9c 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
@@ -258,7 +258,7 @@ public class ColumnHelper {
for (Entry cell : cells.entrySet()) {
V value =
(V) converter.decodeValue(cell.getValue());
-Long ts = supplementTs ? TimestampGenerator.
+long ts = supplementTs ? TimestampGenerator.
getTruncatedTimestamp(cell.getKey()) : cell.getKey();
cellResults.put(ts, value);
}
-
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-9657. NetUtils.wrapException to have special handling for 0.0.0.0 addresses and :0 ports. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/branch-3.0 107afed84 -> 5be228e43
HADOOP-9657. NetUtils.wrapException to have special handling for 0.0.0.0
addresses and :0 ports. Contributed by Varun Saxena.
(cherry picked from commit 67e7673750e731f5ecfa84e82b84b7fc7ee0b233)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5be228e4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5be228e4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5be228e4
Branch: refs/heads/branch-3.0
Commit: 5be228e43b0f12f8c319b93312be8106e2900c27
Parents: 107afed
Author: Varun Saxena
Authored: Wed Oct 25 03:06:12 2017 +0530
Committer: Varun Saxena
Committed: Wed Oct 25 03:22:18 2017 +0530
--
.../java/org/apache/hadoop/net/NetUtils.java| 33 +---
1 file changed, 21 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5be228e4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
index 8577336..4697320 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
@@ -742,18 +742,27 @@ public class NetUtils {
+ ";"
+ see("BindException"));
} else if (exception instanceof ConnectException) {
- // connection refused; include the host:port in the error
- return wrapWithMessage(exception,
- "Call From "
- + localHost
- + " to "
- + destHost
- + ":"
- + destPort
- + " failed on connection exception: "
- + exception
- + ";"
- + see("ConnectionRefused"));
+ // Check if client was trying to connect to an unspecified IPv4 address
+ // (0.0.0.0) or IPv6 address(0:0:0:0:0:0:0:0 or ::)
+ if ((destHost != null && (destHost.equals("0.0.0.0") ||
+ destHost.equals("0:0:0:0:0:0:0:0") || destHost.equals("::")))
+ || destPort == 0) {
+return wrapWithMessage(exception, "Your endpoint configuration" +
+" is wrong;" + see("UnsetHostnameOrPort"));
+ } else {
+// connection refused; include the host:port in the error
+return wrapWithMessage(exception,
+"Call From "
++ localHost
++ " to "
++ destHost
++ ":"
++ destPort
++ " failed on connection exception: "
++ exception
++ ";"
++ see("ConnectionRefused"));
+ }
} else if (exception instanceof UnknownHostException) {
return wrapWithMessage(exception,
"Invalid host name: "
-
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-9657. NetUtils.wrapException to have special handling for 0.0.0.0 addresses and :0 ports. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 f6d3c101a -> 0c8a2c260
HADOOP-9657. NetUtils.wrapException to have special handling for 0.0.0.0
addresses and :0 ports. Contributed by Varun Saxena.
(cherry picked from commit 67e7673750e731f5ecfa84e82b84b7fc7ee0b233)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0c8a2c26
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0c8a2c26
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0c8a2c26
Branch: refs/heads/branch-2
Commit: 0c8a2c26098c8a3f77e4770391b4fc3e1c0245a5
Parents: f6d3c10
Author: Varun Saxena
Authored: Wed Oct 25 03:06:12 2017 +0530
Committer: Varun Saxena
Committed: Wed Oct 25 03:09:07 2017 +0530
--
.../java/org/apache/hadoop/net/NetUtils.java| 33 +---
1 file changed, 21 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c8a2c26/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
index 8577336..4697320 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
@@ -742,18 +742,27 @@ public class NetUtils {
+ ";"
+ see("BindException"));
} else if (exception instanceof ConnectException) {
- // connection refused; include the host:port in the error
- return wrapWithMessage(exception,
- "Call From "
- + localHost
- + " to "
- + destHost
- + ":"
- + destPort
- + " failed on connection exception: "
- + exception
- + ";"
- + see("ConnectionRefused"));
+ // Check if client was trying to connect to an unspecified IPv4 address
+ // (0.0.0.0) or IPv6 address(0:0:0:0:0:0:0:0 or ::)
+ if ((destHost != null && (destHost.equals("0.0.0.0") ||
+ destHost.equals("0:0:0:0:0:0:0:0") || destHost.equals("::")))
+ || destPort == 0) {
+return wrapWithMessage(exception, "Your endpoint configuration" +
+" is wrong;" + see("UnsetHostnameOrPort"));
+ } else {
+// connection refused; include the host:port in the error
+return wrapWithMessage(exception,
+"Call From "
++ localHost
++ " to "
++ destHost
++ ":"
++ destPort
++ " failed on connection exception: "
++ exception
++ ";"
++ see("ConnectionRefused"));
+ }
} else if (exception instanceof UnknownHostException) {
return wrapWithMessage(exception,
"Invalid host name: "
-
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-9657. NetUtils.wrapException to have special handling for 0.0.0.0 addresses and :0 ports. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/trunk 03af442e7 -> 67e767375
HADOOP-9657. NetUtils.wrapException to have special handling for 0.0.0.0
addresses and :0 ports. Contributed by Varun Saxena.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/67e76737
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/67e76737
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/67e76737
Branch: refs/heads/trunk
Commit: 67e7673750e731f5ecfa84e82b84b7fc7ee0b233
Parents: 03af442
Author: Varun Saxena
Authored: Wed Oct 25 03:06:12 2017 +0530
Committer: Varun Saxena
Committed: Wed Oct 25 03:06:12 2017 +0530
--
.../java/org/apache/hadoop/net/NetUtils.java| 33 +---
1 file changed, 21 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/67e76737/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
index 8577336..4697320 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
@@ -742,18 +742,27 @@ public class NetUtils {
+ ";"
+ see("BindException"));
} else if (exception instanceof ConnectException) {
- // connection refused; include the host:port in the error
- return wrapWithMessage(exception,
- "Call From "
- + localHost
- + " to "
- + destHost
- + ":"
- + destPort
- + " failed on connection exception: "
- + exception
- + ";"
- + see("ConnectionRefused"));
+ // Check if client was trying to connect to an unspecified IPv4 address
+ // (0.0.0.0) or IPv6 address(0:0:0:0:0:0:0:0 or ::)
+ if ((destHost != null && (destHost.equals("0.0.0.0") ||
+ destHost.equals("0:0:0:0:0:0:0:0") || destHost.equals("::")))
+ || destPort == 0) {
+return wrapWithMessage(exception, "Your endpoint configuration" +
+" is wrong;" + see("UnsetHostnameOrPort"));
+ } else {
+// connection refused; include the host:port in the error
+return wrapWithMessage(exception,
+"Call From "
++ localHost
++ " to "
++ destHost
++ ":"
++ destPort
++ " failed on connection exception: "
++ exception
++ ";"
++ see("ConnectionRefused"));
+ }
} else if (exception instanceof UnknownHostException) {
return wrapWithMessage(exception,
"Invalid host name: "
-
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
Repository: hadoop Updated Branches: refs/heads/YARN-7055 [created] b016f08f6 - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[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)
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 licenses this file
+ * to you under the Apac
[hadoop] Git Push Summary
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)
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
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
@@ -27,7 +27,7 @@ export default E
[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.
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({
this.selectedCategory = 0;
this.didInsertElement(
[hadoop] Git Push Summary
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.
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)
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
--
diff --git
a/hadoop-yarn-pr
[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.
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
src/main/webapp/.jshintrc
src/main/webapp/.watchmanc
[25/50] [abbrv] hadoop git commit: YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by Akhil P B.
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
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converte
[03/50] [abbrv] hadoop git commit: YARN-5772. [YARN-3368] Replace old Hadoop logo with new one (Akhil P B Tan via Sunil G)
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.
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
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.
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'),
+ remainingTimeoutInSeconds: DS.attr('number'),
+ applicationExpiryT
[10/50] [abbrv] hadoop git commit: YARN-5503. [YARN-3368] Add missing hidden files in webapp folder for deployment (Sreenath Somarajapuram via Sunil G)
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 default. The data is completely
+anonymous, bu
[11/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix javadocs. (Sunil G via wangda)
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.
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))
.attr("width", this.SAMPLE_CELL_WIDTH)
-.attr("h
[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.
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
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
b/h
[41/50] [abbrv] hadoop git commit: YARN-7022. Improve click interaction in queue topology in new YARN UI. Contributed by Abdullah Yousufi.
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.
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',
+ headerTitle: 'AM Node ID',
+ contentPath: 'amNod
[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.
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
[28/50] [abbrv] hadoop git commit: YARN-5912. Fix breadcrumb issues for various pages in new YARN UI. Contributed by Akhil P B.
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 100644
---
a/hadoop-yarn-project/hadoop-yarn/had
[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
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 AbstractAdapter.extend({
serverName: "NM",
urlForFindRecor
[36/50] [abbrv] hadoop git commit: Fixing checktyle warnings during rebase
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, showLabels = false,
+ renderDonutChart: function(da
[44/50] [abbrv] hadoop git commit: YARN-6635. Refactor yarn-app pages in new YARN UI. Contributed by Akhil PB.
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
@@ -34,10 +34,10 @@ export default Ember.Control
[47/50] [abbrv] hadoop git commit: Updating dependencies to work on branch-2
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.
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: payload.hadoopBuildVersion
}
http://git-wip-us.apache.
[26/50] [abbrv] hadoop git commit: YARN-5866. Fix few issues reported by jshint in new YARN UI. Contributed by Akhil P B.
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 +- 71 files changed, 313 insertions(+), 35
[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.
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
[42/50] [abbrv] hadoop git commit: YARN-5146. Support for Fair Scheduler in new YARN UI. Contributed by Abdullah Yousufi.
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
--
diff --git
a/hadoop-yarn-project/hadoop-
[50/50] [abbrv] hadoop git commit: YARN-7075. Better styling for donut charts in new YARN UI. Contributed by Da Ding.
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.
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 + .../app/templates/yarn-flowrun/metrics.hbs | 34 +++ ...
[29/50] [abbrv] hadoop git commit: YARN-5335. Use em-table in app/nodes pages for new YARN UI. Contributed by Sunil G.
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 innerRadius = outerRadius * 0.618;
-console.
[46/50] [abbrv] hadoop git commit: YARN-6631. Refactor loader.js in new Yarn UI. Contributed by Akhil P B.
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
[38/50] [abbrv] hadoop git commit: YARN-5705. Show timeline data from ATS v2 in new web UI. Contributed by Akhil PB.
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
a/hadoop-yarn-project/hadoop
[32/50] [abbrv] hadoop git commit: YARN-6184. Introduce loading icon in each page of new YARN UI. Contributed by Akhil PB.
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
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-
[45/50] [abbrv] hadoop git commit: YARN-6386. Show decommissioning nodes in new YARN UI. Contributed by Elek Marton.
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 @@
+
+
+
+
+ Node Managers
+
[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)
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.
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 from 'em-table/utils/column-definition';
+impor
[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)
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
[09/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix ASF warnings. (Wangda Tan via Sunil G)
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 differ http://git-wip-us.apache.org/repos/asf/ha
[13/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to remove unwanted files from rat exclusions. (Wangda Tan via Sunil G)
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)
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
[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)
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
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.
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)
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, e-mail: common-commits-unsubscr...@hadoop.a
[06/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix license. (Wangda Tan via Sunil G)
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 v1.2.1 +ember-cli-release v0.2.8 +ember-cli-shims v0.0.6 +ember-cli-sri v1.2.1 +ember-cli-test-loader v0.2.1 +ember-cli-uglify v1.2.0 +ember-d3 v0.1.0 +ember-data v2.1.0 +ember-disable-proxy-controllers v1.0.1 +ember-e
[08/50] [abbrv] hadoop git commit: YARN-5583. [YARN-3368] Fix wrong paths in .gitignore (Sreenath Somarajapuram via Sunil G)
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)
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
target/staging/hadoop-project/hadoop-project-dist/hadoop-
[12/50] [abbrv] hadoop git commit: YARN-5779. [YARN-3368] Document limits/notes of the new YARN UI (Wangda Tan via Sunil G)
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
[02/50] [abbrv] hadoop git commit: YARN-4849. Addendum patch to fix document. (Wangda Tan via Sunil G)
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
[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)
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
[hadoop] Git Push Summary
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
[hadoop] Git Push Summary
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
[hadoop] Git Push Summary
Repository: hadoop Updated Tags: refs/tags/YARN-5355_branch2-2017-10-17 [created] 56e0873e2 - 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: Fix javac, javadoc and checkstyle issues before branch-2 merge.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/56e0873e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java
index 915d2f2..476959c 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServices.java
@@ -59,6 +59,9 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.client.urlconnection.HttpURLConnectionFactory;
import com.sun.jersey.client.urlconnection.URLConnectionClientHandler;
+/**
+ * Test TimelineReder Web Service REST API's using filesystem storage.
+ */
public class TestTimelineReaderWebServices {
private static final String ROOT_DIR = new File("target",
http://git-wip-us.apache.org/repos/asf/hadoop/blob/56e0873e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesUtils.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesUtils.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesUtils.java
index b2837c2..13e129e 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesUtils.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesUtils.java
@@ -35,6 +35,9 @@ import org.junit.Test;
import com.google.common.collect.Sets;
+/**
+ * Tests helper methods in {@link TimelineReaderWebServicesUtils}.
+ */
public class TestTimelineReaderWebServicesUtils {
private static void verifyFilterList(String expr, TimelineFilterList list,
TimelineFilterList expectedList) throws Exception {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/56e0873e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineUIDConverter.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineUIDConverter.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineUIDConverter.java
index 12b3fc0..a720a2d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineUIDConverter.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineUIDConverter.java
@@ -24,6 +24,9 @@ import static org.junit.Assert.fail;
import org.junit.Test;
+/**
+ * Tests Timeline UIDs' encoding and decoding.
+ */
public class TestTimelineUIDConverter {
@Test
http://git-wip-us.apache.org/repos/asf/hadoop/blob/56e0873e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineReaderImpl.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineReaderImpl.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/ap
[31/50] [abbrv] hadoop git commit: YARN-6905 Multiple HBaseTimelineStorage test failures due to missing FastNumberFormat (Contributed by Haibo Chen)
YARN-6905 Multiple HBaseTimelineStorage test failures due to missing
FastNumberFormat (Contributed by Haibo Chen)
(cherry picked from commit 608a06cca5d68b3155bd70a94bf29ae0942b9ca0)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/HBaseTimelineStorageUtils.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a2598434
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a2598434
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a2598434
Branch: refs/heads/YARN-5355_branch2
Commit: a2598434ed9b2414e6028e5b2c1303419ebbf4ad
Parents: 78a6ecc
Author: Vrushali C
Authored: Mon Aug 14 11:40:27 2017 -0700
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:40 2017 +0530
--
.../storage/TestHBaseTimelineStorageApps.java | 4 +-
.../TestHBaseTimelineStorageEntities.java | 13 ---
.../storage/common/AppIdKeyConverter.java | 3 +-
.../common/HBaseTimelineStorageUtils.java | 34 +
.../TestCustomApplicationIdConversion.java | 39
5 files changed, 86 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2598434/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java
index 65c7034..111008a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageApps.java
@@ -71,6 +71,7 @@ import
org.apache.hadoop.yarn.server.timelineservice.storage.application.Applica
import
org.apache.hadoop.yarn.server.timelineservice.storage.application.ApplicationTable;
import
org.apache.hadoop.yarn.server.timelineservice.storage.common.EventColumnName;
import
org.apache.hadoop.yarn.server.timelineservice.storage.common.EventColumnNameConverter;
+import
org.apache.hadoop.yarn.server.timelineservice.storage.common.HBaseTimelineStorageUtils;
import
org.apache.hadoop.yarn.server.timelineservice.storage.common.KeyConverter;
import org.apache.hadoop.yarn.server.timelineservice.storage.common.Separator;
import
org.apache.hadoop.yarn.server.timelineservice.storage.common.StringKeyConverter;
@@ -499,7 +500,8 @@ public class TestHBaseTimelineStorageApps {
event.addInfo(expKey, expVal);
final TimelineEntity entity = new ApplicationEntity();
-entity.setId(ApplicationId.newInstance(0, 1).toString());
+entity.setId(HBaseTimelineStorageUtils.convertApplicationIdToString(
+ApplicationId.newInstance(0, 1)));
entity.addEvent(event);
TimelineEntities entities = new TimelineEntities();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2598434/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java
index 422316b..ae8f821 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestHBaseTimelineStorageEntities.java
+++
b/hadoop
[22/50] [abbrv] hadoop git commit: YARN-6861. Reader API for sub application entities (Rohith Sharma K S via Varun Saxena)
YARN-6861. Reader API for sub application entities (Rohith Sharma K S via Varun
Saxena)
(cherry picked from commit 73ee0d4fc05354527a4be6db9e5b83d06fc94047)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/186c99c6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/186c99c6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/186c99c6
Branch: refs/heads/YARN-5355_branch2
Commit: 186c99c6ccb31086e854d3bf580a99363aa91c32
Parents: 5c970f7
Author: Varun Saxena
Authored: Sun Aug 20 00:35:14 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
...stTimelineReaderWebServicesHBaseStorage.java | 104 ++--
.../storage/reader/GenericEntityReader.java | 4 +-
.../reader/SubApplicationEntityReader.java | 488 +++
.../reader/TimelineEntityReaderFactory.java | 3 +
.../reader/TimelineReaderContext.java | 19 +-
.../reader/TimelineReaderManager.java | 9 +-
.../reader/TimelineReaderWebServices.java | 158 ++
.../reader/TimelineReaderWebServicesUtils.java | 10 +
.../reader/TimelineUIDConverter.java| 35 ++
.../reader/TestTimelineUIDConverter.java| 9 +
10 files changed, 787 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/186c99c6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java
index 4f6ba03..6b4f014 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/TestTimelineReaderWebServicesHBaseStorage.java
@@ -71,6 +71,7 @@ public class TestTimelineReaderWebServicesHBaseStorage
private static long ts = System.currentTimeMillis();
private static long dayTs =
HBaseTimelineStorageUtils.getTopOfTheDayTimestamp(ts);
+ private static String doAsUser = "remoteuser";
@BeforeClass
public static void setupBeforeClass() throws Exception {
@@ -337,7 +338,7 @@ public class TestTimelineReaderWebServicesHBaseStorage
HBaseTimelineWriterImpl hbi = null;
Configuration c1 = getHBaseTestingUtility().getConfiguration();
UserGroupInformation remoteUser =
-UserGroupInformation.createRemoteUser(user);
+UserGroupInformation.createRemoteUser(doAsUser);
try {
hbi = new HBaseTimelineWriterImpl();
hbi.init(c1);
@@ -2251,60 +2252,69 @@ public class TestTimelineReaderWebServicesHBaseStorage
public void testGenericEntitiesForPagination() throws Exception {
Client client = createClient();
try {
- int limit = 10;
- String queryParam = "?limit=" + limit;
String resourceUri = "http://localhost:"; + getServerPort() + "/ws/v2/"
+ "timeline/clusters/cluster1/apps/application_11_/"
+ "entities/entitytype";
- URI uri = URI.create(resourceUri + queryParam);
-
- ClientResponse resp = getResponse(client, uri);
- List entities =
- resp.getEntity(new GenericType>() {
- });
- // verify for entity-10 to entity-1 in descending order.
- verifyPaginatedEntites(entities, limit, limit);
-
- limit = 4;
- queryParam = "?limit=" + limit;
- uri = URI.create(resourceUri + queryParam);
- resp = getResponse(client, uri);
- entities = resp.getEntity(new GenericType>() {
- });
- // verify for entity-10 to entity-7 in descending order.
- TimelineEntity entity = verifyPaginatedEntites(entities, limit, 10);
-
- queryParam = "?limit=" + limit + "&fromid="
- + entity.getInfo().get(TimelineReaderUtils.FROMID_KEY);
- uri = URI.create(resourceUri + queryParam);
- resp = getResponse(client, uri);
- entities = resp.getEntity(new GenericType>() {
- });
- // verify for entity-7 to entity-4 in descending order.
- entity = verifyPaginatedEntites(entities, limit, 7);
-
[33/50] [abbrv] hadoop git commit: YARN-7140. CollectorInfo should have Public visibility. Contributed by Varun Saxena.
YARN-7140. CollectorInfo should have Public visibility. Contributed by Varun
Saxena.
(cherry picked from commit 4a83170be477e6f39f134207f74084888174e96b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/138d6fc0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/138d6fc0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/138d6fc0
Branch: refs/heads/YARN-5355_branch2
Commit: 138d6fc08365d4ff473cdca91d164229cd491a95
Parents: 95f45b8
Author: Rohith Sharma K S
Authored: Fri Sep 8 20:23:16 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:40 2017 +0530
--
.../org/apache/hadoop/yarn/api/records/CollectorInfo.java| 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/138d6fc0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/CollectorInfo.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/CollectorInfo.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/CollectorInfo.java
index d22b9fb..30450d6 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/CollectorInfo.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/CollectorInfo.java
@@ -18,16 +18,16 @@
package org.apache.hadoop.yarn.api.records;
-import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.classification.InterfaceAudience.Private;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.yarn.util.Records;
/**
* Collector info containing collector address and collector token passed from
* RM to AM in Allocate Response.
*/
-@Private
-@InterfaceStability.Unstable
+@Public
+@Evolving
public abstract class CollectorInfo {
protected static final long DEFAULT_TIMESTAMP_VALUE = -1;
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[50/50] [abbrv] hadoop git commit: YARN-7130. ATSv2 documentation changes post merge. Contributed by Varun Saxena.
YARN-7130. ATSv2 documentation changes post merge. Contributed by Varun Saxena. (cherry picked from commit 0bfb3a256612aa54437ee9c8c928c3c41d69fc52) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/27019b5a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/27019b5a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/27019b5a Branch: refs/heads/YARN-5355_branch2 Commit: 27019b5a66c5c15b770cfc5a34eddd58f8bef942 Parents: 138d6fc Author: Rohith Sharma K S Authored: Fri Sep 8 20:21:50 2017 +0530 Committer: Varun Saxena Committed: Tue Oct 17 23:36:41 2017 +0530 -- .../hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/27019b5a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md index 86030e0..6a0971a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md @@ -412,13 +412,13 @@ Service v.2. Note that currently you need to be on the cluster to be able to wri Service. For example, an application master or code in the container can write to the Timeline Service, while an off-cluster MapReduce job submitter cannot. -After creating the timeline v2 client, user also needs to set the timeline collector address for the application. If `AMRMClient` is used then by registering the timeline client by calling `AMRMClient#registerTimelineV2Client` is sufficient. +After creating the timeline v2 client, user also needs to set the timeline collector info which contains the collector address and collector token(only in secure mode) for the application. If `AMRMClient` is used then by registering the timeline client by calling `AMRMClient#registerTimelineV2Client` is sufficient. amRMClient.registerTimelineV2Client(timelineClient); Else address needs to be retrieved from the AM allocate response and need to be set in timeline client explicitly. -timelineClient.setTimelineServiceAddress(response.getCollectorAddr()); +timelineClient.setTimelineCollectorInfo(response.getCollectorInfo()); You can create and publish your own entities, events, and metrics as with previous versions. - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[05/50] [abbrv] hadoop git commit: YARN-6658. Remove columnFor() methods of Columns in HBaseTimeline backend (Haibo Chen via Varun Saxena)
YARN-6658. Remove columnFor() methods of Columns in HBaseTimeline backend
(Haibo Chen via Varun Saxena)
(cherry picked from commit f7cba98504a5e968bb6ae976d20b71c84a4664f2)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/apptoflow/AppToFlowColumn.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/473f2f00
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/473f2f00
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/473f2f00
Branch: refs/heads/YARN-5355_branch2
Commit: 473f2f00ee4c30157b9f9f64486c3218241f9875
Parents: d530386
Author: Varun Saxena
Authored: Wed May 31 10:14:35 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:38 2017 +0530
--
.../storage/application/ApplicationColumn.java | 48 -
.../application/ApplicationColumnPrefix.java| 52 --
.../storage/entity/EntityColumn.java| 48 -
.../storage/entity/EntityColumnPrefix.java | 51 --
.../storage/flow/FlowActivityColumnPrefix.java | 56
.../storage/flow/FlowRunColumn.java | 51 --
.../storage/flow/FlowRunColumnPrefix.java | 51 --
7 files changed, 357 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/473f2f00/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/application/ApplicationColumn.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/application/ApplicationColumn.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/application/ApplicationColumn.java
index dde3911..00eaa7e 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/application/ApplicationColumn.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/application/ApplicationColumn.java
@@ -105,52 +105,4 @@ public enum ApplicationColumn implements
Column {
return column.getValueConverter();
}
- /**
- * Retrieve an {@link ApplicationColumn} given a name, or null if there is no
- * match. The following holds true: {@code columnFor(x) == columnFor(y)} if
- * and only if {@code x.equals(y)} or {@code (x == y == null)}.
- *
- * @param columnQualifier Name of the column to retrieve
- * @return the corresponding {@link ApplicationColumn} or null
- */
- public static final ApplicationColumn columnFor(String columnQualifier) {
-
-// Match column based on value, assume column family matches.
-for (ApplicationColumn ac : ApplicationColumn.values()) {
- // Find a match based only on name.
- if (ac.getColumnQualifier().equals(columnQualifier)) {
-return ac;
- }
-}
-
-// Default to null
-return null;
- }
-
- /**
- * Retrieve an {@link ApplicationColumn} given a name, or null if there is no
- * match. The following holds true: {@code columnFor(a,x) == columnFor(b,y)}
- * if and only if {@code a.equals(b) & x.equals(y)} or
- * {@code (x == y == null)}
- *
- * @param columnFamily The columnFamily for which to retrieve the column.
- * @param name Name of the column to retrieve
- * @return the corresponding {@link ApplicationColumn} or null if both
- * arguments don't match.
- */
- public static final ApplicationColumn columnFor(
- ApplicationColumnFamily columnFamily, String name) {
-
-for (ApplicationColumn ac : ApplicationColumn.values()) {
- // Find a match based column family and on name.
- if (ac.columnFamily.equals(columnFamily)
- && ac.getColumnQualifier().equals(name)) {
-return ac;
- }
-}
-
-// Default to null
-return null;
- }
-
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/473f2f00/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/application/ApplicationColumnPrefix.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservi
[26/50] [abbrv] hadoop git commit: YARN-5647. [ATSv2 Security] Collector side changes for loading auth filters and principals. Contributed by Varun Saxena
YARN-5647. [ATSv2 Security] Collector side changes for loading auth filters and principals. Contributed by Varun Saxena (cherry picked from commit 79dae624793164cd4692c86992a511310145858a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9577900a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9577900a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9577900a Branch: refs/heads/YARN-5355_branch2 Commit: 9577900a911001908d4ca7f4e8ca75db4feedcfa Parents: c8db08d Author: Jian He Authored: Wed Jun 7 13:45:34 2017 -0700 Committer: Varun Saxena Committed: Tue Oct 17 23:36:39 2017 +0530 -- .../ApplicationHistoryServer.java | 79 ++--- .../security/TimelineAuthenticationFilter.java | 49 --- ...TimelineAuthenticationFilterInitializer.java | 129 --- ...lineDelegationTokenSecretManagerService.java | 240 -- ...neV1DelegationTokenSecretManagerService.java | 225 + .../TestTimelineAuthenticationFilter.java | 323 -- .../TestTimelineAuthenticationFilterForV1.java | 332 +++ ...TimelineAuthenticationFilterInitializer.java | 76 - .../security/TimelineAuthenticationFilter.java | 55 +++ ...TimelineAuthenticationFilterInitializer.java | 129 +++ ...elineDelgationTokenSecretManagerService.java | 83 + .../server/timeline/security/package-info.java | 26 ++ .../util/timeline/TimelineServerUtils.java | 92 + .../yarn/server/util/timeline/package-info.java | 25 ++ ...TimelineAuthenticationFilterInitializer.java | 76 + .../collector/NodeTimelineCollectorManager.java | 66 +++- .../PerNodeTimelineCollectorsAuxService.java| 5 +- .../collector/TimelineCollectorManager.java | 6 +- ...neV2DelegationTokenSecretManagerService.java | 78 + .../timelineservice/security/package-info.java | 25 ++ 20 files changed, 1227 insertions(+), 892 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9577900a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java index 1c10117..9a2046b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java @@ -20,14 +20,14 @@ package org.apache.hadoop.yarn.server.applicationhistoryservice; import java.io.IOException; import java.net.InetSocketAddress; -import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.Set; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.http.HttpServer2; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.metrics2.source.JvmMetrics; -import org.apache.hadoop.security.AuthenticationFilterInitializer; import org.apache.hadoop.security.HttpCrossOriginFilterInitializer; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.service.CompositeService; @@ -47,10 +47,9 @@ import org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore; import org.apache.hadoop.yarn.server.timeline.TimelineDataManager; import org.apache.hadoop.yarn.server.timeline.TimelineStore; import org.apache.hadoop.yarn.server.timeline.security.TimelineACLsManager; -import org.apache.hadoop.yarn.server.timeline.security.TimelineAuthenticationFilter; -import org.apache.hadoop.yarn.server.timeline.security.TimelineAuthenticationFilterInitializer; -import org.apache.hadoop.yarn.server.timeline.security.TimelineDelegationTokenSecretManagerService; +import org.apache.hadoop.yarn.server.timeline.security.TimelineV1DelegationTokenSecretManagerService; import org.apache.hadoop.yarn.server.timeline.webapp.CrossOriginFilterInitializer; +import org.apache.hadoop.yarn.server.util.timeline.TimelineServerUtils; import org.apache.hadoop.yarn.webapp.WebApp; import org.apache.hadoop.yarn.webapp.WebApps; impor
[27/50] [abbrv] hadoop git commit: Addendum for YARN-5648.
Addendum for YARN-5648.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cb5d601b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cb5d601b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cb5d601b
Branch: refs/heads/YARN-5355_branch2
Commit: cb5d601b2e861cee26e6941e0249f940f361a0fb
Parents: 8e4e5ab
Author: Varun Saxena
Authored: Tue Aug 1 19:04:09 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
.../yarn/client/api/impl/TimelineV2ClientImpl.java | 4 ++--
.../hadoop/yarn/server/TestRMNMSecretKeys.java | 17 +++--
.../security/TestTimelineAuthFilterForV2.java | 4 ++--
3 files changed, 19 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb5d601b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java
index cd30d98..ad869e3 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineV2ClientImpl.java
@@ -203,8 +203,8 @@ public class TimelineV2ClientImpl extends TimelineV2Client {
.put(ClientResponse.class, obj);
}
- protected void putObjects(URI base, String path,
- MultivaluedMap params, Object obj)
+ protected void putObjects(final URI base, final String path,
+ final MultivaluedMap params, final Object obj)
throws IOException, YarnException {
ClientResponse resp = null;
try {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb5d601b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java
index ba14491..56872d3 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java
@@ -19,7 +19,11 @@
package org.apache.hadoop.yarn.server;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
import java.util.UUID;
import org.junit.AfterClass;
@@ -35,7 +39,6 @@ import
org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerResp
import org.apache.hadoop.yarn.server.api.records.MasterKey;
import org.apache.hadoop.yarn.server.resourcemanager.MockNM;
import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
-import org.apache.kerby.util.IOUtil;
import org.junit.Test;
public class TestRMNMSecretKeys {
@@ -59,10 +62,20 @@ public class TestRMNMSecretKeys {
"kdc = localhost:88\n}\n" +
"[domain_realm]\n" +
"localhost = APACHE.ORG";
-IOUtil.writeFile(content, krb5ConfFile);
+writeFile(content, krb5ConfFile);
System.setProperty(KRB5_CONF, krb5ConfFile.getAbsolutePath());
}
+ private static void writeFile(String content, File file) throws IOException {
+ FileOutputStream outputStream = new FileOutputStream(file);
+ FileChannel fc = outputStream.getChannel();
+
+ ByteBuffer buffer =
+ ByteBuffer.wrap(content.getBytes(StandardCharsets.UTF_8));
+ fc.write(buffer);
+ outputStream.close();
+ }
+
@AfterClass
public static void tearDown() throws IOException {
KRB5_CONF_ROOT_DIR.delete();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb5d601b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/s
[48/50] [abbrv] hadoop git commit: Fix javac, javadoc and checkstyle issues before branch-2 merge.
Fix javac, javadoc and checkstyle issues before branch-2 merge. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/56e0873e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/56e0873e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/56e0873e Branch: refs/heads/YARN-5355_branch2 Commit: 56e0873e22a6a6fc9c00ac3fcd0d4bec6b08 Parents: 8b98dba Author: Varun Saxena Authored: Tue Oct 17 23:35:42 2017 +0530 Committer: Varun Saxena Committed: Tue Oct 17 23:36:41 2017 +0530 -- .../v2/app/rm/TestRMContainerAllocator.java | 13 +-- .../TaskAttemptUnsuccessfulCompletionEvent.java | 4 ++-- .../mapreduce/SimpleEntityWriterConstants.java | 15 +++-- .../hadoop/mapreduce/SimpleEntityWriterV1.java | 13 ++- .../hadoop/mapreduce/SimpleEntityWriterV2.java | 16 -- .../timelineservice/TestTimelineMetric.java | 14 +++- .../yarn/client/api/TimelineV2Client.java | 1 - .../yarn/client/api/impl/TimelineConnector.java | 4 ++-- .../src/main/resources/yarn-default.xml | 2 +- .../TestTimelineServiceRecords.java | 4 +++- .../client/api/impl/TestTimelineClient.java | 7 +++--- .../api/impl/TestTimelineClientV2Impl.java | 3 +++ .../yarn/util/TestTimelineServiceHelper.java| 3 +++ .../api/CollectorNodemanagerProtocolPB.java | 3 +++ ...ollectorNodemanagerProtocolPBClientImpl.java | 3 +++ .../server/api/impl/pb/client/package-info.java | 23 ...llectorNodemanagerProtocolPBServiceImpl.java | 3 +++ .../hadoop/yarn/server/api/package-info.java| 23 .../GetTimelineCollectorContextRequest.java | 5 + .../GetTimelineCollectorContextResponse.java| 6 + .../ReportNewCollectorInfoRequest.java | 6 + .../ReportNewCollectorInfoResponse.java | 3 +++ ...etTimelineCollectorContextRequestPBImpl.java | 4 ...tTimelineCollectorContextResponsePBImpl.java | 4 .../pb/ReportNewCollectorInfoRequestPBImpl.java | 4 .../ReportNewCollectorInfoResponsePBImpl.java | 4 .../protocolrecords/impl/pb/package-info.java | 22 +++ .../server/api/records/AppCollectorData.java| 5 - .../records/impl/pb/AppCollectorDataPBImpl.java | 3 +++ ...TimelineAuthenticationFilterInitializer.java | 5 +++-- .../java/org/apache/hadoop/yarn/TestRPC.java| 8 +-- ...TimelineAuthenticationFilterInitializer.java | 4 +++- .../containermanager/ContainerManagerImpl.java | 3 +++ .../monitor/ContainersMonitorImpl.java | 3 +++ .../security/authorize/NMPolicyProvider.java| 21 +- .../TestNMTimelinePublisher.java| 6 + .../ApplicationMasterService.java | 1 - .../resourcemanager/DefaultAMSProcessor.java| 1 - .../TestSystemMetricsPublisherForV2.java| 3 +++ .../hadoop/yarn/server/TestRMNMSecretKeys.java | 12 +- .../TestTimelineServiceClientIntegration.java | 3 +++ ...stTimelineReaderWebServicesHBaseStorage.java | 2 +- .../storage/common/TestSeparator.java | 4 ...neReaderAuthenticationFilterInitializer.java | 2 +- .../timelineservice/storage/TimelineReader.java | 4 ++-- .../TestAppLevelTimelineCollector.java | 23 .../TestNMTimelineCollectorManager.java | 3 +++ ...TestPerNodeTimelineCollectorsAuxService.java | 4 .../collector/TestTimelineCollector.java| 3 +++ .../reader/TestTimelineReaderServer.java| 3 +++ .../reader/TestTimelineReaderUtils.java | 3 +++ .../reader/TestTimelineReaderWebServices.java | 3 +++ .../TestTimelineReaderWebServicesUtils.java | 3 +++ .../reader/TestTimelineUIDConverter.java| 3 +++ .../TestFileSystemTimelineReaderImpl.java | 3 +++ .../TestFileSystemTimelineWriterImpl.java | 3 +++ 56 files changed, 256 insertions(+), 100 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/56e0873e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java -- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java index 8f51e35..4ee0a14 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java +++ b/hado
[19/50] [abbrv] hadoop git commit: YARN-7006. [ATSv2 Security] Changes for authentication for CollectorNodemanagerProtocol. Contributed by Varun Saxena
YARN-7006. [ATSv2 Security] Changes for authentication for
CollectorNodemanagerProtocol. Contributed by Varun Saxena
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/55e57423
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/55e57423
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/55e57423
Branch: refs/heads/YARN-5355_branch2
Commit: 55e57423946521c6c8a2e8ee744676e00ce6f9d2
Parents: db2f7dd
Author: Jian He
Authored: Wed Aug 16 11:01:06 2017 -0700
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
.../collectormanager/NMCollectorService.java| 7 +-
.../containermanager/AuxServices.java | 3 +-
.../timelineservice/NMTimelinePublisher.java| 29 ++--
.../CollectorNodemanagerSecurityInfo.java | 69
.../org.apache.hadoop.security.SecurityInfo | 14
5 files changed, 112 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/55e57423/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/collectormanager/NMCollectorService.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/collectormanager/NMCollectorService.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/collectormanager/NMCollectorService.java
index 7fdca78..862cd1a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/collectormanager/NMCollectorService.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/collectormanager/NMCollectorService.java
@@ -72,13 +72,13 @@ public class NMCollectorService extends CompositeService
implements
Configuration serverConf = new Configuration(conf);
-// TODO Security settings.
YarnRPC rpc = YarnRPC.create(conf);
+// Kerberos based authentication to be used for CollectorNodemanager
+// protocol if security is enabled.
server =
rpc.getServer(CollectorNodemanagerProtocol.class, this,
-collectorServerAddress, serverConf,
-this.context.getNMTokenSecretManager(),
+collectorServerAddress, serverConf, null,
conf.getInt(YarnConfiguration.NM_COLLECTOR_SERVICE_THREAD_COUNT,
YarnConfiguration.DEFAULT_NM_COLLECTOR_SERVICE_THREAD_COUNT));
@@ -93,7 +93,6 @@ public class NMCollectorService extends CompositeService
implements
LOG.info("NMCollectorService started at " + collectorServerAddress);
}
-
@Override
public void serviceStop() throws Exception {
if (server != null) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/55e57423/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
index 2efc932..5e0f293 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java
@@ -244,7 +244,8 @@ public class AuxServices extends AbstractService
for (AuxiliaryService serv : serviceMap.values()) {
try {
serv.initializeContainer(new ContainerInitializationContext(
-event.getUser(), event.getContainer().getContainerId(),
+event.getContainer().getUser(),
+event.getContainer().getContainerId(),
event.getContainer().getResource(), event.getContainer()
.getContainerTokenIdentifier().getContainerType()));
} catch (Throwable th) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/55e57423/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apa
[14/50] [abbrv] hadoop git commit: YARN-6130. [ATSv2 Security] Generate a delegation token for AM when app collector is created and pass it to AM via NM and RM. Contributed by Varun Saxena.
YARN-6130. [ATSv2 Security] Generate a delegation token for AM when app
collector is created and pass it to AM via NM and RM. Contributed by Varun
Saxena.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5a7c272e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5a7c272e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5a7c272e
Branch: refs/heads/YARN-5355_branch2
Commit: 5a7c272e0ac80c897bfdded31dc8dd70fb4c7f7d
Parents: 5bda387
Author: Rohith Sharma K S
Authored: Fri Aug 11 12:35:35 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
.../v2/app/rm/RMContainerAllocator.java | 9 +-
.../app/local/TestLocalContainerAllocator.java | 2 +-
.../api/protocolrecords/AllocateResponse.java | 92 +---
.../hadoop/yarn/api/records/CollectorInfo.java | 55 +++
.../src/main/proto/yarn_protos.proto| 5 +
.../src/main/proto/yarn_service_protos.proto| 2 +-
.../api/async/impl/AMRMClientAsyncImpl.java | 6 +-
.../ApplicationMasterServiceProtoTestBase.java | 72 +
.../hadoop/yarn/client/ProtocolHATestBase.java | 22 ++-
...ationMasterServiceProtocolForTimelineV2.java | 71 +
...estApplicationMasterServiceProtocolOnHA.java | 46 +-
.../api/async/impl/TestAMRMClientAsync.java | 4 +-
.../impl/pb/AllocateResponsePBImpl.java | 37 -
.../records/impl/pb/CollectorInfoPBImpl.java| 148 +++
.../hadoop/yarn/api/TestPBImplRecords.java | 2 +
.../ReportNewCollectorInfoRequest.java | 5 +-
.../impl/pb/NodeHeartbeatRequestPBImpl.java | 25 +++-
.../impl/pb/NodeHeartbeatResponsePBImpl.java| 21 ++-
.../pb/ReportNewCollectorInfoRequestPBImpl.java | 4 +-
.../server/api/records/AppCollectorData.java| 27 +++-
.../records/impl/pb/AppCollectorDataPBImpl.java | 29 +++-
.../yarn_server_common_service_protos.proto | 2 +
.../java/org/apache/hadoop/yarn/TestRPC.java| 30 +++-
.../hadoop/yarn/TestYarnServerApiClasses.java | 4 +-
.../yarn/server/MockResourceManagerFacade.java | 9 +-
.../nodemanager/NodeStatusUpdaterImpl.java | 1 -
.../application/ApplicationImpl.java| 2 +-
.../ApplicationMasterService.java | 3 +-
.../resourcemanager/DefaultAMSProcessor.java| 7 +-
.../server/resourcemanager/rmapp/RMApp.java | 15 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 10 +-
.../applicationsmanager/MockAsm.java| 6 +
.../server/resourcemanager/rmapp/MockRMApp.java | 7 +-
.../TestTimelineServiceClientIntegration.java | 2 +-
.../security/TestTimelineAuthFilterForV2.java | 121 +++
.../collector/AppLevelTimelineCollector.java| 24 +++
.../AppLevelTimelineCollectorWithAgg.java | 4 +-
.../collector/NodeTimelineCollectorManager.java | 83 +--
.../PerNodeTimelineCollectorsAuxService.java| 7 +-
...neV2DelegationTokenSecretManagerService.java | 31
.../TestNMTimelineCollectorManager.java | 4 +-
41 files changed, 892 insertions(+), 164 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5a7c272e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
index 6b52a0e..67f8b29 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
@@ -860,13 +860,16 @@ public class RMContainerAllocator extends
RMContainerRequestor
handleUpdatedNodes(response);
handleJobPriorityChange(response);
// handle receiving the timeline collector address for this app
-String collectorAddr = response.getCollectorAddr();
+String collectorAddr = null;
+if (response.getCollectorInfo() != null) {
+ collectorAddr = response.getCollectorInfo().getCollectorAddr();
+}
+
MRAppMaster.RunningAppContext appContext =
(MRAppMaster.RunningAppContext)this.getContext();
if (collectorAddr != null && !collectorAddr.isEmpty()
&& appContext.getTimelineV2Client() != null) {
- appContext.getTimelineV2Client()
[21/50] [abbrv] hadoop git commit: YARN-7038. Addendum patch. Fix compilation error. Contributed by Varun Saxena
YARN-7038. Addendum patch. Fix compilation error. Contributed by Varun Saxena
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/53ddf1b1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/53ddf1b1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/53ddf1b1
Branch: refs/heads/YARN-5355_branch2
Commit: 53ddf1b15f5a8e04f6482aaafe3247ab9f7daa77
Parents: 4e1af68
Author: Jian He
Authored: Fri Aug 18 13:17:52 2017 -0700
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
.../server/nodemanager/timelineservice/NMTimelinePublisher.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/53ddf1b1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
index ee3ab02..d229c7a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/timelineservice/NMTimelinePublisher.java
@@ -403,7 +403,7 @@ public class NMTimelinePublisher extends CompositeService {
}
}
- public void createTimelineClient(ApplicationId appId) {
+ public void createTimelineClient(final ApplicationId appId) {
if (!appToClientMap.containsKey(appId)) {
try {
TimelineV2Client timelineClient =
-
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-6134. [ATSv2 Security] Regenerate delegation token for app just before token expires if app collector is active. Contributed by Varun Saxena
YARN-6134. [ATSv2 Security] Regenerate delegation token for app just before
token expires if app collector is active. Contributed by Varun Saxena
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5c970f7c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5c970f7c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5c970f7c
Branch: refs/heads/YARN-5355_branch2
Commit: 5c970f7c290b80783c9519827dad8b30f3311775
Parents: 5d9b4bd
Author: Jian He
Authored: Fri Aug 18 23:20:44 2017 -0700
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
.../security/TestTimelineAuthFilterForV2.java | 104 ++--
.../collector/AppLevelTimelineCollector.java| 35 --
.../collector/NodeTimelineCollectorManager.java | 118 ++-
...neV2DelegationTokenSecretManagerService.java | 11 ++
4 files changed, 222 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5c970f7c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
index 78c5c66..48b16d5 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.yarn.server.timelineservice.security;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -27,6 +28,7 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -51,6 +53,8 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authentication.KerberosTestUtils;
import
org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
+import org.apache.hadoop.security.token.Token;
+import
org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSecretManager;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity;
import org.apache.hadoop.yarn.client.api.TimelineV2Client;
@@ -190,6 +194,10 @@ public class TestTimelineAuthFilterForV2 {
// renewed automatically if app is still alive.
conf.setLong(
YarnConfiguration.TIMELINE_DELEGATION_TOKEN_RENEW_INTERVAL, 100);
+ // Set token max lifetime to 4 seconds to test if timeline delegation
+ // token for the app is regenerated automatically if app is still alive.
+ conf.setLong(
+ YarnConfiguration.TIMELINE_DELEGATION_TOKEN_MAX_LIFETIME, 4000);
}
UserGroupInformation.setConfiguration(conf);
collectorManager = new DummyNodeTimelineCollectorManager();
@@ -205,9 +213,8 @@ public class TestTimelineAuthFilterForV2 {
if (!withKerberosLogin) {
AppLevelTimelineCollector collector =
(AppLevelTimelineCollector)collectorManager.get(appId);
- org.apache.hadoop.security.token.Token
- token =
- collector.getDelegationTokenForApp();
+ Token token =
+ collector.getDelegationTokenForApp();
token.setService(new Text("localhost" + token.getService().toString().
substring(token.getService().toString().indexOf(":";
UserGroupInformation.getCurrentUser().addToken(token);
@@ -304,6 +311,20 @@ public class TestTimelineAuthFilterForV2 {
}
}
+ private boolean publishWithRetries(ApplicationId appId, File entityTypeDir,
+ String entityType, int numEntities) throws Exception {
+for (int i = 0; i < 10; i++) {
+ try {
+publishAndVerifyEntity(appId, entityTypeDir, entityType, numEntities);
+ } catch (YarnExc
[15/50] [abbrv] hadoop git commit: YARN-6874. Supplement timestamp for min start/max end time columns in flow run table to avoid overwrite (Vrushali C via Varun Saxena)
YARN-6874. Supplement timestamp for min start/max end time columns in flow run
table to avoid overwrite (Vrushali C via Varun Saxena)
(cherry picked from commit 7b2cb0614a04e6d0e2bc6dfd5095b7535dffa678)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5bda3875
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5bda3875
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5bda3875
Branch: refs/heads/YARN-5355_branch2
Commit: 5bda3875731398ce97158dcc0d77cd63105dc29c
Parents: 8d9d40a
Author: Varun Saxena
Authored: Thu Aug 10 11:01:19 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
.../yarn/server/timelineservice/storage/flow/FlowRunColumn.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5bda3875/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunColumn.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunColumn.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunColumn.java
index 7a39120..3797faf 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunColumn.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/flow/FlowRunColumn.java
@@ -76,7 +76,7 @@ public enum FlowRunColumn implements Column {
// Future-proof by ensuring the right column prefix hygiene.
this.columnQualifierBytes = Bytes.toBytes(Separator.SPACE
.encode(columnQualifier));
-this.column = new ColumnHelper(columnFamily, converter);
+this.column = new ColumnHelper(columnFamily, converter,
true);
}
/**
-
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: Addendum for YARN-6102.
Addendum for YARN-6102.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d9d40aa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d9d40aa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d9d40aa
Branch: refs/heads/YARN-5355_branch2
Commit: 8d9d40aa53315400b64b98733ea8fc26e0c37e0f
Parents: cb5d601
Author: Varun Saxena
Authored: Wed Aug 2 00:02:18 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
.../resourcemanager/RMActiveServiceContext.java | 21 +++---
.../server/resourcemanager/RMContextImpl.java | 23 ++--
.../resourcemanager/RMServiceContext.java | 11 ++
3 files changed, 25 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d9d40aa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.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/RMActiveServiceContext.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java
index 4844eba..9dc5945 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java
@@ -49,14 +49,13 @@ import
org.apache.hadoop.yarn.server.resourcemanager.security.DelegationTokenRen
import
org.apache.hadoop.yarn.server.resourcemanager.security.NMTokenSecretManagerInRM;
import
org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager;
import
org.apache.hadoop.yarn.server.resourcemanager.security.RMDelegationTokenSecretManager;
-import
org.apache.hadoop.yarn.server.resourcemanager.timelineservice.RMTimelineCollectorManager;
import org.apache.hadoop.yarn.util.Clock;
import org.apache.hadoop.yarn.util.SystemClock;
/**
- * The RMActiveServiceContext is the class that maintains all the
- * RMActiveService contexts.This is expected to be used only by ResourceManager
- * and RMContext.
+ * The RMActiveServiceContext is the class that maintains Active service
+ * context. Services that need to run only on the Active RM. This is expected
to
+ * be used only by RMContext.
*/
@Private
@Unstable
@@ -95,7 +94,6 @@ public class RMActiveServiceContext {
private NodesListManager nodesListManager;
private ResourceTrackerService resourceTrackerService;
private ApplicationMasterService applicationMasterService;
- private RMTimelineCollectorManager timelineCollectorManager;
private RMNodeLabelsManager nodeLabelManager;
private RMDelegatedNodeLabelsUpdater rmDelegatedNodeLabelsUpdater;
@@ -376,19 +374,6 @@ public class RMActiveServiceContext {
@Private
@Unstable
- public RMTimelineCollectorManager getRMTimelineCollectorManager() {
-return timelineCollectorManager;
- }
-
- @Private
- @Unstable
- public void setRMTimelineCollectorManager(
- RMTimelineCollectorManager collectorManager) {
-this.timelineCollectorManager = collectorManager;
- }
-
- @Private
- @Unstable
public long getEpoch() {
return this.epoch;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d9d40aa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.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/RMContextImpl.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
index b576fac..d7c624d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
@@ -248,6 +248,17 @@ public class RMContextImpl implements RMContext {
}
@Override
+ public RMTimelineCollectorManager getRMTimelineColle
[32/50] [abbrv] hadoop git commit: MAPREDUCE-6838. [ATSv2 Security] Add timeline delegation token received in allocate response to UGI. Contributed by Varun Saxena
MAPREDUCE-6838. [ATSv2 Security] Add timeline delegation token received in
allocate response to UGI. Contributed by Varun Saxena
(cherry picked from commit c6ce422a3423305ac665f80f039f61294adaa32c)
Conflicts:
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cbd5e89b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cbd5e89b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cbd5e89b
Branch: refs/heads/YARN-5355_branch2
Commit: cbd5e89b24534ba1de1fe79c6b6d23d555f84cdf
Parents: e5d6365
Author: Jian He
Authored: Mon Aug 21 22:08:07 2017 -0700
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:40 2017 +0530
--
.../v2/app/rm/RMContainerAllocator.java | 17 +--
.../v2/app/rm/TestRMContainerAllocator.java | 137 +++
.../hadoop/yarn/api/records/CollectorInfo.java | 4 +
.../api/async/impl/AMRMClientAsyncImpl.java | 13 +-
.../yarn/client/api/TimelineV2Client.java | 11 +-
.../client/api/impl/TimelineV2ClientImpl.java | 80 ++-
.../api/impl/TestTimelineClientV2Impl.java | 56 +++-
.../timelineservice/NMTimelinePublisher.java| 3 +-
.../TestTimelineServiceClientIntegration.java | 13 +-
.../security/TestTimelineAuthFilterForV2.java | 3 +-
10 files changed, 301 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cbd5e89b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
index 67f8b29..543b20e 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
@@ -838,7 +838,8 @@ public class RMContainerAllocator extends
RMContainerRequestor
updateAMRMToken(response.getAMRMToken());
}
-List finishedContainers =
response.getCompletedContainersStatuses();
+List finishedContainers =
+response.getCompletedContainersStatuses();
if (newContainers.size() + finishedContainers.size() > 0
|| !headRoom.equals(newHeadRoom)) {
//something changed
@@ -859,19 +860,13 @@ public class RMContainerAllocator extends
RMContainerRequestor
handleUpdatedNodes(response);
handleJobPriorityChange(response);
-// handle receiving the timeline collector address for this app
-String collectorAddr = null;
-if (response.getCollectorInfo() != null) {
- collectorAddr = response.getCollectorInfo().getCollectorAddr();
-}
-
+// Handle receiving the timeline collector address and token for this app.
MRAppMaster.RunningAppContext appContext =
(MRAppMaster.RunningAppContext)this.getContext();
-if (collectorAddr != null && !collectorAddr.isEmpty()
-&& appContext.getTimelineV2Client() != null) {
-
appContext.getTimelineV2Client().setTimelineServiceAddress(collectorAddr);
+if (appContext.getTimelineV2Client() != null) {
+ appContext.getTimelineV2Client().
+ setTimelineCollectorInfo(response.getCollectorInfo());
}
-
for (ContainerStatus cont : finishedContainers) {
processFinishedContainer(cont);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cbd5e89b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
index 159cf97..8f51e35 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMContainerAllocator.java
+++
b/hadoop-mapreduce-project/hadoop-mapred
[29/50] [abbrv] hadoop git commit: Addendum for YARN-4753. Use doxia macro to generate in-page TOC of YARN site documentation
Addendum for YARN-4753. Use doxia macro to generate in-page TOC of YARN site
documentation
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/78a6eccc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/78a6eccc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/78a6eccc
Branch: refs/heads/YARN-5355_branch2
Commit: 78a6ecccb347ba8580010f67ac9b73c4d16b6825
Parents: 3d5bf1c
Author: Varun Saxena
Authored: Wed Aug 30 20:19:48 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:40 2017 +0530
--
hadoop-project/src/site/site.xml| 2 +-
.../src/site/markdown/TimelineServiceV2.md | 105 ---
2 files changed, 46 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/78a6eccc/hadoop-project/src/site/site.xml
--
diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
index 1b39c54..e20fdec 100644
--- a/hadoop-project/src/site/site.xml
+++ b/hadoop-project/src/site/site.xml
@@ -148,7 +148,7 @@
-
+
http://git-wip-us.apache.org/repos/asf/hadoop/blob/78a6eccc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
index f4a670b..86030e0 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
@@ -15,25 +15,9 @@
The YARN Timeline Service v.2
-* [Overview](#Overview)
-* [Introduction](#Introduction)
-* [Architecture](#Architecture)
-* [Current Status](#Current_Status)
-* [Deployment](#Deployment)
-* [Configurations](#Configurations)
-* [Enabling Timeline Service v.2](#Enabling_Timeline_Service_v2)
-* [Publishing of application specific
data](#Publishing_of_application_specific_data)
-* [Timeline Service v.2 REST API](#Timeline_Service_REST_API_v2)
-* [Query Flows](#REST_API_LIST_FLOWS)
-* [Query Flow Runs](#REST_API_LIST_FLOW_RUNS)
-* [Query Flow Run](#REST_API_LIST_FLOW_RUN)
-* [Query Apps for a Flow](#REST_API_LIST_FLOW_APPS)
-* [Query Apps for a Flow Run](#REST_API_LIST_FLOWRUN_APPS)
-* [Query App](#REST_API_LIST_APP)
-* [Query Generic Entities](#REST_API_LIST_ENTITIES)
-* [Query Generic Entity](#REST_API_LIST_ENTITY)
-
-#Overview
+
+
+## Overview
### Introduction
@@ -127,9 +111,9 @@ analysis
* Migration and compatibility with v.1
-#Deployment
+## Deployment
-###Configurations
+### Configurations
New configuration parameters that are introduced with v.2 are marked bold.
@@ -365,6 +349,7 @@ To write MapReduce framework data to Timeline Service v.2,
enable the following
true
```
+
### Upgrade from alpha1 to alpha2
If you are currently running Timeline Service v2 alpha1 version, we recommend
the following:
@@ -499,7 +484,7 @@ You can provide the flow context via YARN application tags:
appContext.setApplicationTags(tags);
-# Timeline Service v.2 REST API
+## Timeline Service v.2 REST API
Querying Timeline Service v.2 is currently only supported via REST API; there
is no API client
implemented in the YARN libraries.
@@ -527,14 +512,14 @@ Returns a JSON object describing the service instance and
version information.
The following shows the supported queries on the REST API.
-## Query Flows
+### Query Flows
With Query Flows API, you can retrieve a list of active flows that had runs
most recently.
If the REST endpoint without the cluster name is used, the cluster specified
by the configuration
`yarn.resourcemanager.cluster-id` in `yarn-site.xml` is taken. If none of the
flows match the
predicates, an empty list will be returned.
-### HTTP request:
+ HTTP request:
GET /ws/v2/timeline/clusters/{cluster name}/flows/
@@ -542,7 +527,7 @@ predicates, an empty list will be returned.
GET /ws/v2/timeline/flows/
-### Query Parameters Supported:
+ Query Parameters Supported:
1. `limit` - If specified, defines the number of flows to return. The maximum
possible value for limit
is maximum value of Long. If it is not specified or has a value less than 0,
then limit will be
@@ -561,7 +546,7 @@ predicates, an empty list will be returned.
1. `fromid` - If specified, retrieve the next set of flows from the given
fromid. The set of entities retrieved is inclusive of specified fromid.
fromid sho
[08/50] [abbrv] hadoop git commit: YARN-4455. Support fetching metrics by time range. Contributed by Varun Saxena.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/484d7e9b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
index 3a9e15a..5134bfb 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderWebServices.java
@@ -264,6 +264,11 @@ public class TimelineReaderWebServices {
* or has a value less than 1, and metrics have to be retrieved, then
* metricsLimit will be considered as 1 i.e. latest single value of
* metric(s) will be returned. (Optional query param).
+ * @param metricsTimeStart If specified, returned metrics for the entities
+ * would not contain metric values before this timestamp(Optional query
+ * param).
+ * @param metricsTimeEnd If specified, returned metrics for the entities
would
+ * not contain metric values after this timestamp(Optional query param).
* @param fromId If specified, retrieve the next set of entities from the
* given fromId. The set of entities retrieved is inclusive of specified
* fromId. fromId should be taken from the value associated with FROM_ID
@@ -299,6 +304,8 @@ public class TimelineReaderWebServices {
@QueryParam("metricstoretrieve") String metricsToRetrieve,
@QueryParam("fields") String fields,
@QueryParam("metricslimit") String metricsLimit,
+ @QueryParam("metricstimestart") String metricsTimeStart,
+ @QueryParam("metricstimeend") String metricsTimeEnd,
@QueryParam("fromid") String fromId) {
String url = req.getRequestURI() +
(req.getQueryString() == null ? "" :
@@ -325,7 +332,8 @@ public class TimelineReaderWebServices {
infofilters, conffilters, metricfilters, eventfilters,
fromId),
TimelineReaderWebServicesUtils.createTimelineDataToRetrieve(
- confsToRetrieve, metricsToRetrieve, fields, metricsLimit));
+ confsToRetrieve, metricsToRetrieve, fields, metricsLimit,
+ metricsTimeStart, metricsTimeEnd));
} catch (Exception e) {
handleException(e, url, startTime,
"createdTime start/end or limit or flowrunid");
@@ -406,6 +414,11 @@ public class TimelineReaderWebServices {
* or has a value less than 1, and metrics have to be retrieved, then
* metricsLimit will be considered as 1 i.e. latest single value of
* metric(s) will be returned. (Optional query param).
+ * @param metricsTimeStart If specified, returned metrics for the entities
+ * would not contain metric values before this timestamp(Optional query
+ * param).
+ * @param metricsTimeEnd If specified, returned metrics for the entities
would
+ * not contain metric values after this timestamp(Optional query param).
* @param fromId If specified, retrieve the next set of entities from the
* given fromId. The set of entities retrieved is inclusive of specified
* fromId. fromId should be taken from the value associated with FROM_ID
@@ -446,12 +459,14 @@ public class TimelineReaderWebServices {
@QueryParam("metricstoretrieve") String metricsToRetrieve,
@QueryParam("fields") String fields,
@QueryParam("metricslimit") String metricsLimit,
+ @QueryParam("metricstimestart") String metricsTimeStart,
+ @QueryParam("metricstimeend") String metricsTimeEnd,
@QueryParam("fromid") String fromId) {
return getEntities(req, res, null, appId, entityType, userId, flowName,
flowRunId, limit, createdTimeStart, createdTimeEnd, relatesTo,
isRelatedTo, infofilters, conffilters, metricfilters, eventfilters,
confsToRetrieve, metricsToRetrieve, fields, metricsLimit,
-fromId);
+metricsTimeStart, metricsTimeEnd, fromId);
}
/**
@@ -522,6 +537,11 @@ public class TimelineReaderWebServices {
* or has a value less than 1, and metrics have to be retrieved, then
* metricsLimit will be considered as 1 i.e. latest single value of
* metric(s) will be returned. (Optional query param).
+ * @param metricsTimeStart If specified, returned metrics for the entities
+ * would not contain
[06/50] [abbrv] hadoop git commit: YARN-6604. Allow metric TTL for Application table to be specified through cmd (Haibo Chen via Varun Saxena)
YARN-6604. Allow metric TTL for Application table to be specified through cmd
(Haibo Chen via Varun Saxena)
(cherry picked from commit 0b7bff706e9a5c4a17e0f46deceb2521168d25b9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c4f042d4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c4f042d4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c4f042d4
Branch: refs/heads/YARN-5355_branch2
Commit: c4f042d4c1964dccbe85f0e8cd98243a26d31e42
Parents: 48d2e4f
Author: Varun Saxena
Authored: Wed Jun 7 21:51:07 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:38 2017 +0530
--
.../storage/TimelineSchemaCreator.java | 36 ++--
1 file changed, 26 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4f042d4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
index a9c74d2..f93c977 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
@@ -61,9 +61,10 @@ public final class TimelineSchemaCreator {
final static String NAME = TimelineSchemaCreator.class.getSimpleName();
private static final Log LOG =
LogFactory.getLog(TimelineSchemaCreator.class);
private static final String SKIP_EXISTING_TABLE_OPTION_SHORT = "s";
+ private static final String APP_METRICS_TTL_OPTION_SHORT = "ma";
private static final String APP_TABLE_NAME_SHORT = "a";
private static final String APP_TO_FLOW_TABLE_NAME_SHORT = "a2f";
- private static final String TTL_OPTION_SHORT = "m";
+ private static final String ENTITY_METRICS_TTL_OPTION_SHORT = "me";
private static final String ENTITY_TABLE_NAME_SHORT = "e";
private static final String HELP_SHORT = "h";
private static final String CREATE_TABLES_SHORT = "c";
@@ -91,12 +92,12 @@ public final class TimelineSchemaCreator {
if (StringUtils.isNotBlank(entityTableName)) {
hbaseConf.set(EntityTable.TABLE_NAME_CONF_NAME, entityTableName);
}
- // Grab the TTL argument
- String entityTableTTLMetrics =commandLine.getOptionValue(
- TTL_OPTION_SHORT);
- if (StringUtils.isNotBlank(entityTableTTLMetrics)) {
-int metricsTTL = Integer.parseInt(entityTableTTLMetrics);
-new EntityTable().setMetricsTTL(metricsTTL, hbaseConf);
+ // Grab the entity metrics TTL
+ String entityTableMetricsTTL = commandLine.getOptionValue(
+ ENTITY_METRICS_TTL_OPTION_SHORT);
+ if (StringUtils.isNotBlank(entityTableMetricsTTL)) {
+int entityMetricsTTL = Integer.parseInt(entityTableMetricsTTL);
+new EntityTable().setMetricsTTL(entityMetricsTTL, hbaseConf);
}
// Grab the appToflowTableName argument
String appToflowTableName = commandLine.getOptionValue(
@@ -111,6 +112,13 @@ public final class TimelineSchemaCreator {
hbaseConf.set(ApplicationTable.TABLE_NAME_CONF_NAME,
applicationTableName);
}
+ // Grab the application metrics TTL
+ String applicationTableMetricsTTL = commandLine.getOptionValue(
+ APP_METRICS_TTL_OPTION_SHORT);
+ if (StringUtils.isNotBlank(applicationTableMetricsTTL)) {
+int appMetricsTTL = Integer.parseInt(applicationTableMetricsTTL);
+new ApplicationTable().setMetricsTTL(appMetricsTTL, hbaseConf);
+ }
// create all table schemas in hbase
final boolean skipExisting = commandLine.hasOption(
@@ -149,9 +157,9 @@ public final class TimelineSchemaCreator {
o.setRequired(false);
options.addOption(o);
-o = new Option(TTL_OPTION_SHORT, "metricsTTL", true,
+o = new Option(ENTITY_METRICS_TTL_OPTION_SHORT, "entityMetricsTTL", true,
"TTL for metrics column family");
-o.setArgName("metricsTTL");
+o.setArgName("entityMetricsTTL");
o.setRequired(false);
options.addOption(o);
@@ -167,6 +175,12 @@ public final class TimelineSchemaCreator {
[02/50] [abbrv] hadoop git commit: YARN-6733. Add table for storing sub-application entities. Contributed by Vrushali C.
YARN-6733. Add table for storing sub-application entities. Contributed by
Vrushali C.
(cherry picked from commit 416312e3a7f0f83cc1c8549640c3ba75aaa3d887)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4014390e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4014390e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4014390e
Branch: refs/heads/YARN-5355_branch2
Commit: 4014390ef47e72be116538620d3a6377c648bf82
Parents: 0f751a7
Author: Rohith Sharma K S
Authored: Tue Jul 25 15:25:21 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:38 2017 +0530
--
.../storage/TimelineSchemaCreator.java | 44 +++
.../storage/application/ApplicationTable.java | 2 +-
.../storage/entity/EntityRowKey.java| 6 +-
.../subapplication/SubApplicationColumn.java| 108 +++
.../SubApplicationColumnFamily.java | 68 +
.../SubApplicationColumnPrefix.java | 250
.../subapplication/SubApplicationRowKey.java| 290 +++
.../SubApplicationRowKeyPrefix.java | 89 ++
.../subapplication/SubApplicationTable.java | 174 +++
.../storage/subapplication/package-info.java| 28 ++
.../storage/common/TestKeyConverters.java | 4 +
.../storage/common/TestRowKeys.java | 26 ++
.../storage/common/TestRowKeysAsString.java | 29 ++
13 files changed, 1114 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4014390e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
index f93c977..f50309e 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/TimelineSchemaCreator.java
@@ -45,6 +45,7 @@ import
org.apache.hadoop.yarn.server.timelineservice.storage.common.HBaseTimelin
import
org.apache.hadoop.yarn.server.timelineservice.storage.entity.EntityTable;
import
org.apache.hadoop.yarn.server.timelineservice.storage.flow.FlowActivityTable;
import org.apache.hadoop.yarn.server.timelineservice.storage.flow.FlowRunTable;
+import
org.apache.hadoop.yarn.server.timelineservice.storage.subapplication.SubApplicationTable;
import com.google.common.annotations.VisibleForTesting;
@@ -62,7 +63,9 @@ public final class TimelineSchemaCreator {
private static final Log LOG =
LogFactory.getLog(TimelineSchemaCreator.class);
private static final String SKIP_EXISTING_TABLE_OPTION_SHORT = "s";
private static final String APP_METRICS_TTL_OPTION_SHORT = "ma";
+ private static final String SUB_APP_METRICS_TTL_OPTION_SHORT = "msa";
private static final String APP_TABLE_NAME_SHORT = "a";
+ private static final String SUB_APP_TABLE_NAME_SHORT = "sa";
private static final String APP_TO_FLOW_TABLE_NAME_SHORT = "a2f";
private static final String ENTITY_METRICS_TTL_OPTION_SHORT = "me";
private static final String ENTITY_TABLE_NAME_SHORT = "e";
@@ -120,6 +123,21 @@ public final class TimelineSchemaCreator {
new ApplicationTable().setMetricsTTL(appMetricsTTL, hbaseConf);
}
+ // Grab the subApplicationTableName argument
+ String subApplicationTableName = commandLine.getOptionValue(
+ SUB_APP_TABLE_NAME_SHORT);
+ if (StringUtils.isNotBlank(subApplicationTableName)) {
+hbaseConf.set(SubApplicationTable.TABLE_NAME_CONF_NAME,
+subApplicationTableName);
+ }
+ // Grab the subApplication metrics TTL
+ String subApplicationTableMetricsTTL = commandLine
+ .getOptionValue(SUB_APP_METRICS_TTL_OPTION_SHORT);
+ if (StringUtils.isNotBlank(subApplicationTableMetricsTTL)) {
+int subAppMetricsTTL = Integer.parseInt(subApplicationTableMetricsTTL);
+new SubApplicationTable().setMetricsTTL(subAppMetricsTTL, hbaseConf);
+ }
+
// create all table schemas in hbase
final boolean skipExisting = commandLine.hasOption(
SKIP_EXISTING_
[17/50] [abbrv] hadoop git commit: YARN-6638. [ATSv2 Security] Timeline reader side changes for loading auth filters and principals. Contributed by Varun Saxena
YARN-6638. [ATSv2 Security] Timeline reader side changes for loading auth
filters and principals. Contributed by Varun Saxena
(cherry picked from commit 7f06c46065936b88e9864c526bfcda3a89f3e257)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/reader/AbstractTimelineReaderHBaseTestBase.java
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/TimelineReaderServer.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/50dd1372
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/50dd1372
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/50dd1372
Branch: refs/heads/YARN-5355_branch2
Commit: 50dd1372bf9fb61050f67da39651c9c3b326637a
Parents: 9577900
Author: Jian He
Authored: Fri Jun 9 13:42:38 2017 -0700
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
...TimelineAuthenticationFilterInitializer.java | 69 +++-
.../reader/TimelineReaderServer.java| 61 ++---
...neReaderAuthenticationFilterInitializer.java | 53 +++
.../reader/security/package-info.java | 25 +++
4 files changed, 154 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50dd1372/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilterInitializer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilterInitializer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilterInitializer.java
index 4e7c29a..06f9868e 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilterInitializer.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineAuthenticationFilterInitializer.java
@@ -51,30 +51,18 @@ import java.util.Map;
public class TimelineAuthenticationFilterInitializer extends FilterInitializer
{
/**
- * The configuration prefix of timeline HTTP authentication
+ * The configuration prefix of timeline HTTP authentication.
*/
public static final String PREFIX =
"yarn.timeline-service.http-authentication.";
@VisibleForTesting
Map filterConfig;
- /**
- * Initializes {@link TimelineAuthenticationFilter}
- *
- * Propagates to {@link TimelineAuthenticationFilter} configuration all YARN
- * configuration properties prefixed with {@value #PREFIX}
- *
- * @param container
- * The filter container
- * @param conf
- * Configuration for run-time parameters
- */
- @Override
- public void initFilter(FilterContainer container, Configuration conf) {
+ protected void setAuthFilterConfig(Configuration conf) {
filterConfig = new HashMap();
// setting the cookie path to root '/' so it is used for all resources.
-filterConfig.put(TimelineAuthenticationFilter.COOKIE_PATH, "/");
+filterConfig.put(AuthenticationFilter.COOKIE_PATH, "/");
for (Map.Entry entry : conf) {
String name = entry.getKey();
@@ -95,6 +83,41 @@ public class TimelineAuthenticationFilterInitializer extends
FilterInitializer {
}
}
+// Resolve _HOST into bind address
+String bindAddress = conf.get(HttpServer2.BIND_ADDRESS);
+String principal =
+filterConfig.get(KerberosAuthenticationHandler.PRINCIPAL);
+if (principal != null) {
+ try {
+principal = SecurityUtil.getServerPrincipal(principal, bindAddress);
+ } catch (IOException ex) {
+throw new RuntimeException("Could not resolve Kerberos principal " +
+"name: " + ex.toString(), ex);
+ }
+ filterConfig.put(KerberosAuthenticationHandler.PRINCIPAL,
+ principal);
+}
+ }
+
+ protected Map getFilterConfig() {
+return filterConfig;
+ }
+
+ /**
+ * Initializes {@link TimelineAuthenticationFilter}
+ *
+ * Propagates to {@link TimelineAuthenticationFilter} configuration all YARN
+ * configuration properties prefixed with {@value #PREFIX}
+ *
+ * @param container
+ * The filter container
+ * @param conf
+ *
[03/50] [abbrv] hadoop git commit: YARN-6707. [ATSv2] Update HBase version to 1.2.6 (Vrushali C via Varun Saxena)
YARN-6707. [ATSv2] Update HBase version to 1.2.6 (Vrushali C via Varun Saxena)
(cherry picked from commit e86eef9812d055f8689646b0f521f80cfc0c6399)
Conflicts:
hadoop-project/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/82de1fd8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/82de1fd8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/82de1fd8
Branch: refs/heads/YARN-5355_branch2
Commit: 82de1fd84aaa6702c90401fd931f9cf0ca799eb6
Parents: c4f042d
Author: Varun Saxena
Authored: Sun Jun 11 01:37:50 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:38 2017 +0530
--
hadoop-project/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/82de1fd8/hadoop-project/pom.xml
--
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index e17ca4d..1beaef9 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -50,7 +50,7 @@
0.8.2.1
-1.2.4
+1.2.6
2.5.1
${project.version}
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[16/50] [abbrv] hadoop git commit: YARN-6133. [ATSv2 Security] Renew delegation token for app automatically if an app collector is active. Contributed by Varun Saxena.
YARN-6133. [ATSv2 Security] Renew delegation token for app automatically if an
app collector is active. Contributed by Varun Saxena.
(cherry picked from commit ffb1f572b68e73efd6410ab74a334f4e5df543f2)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cb75e182
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cb75e182
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cb75e182
Branch: refs/heads/YARN-5355_branch2
Commit: cb75e1826e6ef5b38082004e2985e0f793aaa1dc
Parents: 5a7c272
Author: Rohith Sharma K S
Authored: Thu Aug 10 11:12:57 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
.../security/TestTimelineAuthFilterForV2.java | 27 +-
.../collector/AppLevelTimelineCollector.java| 17 +++-
.../collector/NodeTimelineCollectorManager.java | 88 +++-
.../collector/TimelineCollector.java| 7 ++
.../collector/TimelineCollectorManager.java | 8 +-
...neV2DelegationTokenSecretManagerService.java | 6 ++
6 files changed, 139 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cb75e182/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
index 84d892d..78c5c66 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/security/TestTimelineAuthFilterForV2.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -183,6 +184,13 @@ public class TestTimelineAuthFilterForV2 {
conf.set(YarnConfiguration.YARN_HTTP_POLICY_KEY,
HttpConfig.Policy.HTTP_ONLY.name());
}
+if (!withKerberosLogin) {
+ // For timeline delegation token based access, set delegation token renew
+ // interval to 100 ms. to test if timeline delegation token for the app
is
+ // renewed automatically if app is still alive.
+ conf.setLong(
+ YarnConfiguration.TIMELINE_DELEGATION_TOKEN_RENEW_INTERVAL, 100);
+}
UserGroupInformation.setConfiguration(conf);
collectorManager = new DummyNodeTimelineCollectorManager();
auxService = PerNodeTimelineCollectorsAuxService.launchServer(
@@ -282,12 +290,12 @@ public class TestTimelineAuthFilterForV2 {
}
private void publishAndVerifyEntity(ApplicationId appId, File entityTypeDir,
- String entityType) throws Exception {
+ String entityType, int numEntities) throws Exception {
TimelineV2Client client = createTimelineClientForUGI(appId);
try {
// Sync call. Results available immediately.
client.putEntities(createEntity("entity1", entityType));
- assertEquals(1, entityTypeDir.listFiles().length);
+ assertEquals(numEntities, entityTypeDir.listFiles().length);
verifyEntity(entityTypeDir, "entity1", entityType);
// Async call.
client.putEntitiesAsync(createEntity("entity2", entityType));
@@ -312,12 +320,22 @@ public class TestTimelineAuthFilterForV2 {
KerberosTestUtils.doAs(HTTP_USER + "/localhost", new Callable() {
@Override
public Void call() throws Exception {
-publishAndVerifyEntity(appId, entityTypeDir, entityType);
+publishAndVerifyEntity(appId, entityTypeDir, entityType, 1);
return null;
}
});
} else {
-publishAndVerifyEntity(appId, entityTypeDir, entityType);
+publishAndVerifyEntity(appId, entityTypeDir, entityType, 1);
+// Verify if token is renewed automatically and entities can still be
+// published.
+Thread.sleep(1000);
+publishAndVerifyEntity(appId, entityTypeDir, entityType, 2);
+AppLevelTimelineCollector collector =
+(AppLevelTimelineCollector) colle
[42/50] [abbrv] hadoop git commit: YARN-6316. Addendum for missing create option in documentation.
YARN-6316. Addendum for missing create option in documentation. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a22c1c72 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a22c1c72 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a22c1c72 Branch: refs/heads/YARN-5355_branch2 Commit: a22c1c72c479ecdcb5c790e467fa0a4b7df2fd8a Parents: 28bbe9c Author: Varun Saxena Authored: Wed Aug 30 18:41:57 2017 +0530 Committer: Varun Saxena Committed: Tue Oct 17 23:36:40 2017 +0530 -- .../hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a22c1c72/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md index 66bb7f9..f5875b3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md @@ -250,7 +250,7 @@ For example, # Step 3) Create the timeline service schema Finally, run the schema creator tool to create the necessary tables: -bin/hadoop org.apache.hadoop.yarn.server.timelineservice.storage.TimelineSchemaCreator +bin/hadoop org.apache.hadoop.yarn.server.timelineservice.storage.TimelineSchemaCreator -create The `TimelineSchemaCreator` tool supports a few options that may come handy especially when you are testing. For example, you can use `-skipExistingTable` (`-s` for short) to skip existing tables - 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-6888. Refactor AppLevelTimelineCollector such that RM does not have aggregator threads created. Contributed by Vrushali C.
YARN-6888. Refactor AppLevelTimelineCollector such that RM does not have
aggregator threads created. Contributed by Vrushali C.
(cherry picked from commit 20dd6d18b7787e67ef96f3b6b92ea8415a8650fd)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4bea8af7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4bea8af7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4bea8af7
Branch: refs/heads/YARN-5355_branch2
Commit: 4bea8af723bfd607a85621d5659c4c563b0728eb
Parents: 4014390
Author: Rohith Sharma K S
Authored: Fri Jul 28 11:47:16 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:38 2017 +0530
--
.../collector/AppLevelTimelineCollector.java| 87 +--
.../AppLevelTimelineCollectorWithAgg.java | 150 +++
.../PerNodeTimelineCollectorsAuxService.java| 2 +-
.../TestNMTimelineCollectorManager.java | 4 +-
4 files changed, 155 insertions(+), 88 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4bea8af7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollector.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollector.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollector.java
index 0b05309..c481dbe 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollector.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/collector/AppLevelTimelineCollector.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.yarn.server.timelineservice.collector;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -26,19 +25,10 @@ import
org.apache.hadoop.classification.InterfaceStability.Unstable;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.yarn.api.records.ApplicationId;
-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntities;
-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity;
-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntityType;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import com.google.common.base.Preconditions;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
/**
* Service that handles writes to the timeline service and writes them to the
* backing storage for a given YARN application.
@@ -50,15 +40,8 @@ import java.util.concurrent.TimeUnit;
public class AppLevelTimelineCollector extends TimelineCollector {
private static final Log LOG = LogFactory.getLog(TimelineCollector.class);
- private final static int AGGREGATION_EXECUTOR_NUM_THREADS = 1;
- private final static int AGGREGATION_EXECUTOR_EXEC_INTERVAL_SECS = 15;
- private static Set entityTypesSkipAggregation
- = initializeSkipSet();
-
private final ApplicationId appId;
private final TimelineCollectorContext context;
- private ScheduledThreadPoolExecutor appAggregationExecutor;
- private AppLevelAggregator appAggregator;
private UserGroupInformation currentUser;
public AppLevelTimelineCollector(ApplicationId appId) {
@@ -68,12 +51,8 @@ public class AppLevelTimelineCollector extends
TimelineCollector {
context = new TimelineCollectorContext();
}
- private static Set initializeSkipSet() {
-Set result = new HashSet<>();
-result.add(TimelineEntityType.YARN_APPLICATION.toString());
-result.add(TimelineEntityType.YARN_FLOW_RUN.toString());
-result.add(TimelineEntityType.YARN_FLOW_ACTIVITY.toString());
-return result;
+ public UserGroupInformation getCurrentUser() {
+return currentUser;
}
@Override
@@ -91,29 +70,11 @@ public class AppLevelTimelineCollector extends
TimelineCollector {
@Override
protected void serviceStart() throws Exception {
-// Launch the aggregation thread
-appAggregationExecutor = new ScheduledThreadPoolExecutor(
[44/50] [abbrv] hadoop git commit: YARN-7190 Ensure only NM classpath in 2.x gets TSv2 related hbase jars, not the user classpath (Contributed by Varun Saxena via Vrushali C)
YARN-7190 Ensure only NM classpath in 2.x gets TSv2 related hbase jars, not the
user classpath (Contributed by Varun Saxena via Vrushali C)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8b98dba7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8b98dba7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8b98dba7
Branch: refs/heads/YARN-5355_branch2
Commit: 8b98dba7ee848951f88e0a599a701772fb19547a
Parents: 6ba1f34
Author: vrushali
Authored: Mon Oct 16 09:21:31 2017 -0700
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:41 2017 +0530
--
.../resources/assemblies/hadoop-yarn-dist.xml | 29 +++
hadoop-yarn-project/hadoop-yarn/bin/yarn| 6
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd| 6
.../hadoop-yarn-server-resourcemanager/pom.xml | 1 +
.../pom.xml | 25 -
.../hadoop-yarn-server-timelineservice/pom.xml | 1 +
hadoop-yarn-project/pom.xml | 38 +---
7 files changed, 100 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b98dba7/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
--
diff --git
a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
index a3a05e4..220c127 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
@@ -188,9 +188,38 @@
${project.build.directory}/site
/share/doc/hadoop/${hadoop.component}
+
+
+
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/target/lib
+
share/hadoop/${hadoop.component}/timelineservice/lib
+
+
+org.apache.hadoop:hadoop-yarn-server-timelineservice
+
org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase
+
+
+
share/hadoop/${hadoop.component}/timelineservice
+false
+false
+
+
+
+
+
org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-tests
+
+
+
share/hadoop/${hadoop.component}/timelineservice/test
+false
+false
+
+
+
+
+
org.apache.hadoop:hadoop-yarn-server-timelineservice*
+
share/hadoop/${hadoop.component}
false
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b98dba7/hadoop-yarn-project/hadoop-yarn/bin/yarn
--
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn
b/hadoop-yarn-project/hadoop-yarn/bin/yarn
index 6ee435e..892d15f 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn
@@ -247,6 +247,8 @@ elif [ "$COMMAND" = "queue" ] ; then
YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS"
elif [ "$COMMAND" = "resourcemanager" ] ; then
CLASSPATH=${CLASSPATH}:$YARN_CONF_DIR/rm-config/log4j.properties
+ CLASSPATH=${CLASSPATH}:"$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/*"
+ CLASSPATH=${CLASSPATH}:"$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/lib/*"
CLASS='org.apache.hadoop.yarn.server.resourcemanager.ResourceManager'
YARN_OPTS="$YARN_OPTS $YARN_RESOURCEMANAGER_OPTS"
if [ "$YARN_RESOURCEMANAGER_HEAPSIZE" != "" ]; then
@@ -262,6 +264,8 @@ elif [ "$COMMAND" = "historyserver" ] ; then
JAVA_HEAP_MAX="-Xmx""$YARN_HISTORYSERVER_HEAPSIZE""m"
fi
elif [ "$COMMAND" = "timelinereader" ] ; then
+ CLASSPATH=${CLASSPATH}:"$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/*"
+ CLASSPATH=${CLASSPATH}:"$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/lib/*"
CLASS='org.apache.hadoop.yarn.server.timelineservice.reader.TimelineReaderServer'
elif [ "$COMMAND" = "timelineserver" ] ; then
CLASSPATH=${CLASSPATH}:$YARN_CONF_DIR/timelineserver-config/log4j.properties
@@ -279,6 +283,8 @@ elif [ "$COMMAND" = "sharedcachemanager" ] ; then
fi
elif [ "$COMMAND" = "nodemanager" ] ; then
CLASSPATH=${CLASSPATH}:$YARN_CONF_DIR/nm-config/log4j.properties
+ CLASSPATH=${CLASSPATH}:"$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/*"
+ CLASSPATH=${CLASSPATH}:"$HADOOP_YARN_HOME/$YARN_DIR/timelineservice/lib/*"
CLASS='org.apache.hadoop.yarn.server.nodemanager.NodeManager'
YARN_OPTS="$YARN_OPTS -server $YARN_NODEMANAGER_OPTS"
if [ "$YARN_NODEMANAGER_HEAPSIZE" != "" ]; then
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8b98dba7/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
--
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
b/hadoop-yarn-project/hadoop-yarn/bi
[38/50] [abbrv] hadoop git commit: YARN-7152. [ATSv2] Registering timeline client before AMRMClient service init throw exception (Rohith Sharma K S via Varun Saxena)
YARN-7152. [ATSv2] Registering timeline client before AMRMClient service init
throw exception (Rohith Sharma K S via Varun Saxena)
(cherry picked from commit ef87d34a0e96f6b6390b7086c4ea2d5b7a4c2754)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/95f45b89
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/95f45b89
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/95f45b89
Branch: refs/heads/YARN-5355_branch2
Commit: 95f45b89d12fb3d2b3df5fb55545ec808f950471
Parents: b3201b2
Author: Varun Saxena
Authored: Mon Sep 4 20:11:02 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:40 2017 +0530
--
.../hadoop/yarn/client/api/AMRMClient.java | 22 ++--
1 file changed, 2 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/95f45b89/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
index 70f19ba..b8eb58c 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
@@ -28,7 +28,6 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceAudience.Public;
import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
import
org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
@@ -42,7 +41,6 @@ import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
import org.apache.hadoop.yarn.api.records.UpdateContainerRequest;
import org.apache.hadoop.yarn.client.api.impl.AMRMClientImpl;
-import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException;
import com.google.common.base.Preconditions;
@@ -57,7 +55,6 @@ public abstract class AMRMClient extends
private static final Log LOG = LogFactory.getLog(AMRMClient.class);
private TimelineV2Client timelineV2Client;
- private boolean timelineServiceV2Enabled;
/**
* Create a new instance of AMRMClient.
@@ -82,12 +79,6 @@ public abstract class AMRMClient extends
nmTokenCache = NMTokenCache.getSingleton();
}
- @Override
- protected void serviceInit(Configuration conf) throws Exception {
-super.serviceInit(conf);
-timelineServiceV2Enabled =
YarnConfiguration.timelineServiceV2Enabled(conf);
- }
-
/**
* Object to represent a single container request for resources. Scheduler
* documentation should be consulted for the specifics of how the parameters
@@ -696,18 +687,9 @@ public abstract class AMRMClient extends
* V2 client will be updated dynamically if registered.
*
* @param client the timeline v2 client to register
- * @throws YarnException when this method is invoked even when ATS V2 is not
- * configured.
*/
- public void registerTimelineV2Client(TimelineV2Client client)
- throws YarnException {
-if (timelineServiceV2Enabled) {
- timelineV2Client = client;
-} else {
- LOG.error("Trying to register timeline v2 client when not configured.");
- throw new YarnException(
- "register timeline v2 client when not configured.");
-}
+ public void registerTimelineV2Client(TimelineV2Client client) {
+timelineV2Client = client;
}
/**
-
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-7038. [Atsv2 Security] CollectorNodemanagerProtocol RPC interface doesn't work when service authorization is enabled. Contributed by Varun Saxena.
YARN-7038. [Atsv2 Security] CollectorNodemanagerProtocol RPC interface doesn't
work when service authorization is enabled. Contributed by Varun Saxena.
(cherry picked from commit 387dd3da87759860dd18bd8aa95c60d962b1e6a9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4e1af68a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4e1af68a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4e1af68a
Branch: refs/heads/YARN-5355_branch2
Commit: 4e1af68ae151087c16cd3f2555fa9bd3d5d22f7e
Parents: 55e5742
Author: Rohith Sharma K S
Authored: Fri Aug 18 13:32:36 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:39 2017 +0530
--
.../hadoop-common/src/main/conf/hadoop-policy.xml| 11 +++
.../org/apache/hadoop/yarn/conf/YarnConfiguration.java | 4
.../hadoop/yarn/conf/TestYarnConfigurationFields.java| 2 ++
.../nodemanager/collectormanager/NMCollectorService.java | 7 +++
.../nodemanager/security/authorize/NMPolicyProvider.java | 6 +-
5 files changed, 29 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e1af68a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-policy.xml
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-policy.xml
b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-policy.xml
index 2bf5c02..d282c58 100644
--- a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-policy.xml
+++ b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-policy.xml
@@ -223,4 +223,15 @@
group list is separated by a blank. For e.g. "alice,bob users,wheel".
A special value of "*" means all users are allowed.
+
+
+security.collector-nodemanager.protocol.acl
+*
+ACL for CollectorNodemanagerProtocol, used by nodemanager
+if timeline service v2 is enabled, for the timeline collector and
nodemanager
+to communicate with each other.
+The ACL is a comma-separated list of user and group names. The user and
+group list is separated by a blank. For e.g. "alice,bob users,wheel".
+A special value of "*" means all users are allowed.
+
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e1af68a/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 e938829..6117d2e 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
@@ -1869,6 +1869,10 @@ public class YarnConfiguration extends Configuration {
YARN_SECURITY_SERVICE_AUTHORIZATION_APPLICATIONHISTORY_PROTOCOL =
"security.applicationhistory.protocol.acl";
+ public static final String
+ YARN_SECURITY_SERVICE_AUTHORIZATION_COLLECTOR_NODEMANAGER_PROTOCOL =
+ "security.collector-nodemanager.protocol.acl";
+
/** No. of milliseconds to wait between sending a SIGTERM and SIGKILL
* to a running container */
public static final String NM_SLEEP_DELAY_BEFORE_SIGKILL_MS =
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e1af68a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java
index c08efde..1d3111c 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java
@@ -66,6 +66,8 @@ public class TestYarnConfigurationFields extends
TestConfigurationFieldsBase {
configurationPropsToSkipCompare
.add(YarnConfiguration
.YARN_SECURITY_SERVICE_AUTHORIZATION_RESOURCETRACKER_PROTOCOL);
+configurationPropsToSkipCompare.add(YarnConfiguration
+.YARN_SECURITY_SERVICE_AUTHORIZATION_COLLECTOR_NODEMANAGER_PROTOCOL);
configurationPropsToSkipCompare.add(YarnConfiguration.CURATOR_LEADER_ELECTOR);
configur
[07/50] [abbrv] hadoop git commit: YARN-6850 Ensure that supplemented timestamp is stored only for flow run metrics (Contributed by Varun Saxena via Vrushali C)
YARN-6850 Ensure that supplemented timestamp is stored only for flow run
metrics (Contributed by Varun Saxena via Vrushali C)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f751a7f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f751a7f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f751a7f
Branch: refs/heads/YARN-5355_branch2
Commit: 0f751a7fecb8a02e46305cade173da800b2814d6
Parents: 484d7e9
Author: Vrushali C
Authored: Mon Jul 24 16:00:21 2017 -0700
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:38 2017 +0530
--
.../storage/common/ColumnHelper.java| 44 +++-
.../common/HBaseTimelineStorageUtils.java | 10 +
.../storage/flow/FlowRunColumnPrefix.java | 2 +-
.../storage/reader/ApplicationEntityReader.java | 8 ++--
.../storage/reader/GenericEntityReader.java | 8 ++--
5 files changed, 44 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f751a7f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
index 496b0ae..7a81aef 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/ColumnHelper.java
@@ -50,11 +50,28 @@ public class ColumnHelper {
private final ValueConverter converter;
+ private final boolean supplementTs;
+
public ColumnHelper(ColumnFamily columnFamily) {
this(columnFamily, GenericConverter.getInstance());
}
public ColumnHelper(ColumnFamily columnFamily, ValueConverter converter) {
+this(columnFamily, converter, false);
+ }
+
+ /**
+ * @param columnFamily column family implementation.
+ * @param converter converter use to encode/decode values stored in the
column
+ * or column prefix.
+ * @param needSupplementTs flag to indicate if cell timestamp needs to be
+ * modified for this column by calling
+ * {@link TimestampGenerator#getSupplementedTimestamp(long, String)}.
This
+ * would be required for columns(such as metrics in flow run table) where
+ * potential collisions can occur due to same timestamp.
+ */
+ public ColumnHelper(ColumnFamily columnFamily, ValueConverter converter,
+ boolean needSupplementTs) {
this.columnFamily = columnFamily;
columnFamilyBytes = columnFamily.getBytes();
if (converter == null) {
@@ -62,6 +79,7 @@ public class ColumnHelper {
} else {
this.converter = converter;
}
+this.supplementTs = needSupplementTs;
}
/**
@@ -104,18 +122,24 @@ public class ColumnHelper {
}
/*
- * Figures out the cell timestamp used in the Put For storing into flow run
- * table. We would like to left shift the timestamp and supplement it with
the
- * AppId id so that there are no collisions in the flow run table's cells
+ * Figures out the cell timestamp used in the Put For storing.
+ * Will supplement the timestamp if required. Typically done for flow run
+ * table.If we supplement the timestamp, we left shift the timestamp and
+ * supplement it with the AppId id so that there are no collisions in the
flow
+ * run table's cells.
*/
private long getPutTimestamp(Long timestamp, Attribute[] attributes) {
if (timestamp == null) {
timestamp = System.currentTimeMillis();
}
-String appId = getAppIdFromAttributes(attributes);
-long supplementedTS = TimestampGenerator.getSupplementedTimestamp(
-timestamp, appId);
-return supplementedTS;
+if (!this.supplementTs) {
+ return timestamp;
+} else {
+ String appId = getAppIdFromAttributes(attributes);
+ long supplementedTS = TimestampGenerator.getSupplementedTimestamp(
+ timestamp, appId);
+ return supplementedTS;
+}
}
private String getAppIdFromAttributes(Attribute[] attributes) {
@@ -232,9 +256,9 @@ public class ColumnHelper {
for (Entry cell : cells.entrySet()) {
V value =
[25/50] [abbrv] hadoop git commit: YARN-5647. [ATSv2 Security] Collector side changes for loading auth filters and principals. Contributed by Varun Saxena
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9577900a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/util/timeline/TimelineServerUtils.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/util/timeline/TimelineServerUtils.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/util/timeline/TimelineServerUtils.java
new file mode 100644
index 000..78bf20f
--- /dev/null
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/util/timeline/TimelineServerUtils.java
@@ -0,0 +1,92 @@
+/**
+ * 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.util.timeline;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.security.AuthenticationFilterInitializer;
+import
org.apache.hadoop.yarn.server.timeline.security.TimelineAuthenticationFilter;
+import
org.apache.hadoop.yarn.server.timeline.security.TimelineAuthenticationFilterInitializer;
+import
org.apache.hadoop.yarn.server.timeline.security.TimelineDelgationTokenSecretManagerService;
+
+/**
+ * Set of utility methods to be used across timeline reader and collector.
+ */
+public final class TimelineServerUtils {
+ private static final Log LOG = LogFactory.getLog(TimelineServerUtils.class);
+
+ private TimelineServerUtils() {
+ }
+
+ /**
+ * Sets filter initializers configuration based on existing configuration and
+ * default filters added by timeline service(such as timeline auth filter and
+ * CORS filter).
+ * @param conf Configuration object.
+ * @param configuredInitializers Comma separated list of filter initializers.
+ * @param defaultInitializers Set of initializers added by default by
timeline
+ * service.
+ */
+ public static void setTimelineFilters(Configuration conf,
+ String configuredInitializers, Set defaultInitializers) {
+String[] parts = configuredInitializers.split(",");
+Set target = new LinkedHashSet();
+for (String filterInitializer : parts) {
+ filterInitializer = filterInitializer.trim();
+ if (filterInitializer.equals(
+ AuthenticationFilterInitializer.class.getName()) ||
+ filterInitializer.isEmpty()) {
+continue;
+ }
+ target.add(filterInitializer);
+}
+target.addAll(defaultInitializers);
+String actualInitializers =
+org.apache.commons.lang.StringUtils.join(target, ",");
+LOG.info("Filter initializers set for timeline service: " +
+actualInitializers);
+conf.set("hadoop.http.filter.initializers", actualInitializers);
+ }
+
+ /**
+ * Adds timeline authentication filter to the set of default filter
+ * initializers and assigns the delegation token manager service to it.
+ * @param initializers Comma separated list of filter initializers.
+ * @param defaultInitializers Set of initializers added by default by
timeline
+ * service.
+ * @param delegationTokenMgrService Delegation token manager service.
+ * This will be used by timeline authentication filter to assign
+ * delegation tokens.
+ */
+ public static void addTimelineAuthFilter(String initializers,
+ Set defaultInitializers,
+ TimelineDelgationTokenSecretManagerService delegationTokenMgrService) {
+TimelineAuthenticationFilter.setTimelineDelegationTokenSecretManager(
+delegationTokenMgrService.getTimelineDelegationTokenSecretManager());
+if (!initializers.contains(
+TimelineAuthenticationFilterInitializer.class.getName())) {
+ defaultInitializers.add(
+ TimelineAuthenticationFilterInitializer.class.getName());
+}
+ }
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9577900a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-ser
[45/50] [abbrv] hadoop git commit: Fix problems in yarn.cmd due to rebase.
Fix problems in yarn.cmd due to rebase. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6ba1f345 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6ba1f345 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6ba1f345 Branch: refs/heads/YARN-5355_branch2 Commit: 6ba1f34532a86bea81d9a1262abc8c930c01f96b Parents: 572ebd1 Author: Varun Saxena Authored: Sun Oct 15 01:25:32 2017 +0530 Committer: Varun Saxena Committed: Tue Oct 17 23:36:41 2017 +0530 -- hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6ba1f345/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd -- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd index 48e3199..8415163 100644 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd @@ -246,16 +246,15 @@ goto :eof ) goto :eof -<<< HEAD :router set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\router-config\log4j.properties set CLASS=org.apache.hadoop.yarn.server.router.Router set YARN_OPTS=%YARN_OPTS% %HADOOP_ROUTER_OPTS% -=== + goto :eof + :timelinereader set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\timelineserver-config\log4j.properties set CLASS=org.apache.hadoop.yarn.server.timelineservice.reader.TimelineReaderServer ->>> YARN-5355. Backported YARN-2928 into our branch-2 feature branch. goto :eof :nodemanager - 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-6047. Documentation updates for TimelineService v2. Contributed by Rohith Sharma K S, Vrushali C and Varun Saxena
YARN-6047. Documentation updates for TimelineService v2. Contributed by Rohith
Sharma K S, Vrushali C and Varun Saxena
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3d5bf1c0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3d5bf1c0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3d5bf1c0
Branch: refs/heads/YARN-5355_branch2
Commit: 3d5bf1c06d7c03c25667f2ace09110d32254ba0a
Parents: a22c1c7
Author: Varun Saxena
Authored: Wed Aug 30 19:40:06 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:40 2017 +0530
--
.../src/site/markdown/TimelineServiceV2.md | 334 ++-
1 file changed, 321 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d5bf1c0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
index f5875b3..f4a670b 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md
@@ -89,12 +89,8 @@ The following diagram illustrates the design at a high level.
### Current Status and Future Plans
-YARN Timeline Service v.2 is currently in alpha ("alpha 1"). It is very much
work in progress, and
-many things can and will change rapidly. Users must enable Timeline Service
v.2 only on a test or
-experimental cluster to test the feature.
-
-Most importantly, **security is not enabled**. Do not set up or use Timeline
Service v.2 until
-security is implemented if security is a requirement.
+YARN Timeline Service v.2 is currently in alpha ("alpha 2"). It is a work in
progress, and
+many things can and will change rapidly.
A complete end-to-end flow of writes and reads is functional, with Apache
HBase as the backend.
You should be able to start generating data. When enabled, all YARN-generic
events are
@@ -111,16 +107,19 @@ resource manager also has its dedicated in-process
collector. The reader is curr
instance. Currently, it is not possible to write to Timeline Service outside
the context of a YARN
application (i.e. no off-cluster client).
+Starting from alpha2, Timeline Service v.2 supports simple authorization in
terms of a
+configurable whitelist of users and groups who can read timeline data. Cluster
admins are
+allowed by default to read timeline data.
+
When YARN Timeline Service v.2 is disabled, one can expect no functional or
performance impact
on any other existing functionality.
The work to make it truly production-ready continues. Some key items include
* More robust storage fault tolerance
-* Security
* Support for off-cluster clients
-* More complete and integrated web UI
* Better support for long-running apps
+* Support for ACLs
* Offline (time-based periodic) aggregation for flows, users, and queues for
reporting and
analysis
* Timeline collectors as separate instances from node managers
@@ -160,6 +159,27 @@ New configuration parameters that are introduced with v.2
are marked bold.
|
**`yarn.timeline-service.hbase.coprocessor.app-final-value-retention-milliseconds`**
| The setting that controls how long the final value of a metric of a
completed app is retained before merging into the flow sum. Defaults to
`25920` (3 days). This should be set in the HBase cluster. |
| **`yarn.rm.system-metrics-publisher.emit-container-events`** | The setting
that controls whether yarn container metrics is published to the timeline
server or not by RM. This configuration setting is for ATS V2. Defaults to
`false`. |
+ Security Configuration
+
+
+Security can be enabled by setting
`yarn.timeline-service.http-authentication.type`
+to `kerberos`, after which the following configuration options are available:
+
+
+| Configuration Property | Description |
+|: |: |
+| `yarn.timeline-service.http-authentication.type` | Defines authentication
used for the timeline server(collector/reader) HTTP endpoint. Supported values
are: `simple` / `kerberos` / #AUTHENTICATION_HANDLER_CLASSNAME#. Defaults to
`simple`. |
+| `yarn.timeline-service.http-authentication.simple.anonymous.allowed` |
Indicates if anonymous requests are allowed by the timeline server when using
'simple' authentication. Defaults to `true`. |
+| `yarn.timeline-service.http-authentication.kerberos.principal` | The
Kerberos principal to be used for the Timeline Server(Collector/Reader) HTTP
endpoint. |
+| `yarn.timeline-service.http-authentication.kerberos.keytab` | The Kerber
[10/50] [abbrv] hadoop git commit: YARN-6801. NPE in RM while setting collectors map in NodeHeartbeatResponse. Contributed by Vrushali C.
YARN-6801. NPE in RM while setting collectors map in NodeHeartbeatResponse.
Contributed by Vrushali C.
(cherry picked from commit 5791ced4bd864ff6c08cb2c3ee10ab62008f0168)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d01a3f1b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d01a3f1b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d01a3f1b
Branch: refs/heads/YARN-5355_branch2
Commit: d01a3f1ba21e3df9b3e87407323cc204914a4722
Parents: 82de1fd
Author: Rohith Sharma K S
Authored: Tue Jul 11 17:59:47 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:38 2017 +0530
--
.../resourcemanager/ResourceTrackerService.java | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d01a3f1b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.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/ResourceTrackerService.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
index f6ba245..e62da00 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
@@ -620,13 +620,17 @@ public class ResourceTrackerService extends
AbstractService implements
Map rmApps = rmContext.getRMApps();
// Set collectors for all running apps on this node.
for (ApplicationId appId : runningApps) {
- AppCollectorData appCollectorData = rmApps.get(appId).getCollectorData();
- if (appCollectorData != null) {
-liveAppCollectorsMap.put(appId, appCollectorData);
- } else {
-if (LOG.isDebugEnabled()) {
- LOG.debug("Collector for applicaton: " + appId +
- " hasn't registered yet!");
+ RMApp app = rmApps.get(appId);
+ if (app != null) {
+AppCollectorData appCollectorData = rmApps.get(appId)
+.getCollectorData();
+if (appCollectorData != null) {
+ liveAppCollectorsMap.put(appId, appCollectorData);
+} else {
+ if (LOG.isDebugEnabled()) {
+LOG.debug("Collector for applicaton: " + appId +
+" hasn't registered yet!");
+ }
}
}
}
-
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-7141. Move logging APIs to slf4j in timelineservice after ATSv2 merge. Contributed by Varun Saxena
YARN-7141. Move logging APIs to slf4j in timelineservice after ATSv2 merge.
Contributed by Varun Saxena
(cherry picked from commit dcd0bedcc8113dd5e1d852c242ae9511d1b3d58e)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/reader/security/TimelineReaderWhitelistAuthorizationFilter.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f7637b55
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f7637b55
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f7637b55
Branch: refs/heads/YARN-5355_branch2
Commit: f7637b55bbed753764cfd2bd3ab7a096c521c951
Parents: 1289b05
Author: bibinchundatt
Authored: Fri Sep 1 11:29:16 2017 +0530
Committer: Varun Saxena
Committed: Tue Oct 17 23:36:40 2017 +0530
--
.../server/resourcemanager/TestRMHATimelineCollectors.java | 4
.../timelineservice/storage/reader/EntityTypeReader.java| 9 ++---
.../storage/subapplication/SubApplicationTable.java | 6 +++---
.../collector/AppLevelTimelineCollectorWithAgg.java | 8 ++--
.../TimelineV2DelegationTokenSecretManagerService.java | 8
5 files changed, 11 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f7637b55/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.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/TestRMHATimelineCollectors.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java
index 7632a02..a0cd048 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHATimelineCollectors.java
@@ -26,8 +26,6 @@ import
org.apache.hadoop.yarn.server.timelineservice.storage.FileSystemTimelineW
import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineWriter;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
@@ -40,8 +38,6 @@ import static org.junit.Assert.assertEquals;
* transition.
*/
public class TestRMHATimelineCollectors extends RMHATestBase {
- public static final Logger LOG = LoggerFactory
- .getLogger(TestRMHATimelineCollectors.class);
@Before
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f7637b55/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/EntityTypeReader.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/EntityTypeReader.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/EntityTypeReader.java
index c5f9259..0764775 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/EntityTypeReader.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/EntityTypeReader.java
@@ -86,9 +86,7 @@ public final class EntityTypeReader extends
AbstractTimelineStorageReader {
typeFilterList.addFilter(new FirstKeyOnlyFilter());
typeFilterList.addFilter(new KeyOnlyFilter());
typeFilterList.addFilter(new PageFilter(1));
-if (LOG.isDebugEnabled()) {
- LOG.debug("FilterList created for scan is - " + typeFilterList);
-}
+LOG.debug("FilterList created for scan is - {}", typeFilterList);
int counter = 0;
while (true) {
@@ -112,10 +110,7 @@ pub
