Commit Graph

5524 Commits

Author SHA1 Message Date
Brandon Li e6d2096a18 HADOOP-10125. Merging change r1558575 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558952 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 23:01:53 +00:00
Daryn Sharp ce71fa1931 svn merge -c 1558883 FIXES: HADOOP-10146. Workaround JDK7 Process fd close bug (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558885 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 18:56:21 +00:00
Karthik Kambatla 5040a1e171 YARN-1606. Fix the default value of yarn.resourcemanager.zk-timeout-ms in yarn-default.xml (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558884 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 18:55:25 +00:00
Karthik Kambatla 7eb1ca53b3 YARN-1608. LinuxContainerExecutor has a few DEBUG messages at INFO level (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558875 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 18:44:35 +00:00
Alejandro Abdelnur 0c84c76954 MAPREDUCE-5724. JobHistoryServer does not start if HDFS is not running. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558853 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 17:12:31 +00:00
Sanford Ryza f5e4562408 YARN-1351. Invalid string format in Fair Scheduler log warn message (Konstantin Weitz via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558602 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 23:23:01 +00:00
Colin McCabe 40c1d3a6d6 HDFS-5766. In DFSInputStream, do not add datanode to deadNodes after InvalidEncryptionKeyException in fetchBlockByteRange (Liang Xie via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558535 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 19:23:21 +00:00
Colin McCabe f5961ec9df HDFS-5762. BlockReaderLocal does not return -1 on EOF when doing zero-length reads (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558528 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 19:19:12 +00:00
Suresh Srinivas 79fe328c5f HADOOP-10236. Merge change 1558498 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558500 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 18:32:40 +00:00
Alejandro Abdelnur e1595527c0 YARN-1601. 3rd party JARs are missing from hadoop-dist output. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558466 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 17:01:03 +00:00
Junping Du 534c8ce4c8 Merge 1558340 from trunk: YARN-1603. Remove two *.orig files which were unexpectedly committed. (Zhijie Shen via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558342 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 11:12:28 +00:00
Chris Nauroth b6b71bfd97 HADOOP-10234. Merging change r1558296 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558297 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 05:46:44 +00:00
Karthik Kambatla 1561f56b30 YARN-1598. HA-related rmadmin commands don't work on a secure cluster (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558253 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 01:00:19 +00:00
Sanford Ryza 04c7b8afb5 YARN-1567. In Fair Scheduler, allow empty queues to change between leaf and parent on allocation file reload (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558229 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 22:38:23 +00:00
Konstantin Boudnik 511f5136f8 HDFS-5677. Merge 1558217 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558220 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 22:02:32 +00:00
Konstantin Boudnik c9e403f652 Adding 2.0.6-alpha release to the CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558216 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 21:52:06 +00:00
Chris Nauroth a1d511639f HADOOP-10228. Merging change r1557236 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558146 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 18:25:17 +00:00
Jing Zhao 56e4457d22 HDFS-5579. Merge change r1557904 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557907 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 02:23:42 +00:00
Jing Zhao 716074bc80 HDFS-5710. Merge change r1557803 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557805 13f79535-47bb-0310-9956-ffa450edef68
2014-01-13 18:40:37 +00:00
Vinod Kumar Vavilapalli f35f702426 YARN-888. Cleaned up POM files so that non-leaf modules don't include any dependencies and thus compact the dependency list for leaf modules. Contributed by Alejandro Abdelnur.
svn merge --ignore-ancestry -c 1557801 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557802 13f79535-47bb-0310-9956-ffa450edef68
2014-01-13 18:34:39 +00:00
Alejandro Abdelnur 8cca1ae67e HADOOP-10223. MiniKdc#main() should close the FileReader it creates. (Ted Yu via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557628 13f79535-47bb-0310-9956-ffa450edef68
2014-01-12 23:26:39 +00:00
Vinod Kumar Vavilapalli 859ff0e192 YARN-1566. Changed Distributed Shell to retain containers across application attempts. Contributed by Jian He.
svn merge --ignore-ancestry -c 1557322 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557323 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 07:42:47 +00:00
Vinod Kumar Vavilapalli cb3d61bbe7 YARN-1041. Added the ApplicationMasterProtocol API for applications to use the ability in ResourceManager to optionally not kill containers when the ApplicationMaster exits. Contributed by Jian He.
svn merge --ignore-ancestry -c 1557318 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557319 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 07:08:06 +00:00
Jian He 0bdfb9f754 Merge r1557296 from trunk. YARN-1166. Fixed app-specific and attempt-specific QueueMetrics to be triggered by accordingly app event and attempt event. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557297 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 01:18:55 +00:00
Arpit Agarwal a96ff86044 HDFS-5747. Merging r1557289 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557291 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 00:14:19 +00:00
Karthik Kambatla a7632fa9e2 YARN-1574. RMDispatcher should be reset on transition to standby. (Xuan Gong via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557249 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:20:01 +00:00
Andrew Wang 5ecbc62eee HDFS-5756. hadoopRzOptionsSetByteBufferPool does not accept NULL argument, contrary to docs. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557245 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:11:49 +00:00
Chris Nauroth 16efa09548 HADOOP-10178. Merging change r1557236 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557238 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:03:31 +00:00
Karthik Kambatla aa9e5b5b1a YARN-1033. Expose RM active/standby state to Web UI and REST API (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557183 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 16:40:45 +00:00
Vinod Kumar Vavilapalli 76fc12eadf YARN-1490. Introduced the ability to make ResourceManager optionally not kill all containers when an ApplicationMaster exits. Contributed by Jian He.
svn merge --ignore-ancestry -c 1557143 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557144 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 15:05:18 +00:00
Karthik Kambatla 9619fc7740 YARN-1579. ActiveRMInfoProto fields should be optional (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557002 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 00:49:50 +00:00
Andrew Wang a2af7a32f1 HADOOP-9420. Add percentile or max metric for rpcQueueTime, processing time. Contributed by Liang Xie.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556984 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 23:42:32 +00:00
Chris Nauroth cf3ac1a59e YARN-1138. Merging change r1556978 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556979 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 23:10:43 +00:00
Kihwal Lee 98e8b1155f HDFS-5449. WebHdfs compatibility broken between 2.2 and 1.x / 23.x. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556928 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 19:28:42 +00:00
Karthik Kambatla fc73a88bd3 HADOOP-10214. Fix multithreaded correctness warnings in ActiveStandbyElector (Liang Xie via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556735 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 06:37:20 +00:00
Colin McCabe 082d4713bb HADOOP-10207. TestUserGroupInformation#testLogin is flaky (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556670 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 23:28:18 +00:00
Jing Zhao d1bf9f268e HADOOP-10208. Merge change r1556602 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556604 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 18:43:14 +00:00
Karthik Kambatla 72d69856d5 YARN-1568. Rename clusterid to clusterId in ActiveRMInfoProto (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556436 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 03:31:36 +00:00
Brandon Li 531605ef28 HDFS-5649. Merging change 1556405 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556409 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 23:56:02 +00:00
Vinod Kumar Vavilapalli c15f25363b YARN-1482. Modified WebApplicationProxy to make it work across ResourceManager fail-over. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1556380 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556381 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 22:17:00 +00:00
Arpit Agarwal 4c4ceedd38 HDFS-2832. Update editsStored and editsStored.xml for tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556340 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 20:15:50 +00:00
Jian He 5c47b8d78a Merge r1556318 from trunk. YARN-1293. Fixed TestContainerLaunch#testInvalidEnvSyntaxDiagnostics failure caused by non-English system locale. Contributed by Tsuyoshi OZAWA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556319 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 19:03:50 +00:00
Jason Darrell Lowe b8f59ebeaa svn merge -c 1556282 FIXES: YARN-1409. NonAggregatingLogHandler can throw RejectedExecutionException. Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556284 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 17:23:50 +00:00
Vinod Kumar Vavilapalli 9b38eb2c2e YARN-1029. Added embedded leader election in the ResourceManager. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1556103 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556105 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 01:56:56 +00:00
Arpit Agarwal 70ee0a35fb HDFS-5667. Merge r1555929 and r1555956 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556087 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:38:35 +00:00
Arpit Agarwal 1ec54d9532 HDFS-5406. Update CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556085 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:31:04 +00:00
Arpit Agarwal a7417a0af9 HDFS-5406. Merge r1551093 and r1551110 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556084 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:29:44 +00:00
Arpit Agarwal fe95f9a81f HDFS-5454. Merge r1551296 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556083 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:26:06 +00:00
Arpit Agarwal 4f044fc5ff HDFS-2832. Merge r1550363 from trunk for merging HDFS Heterogeneous Storage feature phase 1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556076 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 23:58:33 +00:00
Alejandro Abdelnur 9bf09c63f9 MAPREDUCE-3310. Addendum fixing javadocs warnings (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556064 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 23:21:29 +00:00