Commit Graph

4456 Commits

Author SHA1 Message Date
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
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
Aaron Myers
f61581501a Merge trunk into HDFS-347 branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1446832 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 01:12:07 +00:00
Aaron Myers
3a417cbf1d HDFS-347: style cleanups. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1446830 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 00:59:01 +00:00
Sanjay Radia
461e614a3a HADOOP-9218 Document the Rpc-wrappers used internally (sanjay Radia)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446428 13f79535-47bb-0310-9956-ffa450edef68
2013-02-15 02:26:46 +00:00
Alejandro Abdelnur
0a8cfa9016 HADOOP-9304. remove addition of avro genreated-sources dirs to build. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446296 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 18:48:14 +00:00
Thomas White
c01827aa48 HADOOP-9154. SortedMapWritable#putAll() doesn't add key/value classes to the map. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446183 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 14:07:33 +00:00
Alejandro Abdelnur
4ad1279b2e HADOOP-9297. remove old record IO generation and tests. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446044 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 04:27:07 +00:00
Alejandro Abdelnur
ab330b33bb MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446042 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 04:22:04 +00:00
Alejandro Abdelnur
a96d228f55 Amending common CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446022 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:44:57 +00:00
Kihwal Lee
a9974c791a HDFS-4495. Allow client-side lease renewal to be retried beyond soft-limit. Contributed by Kihwal Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445965 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 22:51:21 +00:00
Alejandro Abdelnur
6bcbf492a2 HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 22:13:44 +00:00
Aaron Myers
a3ddc8ef96 HADOOP-9305. Add support for running the Hadoop client on 64-bit AIX. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445884 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 19:42:13 +00:00
Siddharth Seth
7bc6040ebb YARN-391. Formatting fixes for LCEResourceHandler classes. Contributed by Steve Loughran)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445882 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 19:40:36 +00:00
Siddharth Seth
43204f0c83 MAPREDUCE-5000. Fixes getCounters when speculating by fixing the selection of the best attempt for a task. Contributed by Jason Lowe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445871 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 19:20:31 +00:00
Thomas Graves
666667464a YARN-249. Capacity Scheduler web page should show list of active users per queue like it used to (in 1.x) (Ravi Prakash via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445673 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 15:40:01 +00:00
Thomas Graves
628922eaef HADOOP-9303. command manual dfsadmin missing entry for restoreFailedStorage option (Andy Isaacson via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445656 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 15:15:28 +00:00
Thomas Graves
576f789385 HADOOP-9302. HDFS docs not linked from top level (Andy Isaacson via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445635 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 14:49:35 +00:00
Todd Lipcon
27e158362c HDFS-4496. DFSClient: don't create a domain socket unless we need it. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1445491 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 07:26:42 +00:00
Jason Darrell Lowe
390d1fbef8 MAPREDUCE-4992. AM hangs in RecoveryService when recovering tasks with speculative attempts. Contributed by Robert Parker
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445456 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 02:11:36 +00:00
Jason Darrell Lowe
c2d6407070 MAPREDUCE-4989. JSONify DataTables input data for Attempts page. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445448 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 01:15:48 +00:00
Alejandro Abdelnur
7e615c7f75 MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445330 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 20:16:08 +00:00
Tsz-wo Sze
969e84decb HDFS-4342. Directories configured in dfs.namenode.edits.dir.required but not in dfs.namenode.edits.dir are silently ignored. Contributed by Arpit Agarwal
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445006 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 00:50:00 +00:00
Aaron Myers
aa92072b54 HDFS-4453. Make a simple doc to describe the usage and design of the shortcircuit read feature. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1444963 13f79535-47bb-0310-9956-ffa450edef68
2013-02-11 21:10:23 +00:00
Suresh Srinivas
6e72c6731a HADOOP-9294. GetGroupsTestBase fails on Windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1444415 13f79535-47bb-0310-9956-ffa450edef68
2013-02-09 19:53:36 +00:00
Aaron Myers
1132f51a9c HDFS-4485. DN should chmod socket path a+w. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1444304 13f79535-47bb-0310-9956-ffa450edef68
2013-02-09 00:58:46 +00:00
Jason Darrell Lowe
d4931241ab YARN-362. Unexpected extra results when using webUI table search. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1444085 13f79535-47bb-0310-9956-ffa450edef68
2013-02-08 15:55:32 +00:00
Aaron Myers
6f0c56cb95 HDFS-4471. Namenode WebUI file browsing does not work with wildcard addresses configured. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443807 13f79535-47bb-0310-9956-ffa450edef68
2013-02-08 00:28:00 +00:00
Tsz-wo Sze
a63d50f79a YARN-377. Use the new StringUtils methods added by HADOOP-9252 and fix TestContainersMonitor. Contributed by Chris Nauroth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443796 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 23:53:49 +00:00
Suresh Srinivas
7114a61318 HDFS-4470. Several HDFS tests attempt file operations on invalid HDFS paths when running on Windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443744 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 21:52:55 +00:00
Suresh Srinivas
c3d09010c7 HADOOP-9277. Improve javadoc for FileContext. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443710 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 20:38:29 +00:00
Siddharth Seth
362da383fd YARN-385. Add missing fields - location and #containers to ResourceRequestPBImpl's toString(). Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443702 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 20:28:20 +00:00
Siddharth Seth
bdfe23235e YARN-383. AMRMClientImpl should handle null rmClient in stop(). Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443699 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 20:21:38 +00:00
Suresh Srinivas
54a9c6f964 HADOOP-9253. Capture ulimit info in the logs at service start time. Contributed by Arpit Gupta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443517 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 14:52:58 +00:00
Siddharth Seth
35832053bf MAPREDUCE-4671. AM does not tell the RM about container requests which are no longer needed. Contributed by Bikas Saha.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443323 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 07:07:11 +00:00
Tsz-wo Sze
1eaf9944e3 Move HDFS-4458 to 2.0.3-alpha in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443309 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 03:17:51 +00:00
Aaron Myers
411bb0bd99 HADOOP-9283. Add support for running the Hadoop client on AIX. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443303 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 03:13:14 +00:00
Tsz-wo Sze
90c3700c52 HDFS-4458. In DFSUtil.getNameServiceUris(..), convert default fs URI using NetUtils.createSocketAddr(..) for being consistent with other addresses. Contributed by Binglin Chang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443297 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 03:04:18 +00:00
Aaron Myers
3d46863e12 HDFS-4473. Don't create domain socket unless we need it. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1443283 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 00:02:12 +00:00
Jason Darrell Lowe
ea94b7b9dd MAPREDUCE-4822. Unnecessary conversions in History Events. Contributed by Chu Tong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443257 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 22:47:10 +00:00
Suresh Srinivas
4525c4a25b HDFS-4340. Update addBlock() to inculde inode id as additional argument. Contributed Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443169 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 19:52:34 +00:00
Alejandro Abdelnur
17e72be6d8 MAPREDUCE-4977. Documentation for pluggable shuffle and pluggable sort. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443168 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 19:52:25 +00:00
Siddharth Seth
ab16a37572 YARN-355. Fixes a bug where RM app submission could jam under load. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443131 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 19:03:52 +00:00
Suresh Srinivas
8159dad856 HADOOP-9289. FsShell rm -f fails for non-matching globs. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443108 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 18:20:54 +00:00
Robert Joseph Evans
79b12f6f4c MAPREDUCE-4905. test org.apache.hadoop.mapred.pipes (Aleksey Gorshkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443027 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:50:23 +00:00
Daryn Sharp
d272918426 YARN-357. App submission should not be synchronized (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443016 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:26:30 +00:00
Arun Murthy
c52a277687 YARN-3. Merged to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443011 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:19:24 +00:00
Arun Murthy
7cc2050041 Preparing for hadoop-2.0.3-alpha release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1442959 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 13:31:52 +00:00
Arun Murthy
38bb4ad738 YARN-370. Fix SchedulerUtils to correctly round up the resource for containers. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1442840 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 04:24:56 +00:00
Tsz-wo Sze
e28edbffe1 HDFS-4468. Use the new StringUtils methods added by HADOOP-9252 and fix TestHDFSCLI and TestQuota.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1442824 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 01:13:16 +00:00