Commit Graph

6478 Commits

Author SHA1 Message Date
Arpit Agarwal 8314818b6f HADOOP-10376: Merging r1602055 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602057 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 01:43:01 +00:00
Bikas Saha fe66a3b00b Merge 1602043 from trunk to branch-2 for YARN-2148. TestNMClient failed due more exit code values added and passed to AM (Wangda Tan via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602045 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 22:49:19 +00:00
Alejandro Abdelnur cbec85322f HDFS-6379. HTTPFS - Implement ACLs support. (yoderme via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602042 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 22:40:15 +00:00
Jason Darrell Lowe 128519958f svn merge -c 1602033 FIXES: HADOOP-10622. Shell.runCommand can deadlock. Contributed by Gera Shegalov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602034 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 22:06:12 +00:00
Uma Maheswara Rao G 6eb03a41cb Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601992 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 19:25:17 +00:00
Brandon Li e5dadff1b7 HADOOP-10656. Merging change r1601985 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601986 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 18:58:44 +00:00
Jian He 279c5a3752 Merge r1601980 from trunk. YARN-2125. Changed ProportionalCapacityPreemptionPolicy to log CSV in debug level. Contributed by Wangda Tan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601981 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 18:32:48 +00:00
Jian He e4f775755c Merge r1601964 from trunk. YARN-2124. Fixed NPE in ProportionalCapacityPreemptionPolicy. Contributed by Wangda Tan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601965 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 17:31:35 +00:00
Haohui Mai 2582dd2ca3 HDFS-6315. Merge r1601960 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601963 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 17:28:12 +00:00
Haohui Mai c6ed9ac1d8 HDFS-6503. Merge r1601958 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601959 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 17:14:35 +00:00
Arpit Agarwal 705c23e718 HDFS-6364: Merging r1601771 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601772 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 21:03:16 +00:00
Vinod Kumar Vavilapalli 71028526c1 MAPREDUCE-5834. Increased test-timeouts in TestGridMixClasses to avoid occassional failures. Contributed by Mit Desai.
svn merge --ignore-ancestry -c 1601764 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601765 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 20:25:22 +00:00
Bikas Saha dc5ee5ff7c Merge 1601762 from trunk to branch-2 for YARN-2091. Add more values to ContainerExitStatus and pass it from NM to RM and then to app masters (Tsuyoshi OZAWA via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601763 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 20:13:23 +00:00
Karthik Kambatla d4d1ccc992 YARN-1424. RMAppAttemptImpl should return the DummyApplicationResourceUsageReport for all invalid accesses. (Ray Chiang via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601745 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 19:06:32 +00:00
Chris Nauroth 74a6db7b27 HADOOP-9555. Merging change r1601709 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601713 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 18:05:22 +00:00
Chris Nauroth 91c53d97bd MAPREDUCE-5886. Merging change r1601704 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601707 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 17:52:27 +00:00
Jian He 8be4504d9a Merge r1601537 from trunk. YARN-2030. Augmented RMStateStore with state machine. Contributed by Binglin Chang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601539 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 01:02:19 +00:00
Jian He e6a03e2fc0 Merge r1601491 from trunk. YARN-2030. Augmented RMStateStore with state machine. Contributed by Binglin Chang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601492 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 19:46:48 +00:00
Aaron Myers d156c785a6 HADOOP-10664. TestNetUtils.testNormalizeHostName fails. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601483 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 19:03:37 +00:00
Aaron Myers d3473f1e20 HADOOP-9099. NetUtils.normalizeHostName fails on domains where UnknownHost resolves to an IP address. Contributed by Ivan Mitic.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601479 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 18:59:53 +00:00
Andrew Wang f3e1811dbd HDFS-6399. Add note about setfacl in HDFS permissions guide. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601477 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 18:43:33 +00:00
Colin McCabe 7b795f6a7c HDFS-6257. TestCacheDirectives#testExceedsCapacity fails occasionally (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601474 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 18:40:00 +00:00
Vinod Kumar Vavilapalli 319e422733 YARN-1368. Added core functionality of recovering container state into schedulers after ResourceManager Restart so as to preserve running work in the cluster. Contributed by Jian He.
svn merge --ignore-ancestry -c 1601303 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601304 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 03:10:06 +00:00
Junping Du d678a9ecf9 Merge r1601199 from trunk: HDFS-6500. Snapshot shouldn't be removed silently after renaming to an existing snapshot. (Contributed by Nicholas SZE)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601200 13f79535-47bb-0310-9956-ffa450edef68
2014-06-08 07:17:46 +00:00
Karthik Kambatla d5379b29a2 YARN-2132. ZKRMStateStore.ZKAction#runWithRetries doesn't log the exception it encounters. (Vamsee Yarlagadda via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601066 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 06:13:22 +00:00
Konstantin Boudnik 3cc1e9fc31 HDFS-6297. Add CLI testcases to reflect new features of dfs and dfsadmin (Contributed by Dasha Boudnik)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601060 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 05:23:40 +00:00
Karthik Kambatla cd031015cd YARN-2128. FairScheduler: Incorrect calculation of amResource usage. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601051 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 01:23:23 +00:00
Karthik Kambatla 233ca3e2a5 YARN-2122. In AllocationFileLoaderService, the reloadThread should be created in init() and started in start(). (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601046 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 00:51:50 +00:00
Colin McCabe 38c0114f2b HDFS-6497. Make TestAvailableSpaceVolumeChoosingPolicy deterministic (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601036 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 23:41:08 +00:00
Andrew Wang 96defb2d7b HDFS-6487. TestStandbyCheckpoint#testSBNCheckpoints is racy. Contributed by Mit Desai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601017 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 21:42:40 +00:00
Vinod Kumar Vavilapalli 3cc1cddffb YARN-2121. Fixed NPE handling in Timeline Server's TimelineAuthenticator. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1601000 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601001 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 20:33:10 +00:00
Zhijie Shen 683d4bdbd9 YARN-2117. Fixed the issue that secret file reader is potentially not closed in TimelineAuthenticationFilterInitializer. Contributed by Chen He.
svn merge --ignore-ancestry -c 1600994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600995 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 20:10:14 +00:00
Karthik Kambatla 3ed429bb62 MAPREDUCE-5777. Support utf-8 text with Byte Order Marker. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600979 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 18:39:28 +00:00
Steve Loughran d7f5d6795c HADOOP-10647. String Format Exception in SwiftNativeFileSystemStore.java.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600970 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 17:59:37 +00:00
Zhijie Shen 32a71b6f34 YARN-2118. Fixed the type mismatch in Map#containsKey check of TimelineWebServices#injectOwnerInfo. Contributed by Ted Yu.
svn merge --ignore-ancestry -c 1600967 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600969 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 17:49:48 +00:00
Colin McCabe 10bfa1ef2b HDFS-6369. Document that BlockReader#available() can return more bytes than are remaining in the block (Ted Yu via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600802 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 00:59:44 +00:00
Junping Du 3438bf531d Merge r1600644 from trunk: YARN-1977. Add tests on getApplicationRequest with filtering start time range. (Contributed by Junping Du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600648 13f79535-47bb-0310-9956-ffa450edef68
2014-06-05 13:24:22 +00:00
Karthik Kambatla fa57c0f5b8 YARN-2061. Revisit logging levels in ZKRMStateStore. (Ray Chiang via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600514 13f79535-47bb-0310-9956-ffa450edef68
2014-06-04 21:40:37 +00:00
Karthik Kambatla 33439defa1 YARN-2119. DEFAULT_PROXY_ADDRESS should use DEFAULT_PROXY_PORT. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600487 13f79535-47bb-0310-9956-ffa450edef68
2014-06-04 20:18:49 +00:00
Andrew Wang 45847e8df1 Addendum for common changes in HDFS-6268
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599846 13f79535-47bb-0310-9956-ffa450edef68
2014-06-04 01:08:02 +00:00
Andrew Wang 2abf0c7bea HDFS-6268. Better sorting in NetworkTopology#pseudoSortByDistance when no local node is found. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599842 13f79535-47bb-0310-9956-ffa450edef68
2014-06-04 00:37:38 +00:00
Andrew Wang bb87b70e37 Revert bad HDFS-6268 commit from branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599807 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 22:06:11 +00:00
Andrew Wang 2088225632 HDFS-6268. Merged from r1599734. Better sorting in NetworkTopology#pseudoSortByDistance when no local node is found. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599737 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 18:33:51 +00:00
Aaron Myers 53a0b3c496 HADOOP-10658. SSLFactory expects truststores being configured. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599436 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 07:24:42 +00:00
Ravi Prakash f8a3041cfe HADOOP-9704. Write metrics sink plugin for Hadoop/Graphite (Chu Tong, Alex Newman and Babak Behzad via raviprak)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599415 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 05:51:52 +00:00
Sanford Ryza f9c5c308e4 YARN-1913. With Fair Scheduler, cluster can logjam when all resources are consumed by AMs (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599401 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 00:58:09 +00:00
Jing Zhao b712ed2b23 HDFS-6424. Merge r1599397 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599398 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 00:52:16 +00:00
Jing Zhao adc4dc57c8 HADOOP-10630. Merge change r1599366 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599369 13f79535-47bb-0310-9956-ffa450edef68
2014-06-02 21:43:48 +00:00
Michael Stack 78d46e8508 HDFS-6109 let sync_file_range() system call run in background (Liang Xie via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599351 13f79535-47bb-0310-9956-ffa450edef68
2014-06-02 20:34:20 +00:00
Karthik Kambatla a84fd44ee4 YARN-1877. Updated CHANGES.txt to fix the JIRA number. It was previously committed as YARN-2010.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599349 13f79535-47bb-0310-9956-ffa450edef68
2014-06-02 20:28:50 +00:00