big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,658 Commits 2 Branches 2 Tags 264 MiB
c45c8ee720
Commit Graph

4658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Todd Lipcon
c45c8ee720 Complete commit of prior merge. 
The previous merge accidentally only committed the hdfs project instead of common and MR
as well.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1463203 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-01 16:47:16 +00:00
Todd Lipcon
bbb24fbf5d Merge trunk into branch. 
Conflicts resolved:
C       hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestShortCircuitLocalRead.java
!     C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/SocketCache.java
C       hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
C       hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
C       hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
C       hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocal.java

(thanks to Colin for help resolving)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1462652 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-29 21:33:35 +00:00
Thomas Graves
01aabf7363 YARN-460. CS user left in list of active users for the queue even when application finished (tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462486 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-29 14:36:53 +00:00
Vinod Kumar Vavilapalli
1b87baa06f HADOOP-9444. Modify hadoop-policy.xml to replace unexpanded variables to a default value of '*'. Contributed by Roman Shaposhnik. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462417 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-29 06:29:22 +00:00
Todd Lipcon
1611b51a97 HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462303 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-28 20:58:45 +00:00
Bikas Saha
520033b1cd YARN-450. Define value for * in the scheduling protocol (Zhijie Shen via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462271 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-28 19:44:28 +00:00
Eli Collins
799e3c344e HADOOP-9357. Fallback to default authority if not specified in FileContext. Contributed by Andrew Wang 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461898 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 23:43:45 +00:00
Alejandro Abdelnur
967b62f5d2 YARN-24. Nodemanager fails to start if log aggregation enabled and namenode unavailable. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461891 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 23:14:05 +00:00
Aaron Myers
fc5fd80e9f HADOOP-9125. LdapGroupsMapping threw CommunicationException after some idle time. Contributed by Kai Zheng. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461863 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 21:49:43 +00:00
Sanjay Radia
0e6604aab3 HDFS-4633 TestDFSClientExcludedNodes fails sporadically if excluded nodes cache expires too quickly (Chris Nauroth via Sanjay) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461846 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 20:49:48 +00:00
Todd Lipcon
694a672131 HDFS-4538. Allow use of legacy blockreader. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1461818 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 19:28:12 +00:00
Todd Lipcon
fc0a4de670 HADOOP-9358. "Auth failed" log should include exception string. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461788 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 18:51:06 +00:00
Todd Lipcon
4809bfa6ed HDFS-4618. Default transaction interval for checkpoints is too low. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461783 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 18:46:32 +00:00
Todd Lipcon
81192e4e41 HDFS-4621. Additional logging to help diagnose slow QJM syncs. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461777 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 18:42:43 +00:00
Vinod Kumar Vavilapalli
d0bbff6c32 YARN-209. Fix CapacityScheduler to trigger application-activation when the cluster capacity changes. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461773 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 18:38:28 +00:00
Vinod Kumar Vavilapalli
85859313e7 HADOOP-8415. Add getDouble() and setDouble() in org.apache.hadoop.conf.Configuration (Jan van der Lugt via harsh) 
Merging into branch-2. Updating CHANGES.txt


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461727 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 17:21:00 +00:00
Thomas White
414458ff9d YARN-496. Fair scheduler configs are refreshed inconsistently in reinitialize. Contributed by Sandy Ryza 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461614 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 14:42:41 +00:00
Kihwal Lee
c9f5052803 HDFS-4581. DataNode.checkDiskError should not be called on network errors. Contributed by Rohit Kochar. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461597 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 14:21:13 +00:00
Thomas White
375584ae0f MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461541 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 11:47:06 +00:00
Vinod Kumar Vavilapalli
d60c2fa17f YARN-474. Fix CapacityScheduler to trigger application-activation when am-resource-percent configuration is refreshed. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461402 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-27 03:44:34 +00:00
Luke Lu
5319818487 HADOOP-9194. RPC Support for QoS. (Junping Du via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461370 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 23:29:09 +00:00
Suresh Srinivas
fdf1e6e07e HDFS-4635. Move BlockManager#computeCapacity to LightWeightGSet. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461364 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 23:01:03 +00:00
Suresh Srinivas
af7b7667f5 HADOOP-9430. TestSSLFactory fails on IBM JVM. Contributed by Amir Sanjar. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461268 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 18:57:47 +00:00
Siddharth Seth
66e90b205a YARN-440. Flatten RegisterNodeManagerResponse. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461256 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 18:20:36 +00:00
Siddharth Seth
d41e67b966 MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related code. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461251 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 18:15:40 +00:00
Robert Joseph Evans
a0a844222d MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred (Aleksey Gorshkov via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461146 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 14:16:13 +00:00
Tsz-wo Sze
ca3e09bab5 HDFS-4598. Fix the default value of ConcatSourcesParam and the WebHDFS doc. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461040 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 09:54:48 +00:00
Alejandro Abdelnur
e74d1f0435 YARN-469. Make scheduling mode in FS pluggable. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460961 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 03:25:26 +00:00
Bikas Saha
2aed48a67f YARN-498. Unmanaged AM launcher does not set various constants in env for an AM, also does not handle failed AMs properly (Hitesh Shah via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460954 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 02:34:27 +00:00
Vinod Kumar Vavilapalli
46315a2d91 MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. Contributed by *Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460923 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 22:33:43 +00:00
Sanjay Radia
5e325d4562 HADOOP-9433 TestLocalFileSystem#testHasFileDescriptor leaks file handle (Chris Nauroth via sanjay) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460922 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 22:30:30 +00:00
Vinod Kumar Vavilapalli
0757364014 YARN-378. Fix RM to make the AM max attempts/retries to be configurable per application by clients. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460895 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 21:11:33 +00:00
Bikas Saha
1acb805058 YARN-497. Yarn unmanaged-am launcher jar does not define a main class in its manifest (Hitesh Shah via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460846 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 18:57:15 +00:00
Siddharth Seth
18e08a8f51 YARN-439. Flatten NodeHeartbeatResponse. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460811 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 18:28:50 +00:00
Siddharth Seth
6a482a88b8 YARN-71. Fix the NodeManager to clean up local-dirs on restart. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460808 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 18:23:59 +00:00
Robert Joseph Evans
c02dd9aa4b YARN-109. .tmp file is not deleted for localized archives (Mayank Bansal via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460723 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 15:46:25 +00:00
Steve Loughran
a10055cf6d HADOOP-9258 Add stricter tests to FileSystemContractTestBase (includes fixes for production code HADOOP-9261 & HADOOP-9265 and test enhancements HADOOP-9228, HADOOP-9227 & HADOOP-9259) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460646 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 13:12:27 +00:00
Steve Loughran
90b063c343 HADOOP-9350 -add entry to BUILDING.TXT to say 'no java7 on OS/X 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460634 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 12:23:48 +00:00
Tsz-wo Sze
d35798314c svn merge -c -1448745 and -1448285 for reverting HADOOP-9112: test-patch should -1 for @Tests without a timeout 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460520 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 04:34:29 +00:00
Sanjay Radia
1186572389 HADOOP-9431 TestSecurityUtil#testLocalHostNameForNullOrWild on systems where hostname contains capital letters (Chris Nauroth via sanjay) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460181 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-23 16:07:48 +00:00
Tsz-wo Sze
0f4cad57b8 HADOOP-9353. Activate native-win maven profile by default on Windows. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460086 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-23 03:41:31 +00:00
Bikas Saha
7c325a5d71 YARN-417. Addendum patch to fix broken test (Sandy Ryza via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460064 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-23 00:08:24 +00:00
Hitesh Shah
b15b44e722 YARN-470. Support a way to disable resource monitoring on the NodeManager. Contributed by Siddharth Seth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460001 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-22 21:28:31 +00:00
Hitesh Shah
b8c74a8a25 MAPREDUCE-5083. MiniMRCluster should use a random component when creating an actual cluster. Contributed by Siddharth Seth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459932 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-22 19:11:01 +00:00
Amareshwari Sri Ramadasu
6f92ad9868 MAPREDUCE-5014. Extend Distcp to accept a custom CopyListing. Contributed by Srikanth Sundarrajan 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459690 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-22 10:09:06 +00:00
Tsz-wo Sze
92bee12fac Move HADOOP-9387 to Trunk in CHANGES.txt. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459643 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-22 06:31:08 +00:00
Tsz-wo Sze
883601a1d6 HADOOP-9387. Fix DF so that it won't execute a shell command on Windows to compute the file system/mount point. Contributed by Ivan Mitic 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459642 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-22 06:26:52 +00:00
Tsz-wo Sze
7ed618e324 HDFS-4584. Skip TestNNWithQJM.testNewNamenodeTakesOverWriter() on Windows. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459592 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 23:56:06 +00:00
Tsz-wo Sze
c2e186bae6 HDFS-4615. Fix TestDFSShell failures on Windows. Contributed by Arpit Agarwal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459586 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 23:48:39 +00:00
Tsz-wo Sze
e976294d35 HDFS-4609. TestAuditLogs should release log handles between tests. Contributed by Ivan Mitic 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459576 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-21 23:18:26 +00:00