7382 Commits

Author SHA1 Message Date
Zhijie Shen
ab448565c9 HADOOP-11179. Java untar should handle the case that the file entry comes without its parent directory entry. Contributed by Craig Welch.
(cherry picked from commit a1690519317068d9855174752d22ff45f0e4c962)
2014-10-08 15:39:30 -07:00
Colin Patrick Mccabe
204148f0d4 HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected by the lock (cmccabe) 2014-10-08 13:58:28 -07:00
Kihwal Lee
522b6505f4 HDFS-7203. Concurrent appending to the same file can cause data
corruption. Contributed by Kihwal Lee.
(cherry picked from commit 853cb704edf54207313c0e70c9c375212d288b60)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-10-08 15:10:03 -05:00
Steve Loughran
088ae9c5bf YARN-913 service registry: YARN-2652 add hadoop-yarn-registry package under hadoop-yarn 2014-10-08 12:54:37 -07:00
Jian He
7ec65c8617 YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. Contributed by Ming Ma
(cherry picked from commit e16e25ab1beac89c8d8be4e9f2a7fbefe81d35f3)
2014-10-08 11:03:28 -07:00
Andrew Wang
2c27b7b26f HADOOP-11169. Fix DelegationTokenAuthenticatedURL to pass the connection Configurator to the authenticator. (Arun Suresh via wang)
(cherry picked from commit b2f619752355d4ef6733935c020f57c8a26d82e1)
2014-10-07 14:51:52 -07:00
Kihwal Lee
06587e4876 Fix version in pom.xml from HADOOP-11007 in branch-2.6 2014-10-07 16:40:01 -05:00
Kihwal Lee
0a36b6808f Missing files from the previous commit of HADOOP-11007 2014-10-07 16:32:55 -05:00
Kihwal Lee
3f200fddfd HADOOP-11007. Reinstate building of ant tasks support. Contributed by
Jason Lowe.
(cherry picked from commit 99d7a452be91b3aefe9bcde9b51893ff6719742e)
2014-10-07 16:24:23 -05:00
Jian He
5ff984f33f YARN-1857. CapacityScheduler headroom doesn't account for other AM's running. Contributed by Chen He and Craig Welch
(cherry picked from commit 30d56fdbb40d06c4e267d6c314c8c767a7adc6a3)
2014-10-07 13:48:46 -07:00
Jason Lowe
e835cb5c86 MAPREDUCE-6029. TestCommitterEventHandler fails in trunk. Contributed by Mit Desai
(cherry picked from commit 2e789eb2261fa607489d8ae630fb77e8147d0266)
2014-10-07 14:13:12 +00:00
Haohui Mai
1bd45fa165 HADOOP-11168. Remove duplicated entry dfs.webhdfs.enabled in the user doc. Contributed by Yi Liu. 2014-10-06 22:08:01 -06:00
Jian He
efc482d1f7 YARN-2644. Fixed CapacityScheduler to return up-to-date headroom when AM allocates. Contributed by Craig Welch
(cherry picked from commit 519e5a7dd2bd540105434ec3c8939b68f6c024f8)
2014-10-06 15:52:05 -07:00
Jian He
73a1b77223 YARN-2615. Changed ClientToAMTokenIdentifier/RM(Timeline)DelegationTokenIdentifier to use protobuf as payload. Contributed by Junping Du
(cherry picked from commit ea26cc0b4ac02b8af686dfda80f540e5aa70c358)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientToAMTokens.java
2014-10-06 10:52:20 -07:00
Chris Douglas
0b2dedc42d YARN-1051. Add a system for creating reservations of cluster capacity.
Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit c8212bacb1b2a7e6ee83cc56f72297465ce99390)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
(cherry picked from commit ebf4aae60f7a641ac7406e27d43528cace20d4ff)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2014-10-06 10:30:04 -07:00
subru
114f09226e YARN-2611. Fixing jenkins findbugs warning and TestRMWebServicesCapacitySched for branch YARN-1051. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit c47464aba407d1dafe10be23fe454f0489cc4367)
(cherry picked from commit a2986234be4e02f9ccb589f9ff5f7ffb28bc6400)
(cherry picked from commit fb5e9df7fd09a5cbc2c98bc9c875faf6a3b8f7c0)
2014-10-06 10:29:14 -07:00
subru
bf4394e160 YARN-2576. Making test patch pass in branch. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit 90ac0be86b898aefec5471db4027554c8e1b310c)
(cherry picked from commit 5e10a13bb4759984494c6a870c7f08fb6693c9c0)
(cherry picked from commit ae0f16ccc837de2e32d7137cf48d5b17cb7c18d4)
2014-10-06 10:29:14 -07:00
subru
256a951049 MAPREDUCE-6103.Adding reservation APIs to MR resource manager delegate. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit aa92dd45f2d8c89a8a17ad2e4449aa3ff08bc53a)
(cherry picked from commit 3f282762d1afc916de9207d3adeda852ca344853)
(cherry picked from commit 30a370e70504a4cc3222da0dc706c871fcebfa78)
2014-10-06 10:29:13 -07:00
subru
d244b2ae3a YARN-2080. Integrating reservation system with ResourceManager and client-RM protocol. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit 8baeaead8532898163f1006276b731a237b1a559)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
(cherry picked from commit 6261f7cc69a0eb3eebc9898c7599c7c20f432b4e)
(cherry picked from commit cbfbdf60d69e70c1821d5b3d343a4f5c0c2a410f)
2014-10-06 10:29:13 -07:00
subru
8e92b3ec9d YARN-1712. Plan follower that synchronizes the current state of reservation subsystem with the scheduler. Contributed by Subru Krishnan and Carlo Curino.
(cherry picked from commit 169085319b8b76641f8b9f6840a3fef06d221e2b)
(cherry picked from commit 3418c56bcf4bbddaf483bdaa1a15a8bbc4039bfe)
(cherry picked from commit fec639cda14f56b87052512c166c8e42a0ba6cf4)
2014-10-06 10:29:13 -07:00
carlo curino
56972123ff YARN-1711. Policy to enforce instantaneous and over-time quotas on user reservation. Contributed by Carlo Curino and Subru Krishnan.
(cherry picked from commit c4918cb4cb5a267a8cfd6eace28fcfe7ad6174e8)
(cherry picked from commit b6df0dddcdafd7ec67c76ea92aea3ff3e94db247)
(cherry picked from commit 6bfdaf06c496c9db87c054977617c16e372325ac)
2014-10-06 10:29:13 -07:00
carlo curino
4ee027b9d6 YARN-1710. Logic to find allocations within a Plan that satisfy user ReservationRequest(s). Contributed by Carlo Curino and Subru Krishnan.
(cherry picked from commit aef7928899b37262773f3dc117157bb746bf8918)
(cherry picked from commit f66ffcf832235e0da0bb050fff08e248b547c360)
(cherry picked from commit 6a3c167175ba98e002b6a67ce73355974c1263da)
2014-10-06 10:29:13 -07:00
subru
056b7f5799 YARN-1709. In-memory data structures used to track resources over time to enable reservations.
(cherry picked from commit 0d8b2cd88b958b1e602fd4ea4078ef8d4742a7c3)
(cherry picked from commit cf4b34282aafee9f6b09d3433c4de1ae4b359168)
(cherry picked from commit 63250ef9d6410f5db20dfe421870c655e2c0fd65)
2014-10-06 10:29:13 -07:00
subru
f4522fd987 YARN-1708. Public YARN APIs for creating/updating/deleting reservations.
(cherry picked from commit 3f2e3b275bcf29264a112c5d2f4eae289fe7f52c)
(cherry picked from commit c9266df40434fdde05bd3a4c75f7a6bc29db760f)
(cherry picked from commit 3a167056d10707bb3144e0d0a2a2affc169e8461)
2014-10-06 10:29:13 -07:00
carlo curino
950da32b4c YARN-2475. Logic for responding to capacity drops for the ReservationSystem. Contributed by Carlo Curino and Subru Krishnan.
(cherry picked from commit f83a07f266f2c5e6eead554d8a331ed7e75e10d5)
(cherry picked from commit 1c6950354f3c35a7824770dc251d5aec3be4876a)
(cherry picked from commit b81f571e6064cee119bcbfed090ab646cdd927a7)
2014-10-06 10:29:12 -07:00
carlo curino
5ac08c5398 YARN-1707. Introduce APIs to add/remove/resize queues in the CapacityScheduler. Contributed by Carlo Curino and Subru Krishnan
(cherry picked from commit aac47fda7fecda9fc18ade34d633eca895865a70)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
(cherry picked from commit eb3e40b833b9d82c1556843f960194dc42e482f3)
(cherry picked from commit cf5ef00b96cba3ee1e971b7280f987fa65044ef5)
2014-10-06 10:29:12 -07:00
cnauroth
08ccd30063 HADOOP-11163. Correct CHANGES.txt.
(cherry picked from commit bbb3b1acc0e8ce10b8689ded2be73b0965f09e52)
(cherry picked from commit 1329d1e701a52bb99759a9f0176865674887a90f)
2014-10-06 09:16:31 -07:00
cnauroth
29c203585e HADOOP-11163. MetricsSystemImpl may miss a registered source. Contributed by Chuan Liu.
(cherry picked from commit 69c9af91031f345d9511618877646b8756b17863)
(cherry picked from commit a828ef15b0e2c63dac6854910bc9ae3b5f5ef755)
2014-10-06 09:16:22 -07:00
Haohui Mai
f567f3c833 HDFS-7172. Test data files may be checked out of git with incorrect line endings, causing test failures in TestHDFSCLI. Contributed by Chris Nauroth.
(cherry picked from commit 5db04a5a1a27d4199bfcc1c31a001ff4db32810b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-10-06 09:15:41 -07:00
Arun C. Murthy
e65d8b750d HADOOP-10731. Sync-ing CHANGES.txt across branches.
(cherry picked from commit c5828c624f37f78dad46c66cb878b392e4a1495c)
2014-10-05 07:51:56 -07:00
Arun C. Murthy
c39f74d041 HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib codecs. Contributed by Gopal Vijayaraghavan.
(cherry picked from commit 8f9ab998e273259c1e7a3ed53ba37d767e02b6bb)
2014-10-05 07:47:28 -07:00
Vinod Kumar Vavilapalli
3542eef75b YARN-2468. Enhanced NodeManager to support log handling APIs (YARN-2569) for use by long running services. Contributed by Xuan Gong.
(cherry picked from commit 34cdcaad71cad76c0874a4e5266b4074009d2ffc)
2014-10-03 12:17:38 -07:00
Jian He
f97252e7e5 YARN-2562. Changed ContainerId#toString() to be more readable. Contributed by Tsuyoshi OZAWA
(cherry picked from commit eb6ce5e97c6a379caf9de0b34cc7770c4447bb1a)
2014-10-03 11:05:17 -07:00
Andrew Wang
ac510c3610 HADOOP-11151. Automatically refresh auth token and retry on auth failure. Contributed by Arun Suresh.
(cherry picked from commit 2d8e6e2c4a52a4ba815b23d6d1ac21be4df23d9e)
(cherry picked from commit 9ebff016c2de3410622e6da3e9963adbaa894c1a)
2014-10-02 20:00:22 -07:00
Jian He
65cf007ab9 YARN-2628. Capacity scheduler with DominantResourceCalculator carries out reservation even though slots are free. Contributed by Varun Vasudev
(cherry picked from commit 054f28552687e9b9859c0126e16a2066e20ead3f)
2014-10-02 15:16:47 -07:00
Zhijie Shen
20fb25cde2 YARN-2527. Fixed the potential NPE in ApplicationACLsManager and added test cases for it. Contributed by Benoy Antony.
(cherry picked from commit 1c93025a1b370db46e345161dbc15e03f829823f)
2014-10-02 14:58:32 -07:00
Haohui Mai
cfc5f8f684 HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting. Contributed by Charles Lamb. 2014-10-02 14:27:33 -07:00
Colin Patrick Mccabe
cf025cc39b HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe)
(cherry picked from commit dd1b8f2ed8a86871517c730a9f370aca4b763514)
(cherry picked from commit 1725d56132c54d9ccab9e25b1ea5ad5c04c43795)
2014-10-02 14:08:15 -07:00
Colin Patrick Mccabe
94277a7d21 HDFS-7162. Wrong path when deleting through fuse-dfs a file which already exists in trash (cmccabe)
(cherry picked from commit 03db9cc839663cad387db7df8e4f60b312058f18)
(cherry picked from commit ab1afc4e1cafc1cd81cca36eccc1c905afb7293b)
2014-10-02 14:07:44 -07:00
Andrew Wang
dea3f133ff HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang)
(cherry picked from commit 6ac10516e7fa28384b6d3c2670f6621e2666ffdb)
(cherry picked from commit 6dbba19469d698891e9c6a8513cbe58992a736b1)
2014-10-02 14:01:30 -07:00
Andrew Wang
59e9858181 HDFS-7179. DFSClient should instantiate a KeyProvider, not a KeyProviderCryptoExtension. (wang)
(cherry picked from commit d2d5a0ea03b0d461a4d376c7b9de8cd5c147effa)
(cherry picked from commit 6ddd9eff78a15081dfe3b405b3d0a958ff27acf5)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-10-02 14:01:20 -07:00
Jason Lowe
95757899d4 YARN-2624. Resource Localization fails on a cluster due to existing cache directories. Contributed by Anubhav Dhoot
(cherry picked from commit 29f520052e2b02f44979980e446acc0dccd96d54)
2014-10-02 17:45:12 +00:00
Jian He
116eb0bdc3 YARN-2617. Fixed NM to not send duplicate container status whose app is not running. Contributed by Jun Gong
(cherry picked from commit 3ef1cf187faeb530e74606dd7113fd1ba08140d7)
2014-10-02 10:06:58 -07:00
arp
39bad4a4c8 HDFS-7178. Additional unit test for replica write with full disk. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-10-02 09:29:44 -07:00
Vinod Kumar Vavilapalli
ae7a3235be YARN-2446. Augmented Timeline service APIs to start taking in domains as a parameter while posting entities and events. Contributed by Zhijie Shen.
(cherry picked from commit 9e40de6af7959ac7bb5f4e4d2833ca14ea457614)
2014-10-01 18:02:03 -07:00
junping_du
8871bf37fe YARN-2613. Support retry in NMClient for rolling-upgrades. (Contributed by Jian He) 2014-10-01 17:11:59 -07:00
Haohui Mai
364c110c2b Addendum patch for HDFS-7172. Contributed by Chris Nauroth. 2014-10-01 16:11:02 -07:00
Zhijie Shen
8531f93d2d YARN-2630. Prevented previous AM container status from being acquired by the current restarted AM. Contributed by Jian He.
(cherry picked from commit 52bbe0f11bc8e97df78a1ab9b63f4eff65fd7a76)
2014-10-01 15:41:12 -07:00
Haohui Mai
5d2f325483 HDFS-6894. Add XDR parser method for each NFS response. Contributed by Brandon Li. 2014-10-01 13:22:12 -07:00
Haohui Mai
0eec4c187c HDFS-7158. Reduce the memory usage of WebImageViewer. Contributed by Haohui Mai. 2014-10-01 13:22:07 -07:00