142 Commits

Author SHA1 Message Date
Jason Lowe
81f8927050 YARN-3404. Display queue name on application page. Contributed by Ryu Kobayashi
(cherry picked from commit b2e6cf607f1712d103520ca6b3ff21ecc07cd265)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java
2016-02-12 18:59:51 +00:00
Jason Lowe
8ab642989c YARN-4439. Clarify NMContainerStatus#toString method. Contributed by Jian He 2015-12-15 18:06:13 +00:00
Jason Lowe
97a20ff2c6 Revert "YARN-4439. Clarify NMContainerStatus#toString method. Contributed by"
This reverts commit 1507d30bc126cac3f18a87de0936c2d0d0d1ccff.

Conflicts:

	hadoop-yarn-project/CHANGES.txt
2015-12-15 17:59:45 +00:00
Xuan
1507d30bc1 YARN-4439. Clarify NMContainerStatus#toString method. Contributed by
Jian He

(cherry picked from commit d8a45425eba372cdebef3be50436b6ddf1c4e192)
(cherry picked from commit 992f65dd8b53ee31b6b7347e2cfe59a78d031268)
2015-12-14 15:42:38 -08:00
Jian He
6a30d93aa4 YARN-3840. Resource Manager web ui issue when sorting application by id (with application having id > 9999). Contributed by Mohammad Shahid Khan and Varun Saxena
(cherry picked from commit 9f77ccad735f4843ce2c38355de9f434838d4507)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
2015-12-03 14:11:48 -08:00
Jian He
27b786660e Revert "YARN-3840. Resource Manager web ui issue when sorting application by id (with application having id > 9999) Contributed by Mohammad Shahid Khan"
This reverts commit cb4d4d5918c4d488056e5521e343aaa9ffbd24d1.

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2015-11-16 20:20:46 -08:00
Jian He
cb4d4d5918 YARN-3840. Resource Manager web ui issue when sorting application by id (with application having id > 9999) Contributed by Mohammad Shahid Khan
(cherry picked from commit 8fbea531d7f7b665f6f55af54c8ebf330118ff37)
(cherry picked from commit a4ff03b200cf02a49ab81fa3c71cb707f6d2fee1)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
	hadoop-yarn-project/CHANGES.txt
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
2015-11-09 14:30:47 -08:00
Vinod Kumar Vavilapalli
09348c4bce Preparing for 2.7.3 development 2015-11-03 15:18:10 -08:00
Jonathan Eagles
49a7d70f53 YARN-4009. CORS support for ResourceManager REST API. ( Varun Vasudev via jeagles)
(cherry picked from commit f8adeb712dc834c27cec15c04a986f2f635aba83)
2015-10-23 11:18:32 -05:00
Jason Lowe
29838ff5b1 YARN-4281. 2.7 RM app page is broken. Contributed by Chang Li 2015-10-21 13:43:25 +00:00
Xuan
dce9223622 YARN-3248. Display count of nodes blacklisted by apps in the web UI.
Contributed by Varun Vasudev

(cherry picked from commit 4728bdfa15809db4b8b235faa286c65de4a48cf6)
2015-09-23 14:44:42 -07:00
Zhijie Shen
e48bffd055 YARN-3700. Made generic history service load a number of latest applications according to the parameter or the configuration. Contributed by Xuan Gong.
(cherry picked from commit 54504133f41e36eaea6bb06c7b9ddb249468ecd7)
(cherry picked from commit 839f81a6326b2f8b3d5183178382c1551b0bc259)
2015-09-10 11:56:27 -07:00
Jonathan Eagles
dcffe43419 YARN-3978. Configurably turn off the saving of container info in Generic AHS (Eric Payne via jeagles)
(cherry picked from commit 3cd02b95224e9d43fd63a4ef9ac5c44f113f710d)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
2015-08-03 10:53:43 -05:00
Jonathan Eagles
009f5fbad6 YARN-3905. Application History Server UI NPEs when accessing apps run after RM restart (Eric Payne via jeagles)
(cherry picked from commit 7faae0e6fe027a3886d9f4e290b6a488a2c55b3a)
2015-07-17 11:16:37 -05:00
Vinod Kumar Vavilapalli
a36f090c55 Preparing for 2.7.2 development: mvn versions:set -DnewVersion=2.7.2 2015-06-28 16:41:12 -07:00
Xuan
1ad0d43fb4 Revert "YARN-1462. Made RM write application tags to timeline server and exposed them to users via generic history web UI and REST API. Contributed by Xuan Gong."
This reverts commit 2032e8d1a0c6abe154a64df69b0124cdae9f78e0.
2015-06-01 11:29:36 -07:00
Xuan
0943e0f5a8 YARN-2900. Application (Attempt and Container) Not Found in AHS results
in Internal Server Error (500). Contributed by Zhijie Shen and Mit Desai
2015-05-31 15:41:13 -07:00
Zhijie Shen
2032e8d1a0 YARN-1462. Made RM write application tags to timeline server and exposed them to users via generic history web UI and REST API. Contributed by Xuan Gong. 2015-05-30 09:39:49 -07:00
Zhijie Shen
071e21cacd YARN-3539. Updated timeline server documentation and marked REST APIs evolving. Contributed by Steve Loughran.
(cherry picked from commit fcd0702c10ce574b887280476aba63d6682d5271)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2015-05-12 21:19:33 -07:00
Jian He
4e8e9d717c YARN-3301. Fixed the format issue of the new RM attempt web page. Contributed by Xuan Gong 2015-05-06 14:00:29 -07:00
Zhijie Shen
04dd05989e YARN-3544. Got back AM logs link on the RM web UI for a completed app. Contributed by Xuan Gong. 2015-04-30 13:07:15 -07:00
Akira Ajisaka
48d6e994bf MAPREDUCE-6300. Task list sort by task id broken. Contributed by Siqi Li.
(cherry picked from commit 1fa8075794894b3e0053d251788277fb88e85533)
(cherry picked from commit 51c458a5c4562c54ff147824816f7b44c4b9b8f6)
2015-04-16 10:16:48 -05:00
Vinod Kumar Vavilapalli
a7fa46c2e0 Preparing for 2.7.1 development: mvn versions:set 2015-04-09 14:13:30 -07:00
Jian He
edc3cb736e YARN-3273. Improve scheduler UI to facilitate scheduling analysis and debugging. Contributed Rohith Sharmaks
(cherry picked from commit 658097d6da1b1aac8e01db459f0c3b456e99652f)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppAttemptBlock.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/CapacitySchedulerLeafQueueInfo.java
2015-04-06 13:17:31 -07:00
Haohui Mai
28095c26f7 HADOOP-10670. Allow AuthenticationFilters to load secret from signature secret files. Contributed by Kai Zheng. 2015-03-25 12:30:58 -07:00
Jian He
e67bd31ac0 YARN-3379. Fixed missing data in localityTable and ResourceRequests table in RM WebUI. Contributed by Xuan Gong
(cherry picked from commit 4e886eb9cbd2dcb128bbfd17309c734083093a4c)
2015-03-19 22:34:34 -07:00
Tsuyoshi Ozawa
2b2f7f2b90 YARN-1453. [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in doc comments. Contributed by Akira AJISAKA, Andrew Purtell, and Allen Wittenauer.
(cherry picked from commit 3da9a97cfbcc3a1c50aaf85b1a129d4d269cd5fd)
2015-03-16 23:20:34 +09:00
Xuan
6ee45ae3a8 YARN-3171. Sort by Application id, AppAttempt and ContainerID doesn't
work in ATS / RM web ui. Contributed by Naganarasimha G R

(cherry picked from commit 3ff1ba2a7b00fdf06270d00b2193bde4b56b06b3)
2015-03-15 20:28:09 -07:00
Zhijie Shen
ec9816b2b3 YARN-1884. Added nodeHttpAddress into ContainerReport and fixed the link to NM web page. Contributed by Xuan Gong.
(cherry picked from commit 85f6d67fa78511f255fcfa810afc9a156a7b483b)
2015-03-11 19:41:20 -07:00
Jian He
d579fddf24 YARN-3300. Outstanding_resource_requests table should not be shown in AHS. Contributed by Xuan Gong
(cherry picked from commit c3003eba6f9802f15699564a5eb7c6e34424cb14)
2015-03-09 20:48:09 -07:00
Tsuyoshi Ozawa
28f4e6b222 HADOOP-11602. Backport 'Fix toUpperCase/toLowerCase to use Locale.ENGLISH.' (ozawa)
(cherry picked from commit b46f9e72dbed6fd1f8cae1e12973252462d6ee15)
2015-03-09 19:54:45 +09:00
Jian He
a5f3fb4dc1 YARN-1809. Synchronize RM and TimeLineServer Web-UIs. Contributed by Zhijie Shen and Xuan Gong
(cherry picked from commit 95bfd087dc89e57a93340604cc8b96042fa1a05a)
2015-03-05 21:27:03 -08:00
Xuan
f8435c5d3d YARN-3236. Cleanup RMAuthenticationFilter#AUTH_HANDLER_PROPERTY.
Contributed by zhihai xu

(cherry picked from commit e3d290244c8a39edc37146d992cf34e6963b6851)
2015-02-21 16:20:33 -08:00
Zhijie Shen
3ab3caa9ea YARN-2543. Made resource usage be published to the timeline server too. Contributed by Naganarasimha G R.
(cherry picked from commit e5b56e2af6b48cbc8501f624ae4b4f9d13eccacf)
2015-02-03 17:35:40 -08:00
Tsuyoshi Ozawa
ff627d94e7 YARN-3082. Non thread safe access to systemCredentials in NodeHeartbeatResponse processing. Contributed by Anubhav Dhoot.
(cherry picked from commit 3aab354e664a3ce09e0d638bf0c1e7d273d40579)
2015-01-23 16:05:05 +09:00
Zhijie Shen
dcd6eed13a YARN-2815. Excluded transitive dependency of JLine in hadoop-yarn-server-common. Contributed by Ferdinand Xu.
(cherry picked from commit 43302f6f44f97d67069eefdda986b6da2933393e)
2015-01-16 16:38:36 -08:00
Junping Du
361fab14be YARN-2940. Fix new findbugs warnings in rest of the hadoop-yarn components. (Contributed by Li Lu)
(cherry picked from commit d468c9aaf15e977f12e6214b47996412c907e069)
2014-12-23 20:06:53 -08:00
Karthik Kambatla
ff1b13ded5 YARN-2236. [YARN-1492] Shared Cache uploader service on the Node Manager. (Chris Trezzo and Sanjin Lee via kasha)
(cherry picked from commit a04143039e7fe310d807f40584633096181cfada)
2014-11-12 09:31:30 -08:00
Arun C. Murthy
adfb830a2b Preparing to release hadoop-2.6.0: Set version in branch-2 to 2.7.0-SNAPSHOT. 2014-11-09 19:19:02 -08:00
Arun C. Murthy
175d222bfc YARN-2830. Add backwords compatible ContainerId.newInstance constructor. Contributed by Jonathan Eagles.
(cherry picked from commit 43cd07b408c6613d2c9aa89203cfa3110d830538)
2014-11-09 15:03:59 -08:00
Haohui Mai
aa09c4c342 HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai. 2014-11-04 14:52:51 -08:00
Vinod Kumar Vavilapalli
6d4a04a033 YARN-2789. Re-instated the NodeReport.newInstance private unstable API modified in YARN-2698 so that tests in YARN frameworks don't break. Contributed by Wangda Tan.
(cherry picked from commit 6ce32f593bff6788084ce9bc1e11ade74ed3dbaf)
2014-10-31 15:33:41 -07:00
Karthik Kambatla
268af259b5 YARN-2186. [YARN-1492] Node Manager uploader service for cache manager. (Chris Trezzo and Sangjin Lee via kasha)
(cherry picked from commit 256697acd5ec16bca022ae86e22f9882b3309d8b)
2014-10-31 13:01:25 -07:00
Vinod Kumar Vavilapalli
0ba8d8c19c YARN-2698. Moved some node label APIs to be correctly placed in client protocol. Contributed by Wangda Tan.
(cherry picked from commit e0233c16ebd06bb3aabeb523cd17259008e243ef)
2014-10-30 23:02:06 -07:00
Vinod Kumar Vavilapalli
0ad33e1483 YARN-2704. Changed ResourceManager to optionally obtain tokens itself for the sake of localization and log-aggregation for long-running services. Contributed by Jian He.
(cherry picked from commit a16d022ca4313a41425c8e97841c841a2d6f2f54)
2014-10-27 15:50:51 -07:00
Jian He
2d3c64943d YARN-2591. Fixed AHSWebServices to return FORBIDDEN(403) if the request user doesn't have access to the history data. Contributed by Zhijie Shen
(cherry picked from commit c05b581a5522eed499d3ba16af9fa6dc694563f6)
2014-10-27 10:46:37 -07:00
Karthik Kambatla
acc6f622e0 YARN-2183. [YARN-1492] Cleaner service for cache manager. (Chris Trezzo and Sangjin Lee via kasha)
(cherry picked from commit c51e53d7aad46059f52d4046a5fedfdfd3c37955)
2014-10-25 11:50:06 -07:00
Zhijie Shen
3b03ea6b50 YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and made related MR changes. Contributed by Jian He.
(cherry picked from commit 0f3b6900be1a3b2e4624f31f84656f4a32dadce9)
2014-10-23 22:03:30 -07:00
Vinod Kumar Vavilapalli
77dc9afe86 YARN-2715. Fixed ResourceManager to respect common configurations for proxy users/groups beyond just the YARN level config. Contributed by Zhijie Shen.
(cherry picked from commit c0e034336c85296be6f549d88d137fb2b2b79a15)
2014-10-21 20:10:45 -07:00
Jian He
f93d2ea27e YARN-2312. Deprecated old ContainerId#getId API and updated MapReduce to use ContainerId#getContainerId instead. Contributed by Tsuyoshi OZAWA 2014-10-15 15:28:26 -07:00