Commit Graph

5327 Commits

Author SHA1 Message Date
Jing Zhao e65e4c8afa HDFS-5561. Merge change r1545791 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545793 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 19:33:26 +00:00
Brandon Li 5aa5bad303 HDFS-5548. Merging change r1545756 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545759 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 18:19:34 +00:00
Vinod Kumar Vavilapalli c2ff57f804 YARN-1314. Fixed DistributedShell to not fail with multiple arguments for a shell command separated by spaces. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1545486 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545487 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 01:10:51 +00:00
Vinod Kumar Vavilapalli 43d4537dcb YARN-1416. Fixed a few invalid transitions in RMApp, RMAppAttempt and in some tests. Contributed by Jian He.
svn merge --ignore-ancestry -c 1545448 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545449 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 23:11:01 +00:00
Suresh Srinivas e3f9960a7d HADOOP-10126. Merge change 1545376 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545379 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 19:46:46 +00:00
Jing Zhao 543db74645 HDFS-5533. Merge change r1545357 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545358 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 18:08:57 +00:00
Kihwal Lee 204a17c736 svn merge -c 1545322 merging from trunk to branch-2 to fix HDFS-5266. Datanode cannot roll back to previous layout version.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545324 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 15:36:39 +00:00
Sanford Ryza c0bcf404d5 YARN-1423. Support queue placement by secondary group in the Fair Scheduler (Ted Malaska via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545158 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 06:17:27 +00:00
Jing Zhao 65c9af5538 HDFS-5552. Merge change r1544627 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544636 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:50:53 +00:00
Jing Zhao 08b96cc2a3 HDFS-5525. Merge change r1543895 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544635 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:49:07 +00:00
Jing Zhao addb9f1e22 HDFS-5444. Merge change r1541753 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544634 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:45:31 +00:00
Uma Maheswara Rao G 78af36bb07 Merge HDFS-5544. Adding Test case For Checking dfs.checksum.type as NULL value. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544598 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 16:14:37 +00:00
Brandon Li db3ed5df52 HDFS-5407. Merging change r1544362 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544378 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 23:59:22 +00:00
Vinod Kumar Vavilapalli c282e06097 YARN-1320. Fixed Distributed Shell application to respect custom log4j properties file. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1544364 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544365 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 23:17:48 +00:00
Brandon Li 90d5ecf92e HDFS-5288. Merging change r1544352 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544359 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 22:55:12 +00:00
Jason Darrell Lowe 6d57c95003 svn merge -c 1544266 FIXES: MAPREDUCE-5631. TestJobEndNotifier.testNotifyRetries fails with Should have taken more than 5 seconds in jdk7. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544267 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 17:55:40 +00:00
Jonathan Turner Eagles e34bc8dc97 HADOOP-10111. Allow DU to be initialized with an initial value (Kihwal Lee via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544241 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 16:19:18 +00:00
Uma Maheswara Rao G 87a23fa27f Merge HADOOP-9114. After defined the dfs.checksum.type as the NULL, write file and hflush will through java.lang.ArrayIndexOutOfBoundsException. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544190 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 14:08:49 +00:00
Steve Loughran 92d615a37a HADOOP-10103 commons-lang->2.6
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544173 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 13:36:59 +00:00
Jing Zhao 2bba4969d1 HDFS-5532. Merge change r1544047 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544048 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 07:20:18 +00:00
Vinod Kumar Vavilapalli 83e907c32c YARN-1303. Reverted the wrong patch committed earlier and committing the correct patch now. In one go.
svn merge --ignore-ancestry -c 1544029 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544030 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 04:11:22 +00:00
Vinod Kumar Vavilapalli 8f5ec0f5f8 YARN-1303. Fixed DistributedShell to not fail with multiple commands separated by a semi-colon as shell-command. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1544023 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544024 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 03:47:27 +00:00
Bikas Saha eb97badbcd Merge r1543973 from trunk to branch-2 for YARN-1053. Diagnostic message from ContainerExitEvent is ignored in ContainerImpl (Omkar Vinit Joshi via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543974 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 22:29:16 +00:00
Jing Zhao 7e10509fe4 HDFS-3987. Merge change r1543962 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543967 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 22:00:32 +00:00
Bikas Saha 0bf221368f Merge r1543952 from trunk to branch-2 for YARN-1425. TestRMRestart fails because MockRM.waitForState(AttemptId) uses current attempt instead of the attempt passed as argument (Omkar Vinit Joshi via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543954 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 21:22:34 +00:00
Uma Maheswara Rao G 6e1234cbf4 Merge HDFS-5014. Process register commands with out holding BPOfferService lock. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543862 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 16:29:08 +00:00
Uma Maheswara Rao G b0bd967090 Merge HDFS-4516. Client crash after block allocation and NN switch before lease recovery for the same file can cause readers to fail forever. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543839 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 15:04:05 +00:00
Bikas Saha 49377f273e Merge r1543707 from trunk to branch-2 for YARN-744. Race condition in ApplicationMasterService.allocate .. It might process same allocate request twice resulting in additional containers getting allocated. (Omkar Vinit Joshi via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543709 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 05:22:40 +00:00
Sanford Ryza 20c176fe27 Move YARN-1407 under 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543682 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 00:52:39 +00:00
Sanford Ryza da6d4dbc13 YARN-1407. RM Web UI and REST APIs should uniformly use YarnApplicationState (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543678 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 00:49:34 +00:00
Jonathan Turner Eagles dd889fc773 HDFS-1386. TestJMXGet fails in jdk7 (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543613 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 22:47:42 +00:00
Sanford Ryza b98b50b46c YARN-786: Addendum so that RMAppAttemptImpl#getApplicationResourceUsageReport won't return null
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543600 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 22:26:12 +00:00
Arun Murthy 258775c9fd Merge -c 1543542 from trunk to branch-2 to fix HADOOP-10047. Add a direct-buffer based apis for compression. Contributed by Gopal V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543543 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 19:30:04 +00:00
Arun Murthy 71f9f49590 Revert HADOOP-10047, wrong patch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543539 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 19:26:01 +00:00
Arun Murthy 9ff2130eeb Merge -c 1543456 from trunk to branch-2 to fix HADOOP-10047. Add a direct-buffer based apis for compression. Contributed by Gopal V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543457 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 15:39:16 +00:00
Sanford Ryza 86fd96080d YARN-584. In scheduler web UIs, queues unexpand on refresh. (Harshit Daga via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543352 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 09:03:31 +00:00
Jing Zhao b07bd1006d HADOOP-10107. Merge change r1543335 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543338 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 07:44:30 +00:00
Jing Zhao 918cf98cac HDFS-5428. Merge change r1543329 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543332 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 07:39:46 +00:00
Vinod Kumar Vavilapalli 0b57905309 YARN-674. Fixed ResourceManager to renew DelegationTokens on submission asynchronously to work around potential slowness in state-store. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1543312 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543313 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 05:21:45 +00:00
Vinod Kumar Vavilapalli 8613e7ef3d YARN-1210. Changed RM to start new app-attempts on RM restart only after ensuring that previous AM exited or after expiry time. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1543310 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543311 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 05:17:56 +00:00
Arpit Agarwal 0e9d89a70f HDFS-5073. Merging r1543303 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543304 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 04:11:33 +00:00
Vinod Kumar Vavilapalli a70140e1ba YARN-709. Added tests to verify validity of delegation tokens and logging of appsummary after RM restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1543269 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543271 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 00:52:04 +00:00
Jing Zhao 540d8b6c07 HDFS-5393. Merge change r1543248 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543249 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 00:39:44 +00:00
Arpit Agarwal 2966ba01cf HADOOP-10110. Merging change r1543190 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543196 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 22:17:41 +00:00
Jason Darrell Lowe 40129be1fe svn merge -c 1543117 FIXES: YARN-1419. TestFifoScheduler.testAppAttemptMetrics fails intermittently under jdk7. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543121 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 19:29:29 +00:00
Uma Maheswara Rao G c155a5b368 HDFS-5372. In FSNamesystem, hasReadLock() returns false if the current thread holds the write lock (Contributed by Vinay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543029 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 13:56:39 +00:00
Jonathan Turner Eagles 27c0b5fb20 MAPREDUCE-5625. TestFixedLengthInputFormat fails in jdk7 environment (Mariappan Asokan via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542736 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 14:39:04 +00:00
Brandon Li 5807cdad5a HDFS-5519. Merging change r1542437 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542653 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 05:52:42 +00:00
Jonathan Turner Eagles 1bbeb539e6 MAPREDUCE-5373. TestFetchFailure.testFetchFailureMultipleReduces could fail intermittently (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542459 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 03:34:10 +00:00
Jing Zhao 53f2a1efe5 HDFS-5502. Merge change r1542438 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542439 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 01:06:27 +00:00