Commit Graph

5505 Commits

Author SHA1 Message Date
Steve Loughran a7bfe3efe3 MAPREDUCE-6524 Move grizzly-test and junit dependencies to test scope
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541699 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:43:04 +00:00
Steve Loughran 026ead7d45 HDFS-5075 httpfs-config.sh calls out incorrect env script name
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541687 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:08:08 +00:00
Steve Loughran 5dd3da295d MAPREDUCE-5431 Missing pom dependency in MR-client
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541680 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:50:17 +00:00
Jing Zhao bba2cfab96 HDFS-5440. Merge change 1541665 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541671 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:34:08 +00:00
Steve Loughran 572355f632 HADOOP-9594 commons-math
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541668 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:30:21 +00:00
Steve Loughran 91342b9820 HADOOP-9594 commons-math
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541667 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:29:56 +00:00
Jason Darrell Lowe 55a9d7dc50 svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541583 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 16:19:21 +00:00
Sanford Ryza 5653892571 MAPREDUCE-5613. DefaultSpeculator holds and checks hashmap that is alway empty (Gera Shegalov via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541435 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 09:26:30 +00:00
Jonathan Turner Eagles 1884c3a0b9 YARN-1386. NodeManager mistakenly loses resources and relocalizes them (Jason Lowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541376 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 03:26:20 +00:00
Chris Nauroth 2cdd8f1b63 HADOOP-10093. Merging change r1541343 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541344 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 01:17:57 +00:00
Jing Zhao f1aa8a866c HDFS-5425. Merge change r1541261 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541271 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 22:15:04 +00:00
Chris Nauroth 9b3b133edf YARN-1400. Merging change r1540938 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540940 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 03:59:33 +00:00
Sanford Ryza 7b819a313e MAPREDUCE-1176. FixedLengthInputFormat and FixedLengthRecordReader (Mariappan Asokan and BitsOfInfo via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540932 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 03:11:19 +00:00
Andrew Wang 90fbbb8138 HDFS-5495. Remove further JUnit3 usages from HDFS. Contributed by Jarek Jarcec Cecho.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540916 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 02:05:10 +00:00
Jing Zhao fb08c97e7e HDFS-5488. Merge change r1540894 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540897 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 00:27:12 +00:00
Sanford Ryza fd1dd57fc5 YARN-1387. RMWebServices should use ClientRMService for filtering applications (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540856 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 21:52:07 +00:00
Chris Nauroth 01808fa1b5 YARN-1395. Merging change r1540839 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540842 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 20:52:22 +00:00
Jason Darrell Lowe 97dc10bee5 svn merge -c 1540813 FIXES: MAPREDUCE-5186. mapreduce.job.max.split.locations causes some splits created by CombineFileInputFormat to fail. Contributed by Robert Parker and Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540819 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 19:30:25 +00:00
Andrew Wang b458fc7d9c HDFS-5467. Remove tab characters in hdfs-default.xml. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540815 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 19:24:44 +00:00
Brandon Li 65fd32800d HDFS-5469. Merging change r1540443 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540444 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 04:25:57 +00:00
Chris Nauroth b13c6bda43 HADOOP-10088. Merging change r1540270 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540271 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 07:38:16 +00:00
Jing Zhao 6df4fc4e92 HDFS-5325. Merge change r1540235 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540237 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 01:25:11 +00:00
Vinod Kumar Vavilapalli ec91e5da1b YARN-1121. Changed ResourceManager's state-store to drain all events on shut-down. Contributed by Jian He.
svn merge --ignore-ancestry -c 1540232 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540233 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 00:56:26 +00:00
Jing Zhao 76a7119930 HDFS-5371. Merge change r1540197 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540200 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 21:43:15 +00:00
Jing Zhao 37e18a4c0b HDFS-5476. Merge change r1540142 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540144 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 18:22:35 +00:00
Brandon Li 5f82524fe3 HDFS-5364. Merging change r1539834 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539891 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 01:03:10 +00:00
Jing Zhao cbe493200b HDFS-5443. Merge change r1539754 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539758 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 18:45:15 +00:00
Brandon Li f87469c7aa HDFS-5252. Merging change r1539740 form trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539742 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 18:10:33 +00:00
Chris Nauroth 5406659b12 HADOOP-9660. Merging change r1539535 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539536 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 06:52:19 +00:00
Chris Nauroth c02e97c531 MAPREDUCE-5451. Merging change r1539413 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539416 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 18:17:32 +00:00
Colin McCabe 825103c331 move HADOOP-9623 to 2.2.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539261 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 08:08:33 +00:00
Colin McCabe 60dd68f4bb HADOOP-9623. Update jet3t dependency to 0.9.0 (Amandeep Khurana via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539256 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 08:02:55 +00:00
Luke Lu 9b1122e0eb YARN-311. RM/scheduler support for dynamic resource configuration. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539132 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 21:20:05 +00:00
Andrew Wang b58d5bad64 HDFS-5458. Datanode failed volume threshold ignored if exception is thrown in getDataDirsFromURIs. Contributed by Mike Mellenthin.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539092 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 18:27:06 +00:00
Vinod Kumar Vavilapalli c8d2faab1b YARN-1374. Changed ResourceManager to start the preemption policy monitors as active services. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1539089 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539090 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 18:26:07 +00:00
Jing Zhao 213bf915fd HDFS-5427. Merge change r1538875 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538876 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 06:45:31 +00:00
Chris Nauroth 259a78120b HDFS-5456. Merging change r1538872 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538873 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 06:06:54 +00:00
Sanford Ryza cc280ad063 YARN-1388. Fair Scheduler page always displays blank fair share (Liyin Liang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538856 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 02:16:51 +00:00
Sanford Ryza 01876ec36b YARN-1323. Set HTTPS webapp address along with other RPC addresses in HAUtil (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538852 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 01:57:07 +00:00
Colin McCabe 5324b77a60 HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538252 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 18:51:14 +00:00
Uma Maheswara Rao G 7d86f49109 Merge HDFS-5344. Make LsSnapshottableDir as Tool interface implementation. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538158 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 09:07:59 +00:00
Andrew Wang 98575f07cc Move HDFS-5035 to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538122 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 01:07:36 +00:00
Colin McCabe 2946a3afdf HADOOP-10079. log a warning message if group resolution takes too long (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538114 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 00:48:29 +00:00
Andrew Wang 7c9efe4095 HDFS-5037. Active NN should trigger its own edit log rolls. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538061 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 20:58:23 +00:00
Chris Nauroth 5b7f2a5a2d MAPREDUCE-5604. Merging change r1538035 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538038 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 19:12:36 +00:00
Sanford Ryza d023d52062 MAPREDUCE-5601. ShuffleHandler fadvises file regions as DONTNEED even when fetch fails (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537856 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 08:55:05 +00:00
Sanford Ryza ba85796267 YARN-786. Expose application resource usage in RM REST API (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537811 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 03:03:24 +00:00
Sanford Ryza 7ff13102d5 YARN-1290. Let continuous scheduling achieve more balanced task assignment (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537735 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 22:07:09 +00:00
Andrew Wang 4dfa0bf99f HADOOP-9898. Set SO_KEEPALIVE on all our sockets. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537638 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 20:56:42 +00:00
Sanford Ryza 3c0ad2500d YARN-1381. Same relaxLocality appears twice in exception message of AMRMClientImpl#checkLocalityRelaxationConflict() (Ted Yu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537636 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 20:53:56 +00:00