Commit Graph

2441 Commits

Author SHA1 Message Date
Alejandro Abdelnur 2690acc9d5 Merge -r 1329714:1329715 from trunk to branch. FIXES: HDFS-3314
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329725 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:52:07 +00:00
Alejandro Abdelnur 2eacd6d90a Merge -r 1329712:1329713 from trunk to branch. FIXES: HADOOP-8309
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329720 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:51:24 +00:00
Thomas Graves f8f390b83d merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:07:22 +00:00
Eli Collins 11e0a12672 HADOOP-8152. svn merge -c 1329541 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329542 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 04:00:10 +00:00
Alejandro Abdelnur 37026cea83 Merge -r 1329492:1329493 from trunk to branch. FIXES: MAPREDUCE-4141
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329496 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 22:33:51 +00:00
Alejandro Abdelnur 06428cdcc1 Merge -r 1329489:1329490 from trunk to branch. FIXES: HADOOP-8284
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329495 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 22:33:24 +00:00
Tsz-wo Sze e360e796ef svn merge -c 1329462 from trunk for HDFS-3312. In HftpFileSystem, the namenode URI is non-secure but the delegation tokens have to use secure URI.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329464 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 21:29:18 +00:00
Robert Joseph Evans 88d736ce2b svn merge -c 1329403. FIXES: MAPREDUCE-4133. MR over viewfs is broken (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329405 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:46:16 +00:00
Robert Joseph Evans 1fca6cfe03 svn merge -c 1329398 FIXES: MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329399 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:39:43 +00:00
Robert Joseph Evans 1ea39ddc3c svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 15:28:19 +00:00
Tsz-wo Sze 89d5bdaa2c svn merge -c 1328541 from trunk for HDFS-3308. Uses canonical URI to select delegation tokens in HftpFileSystem and WebHdfsFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328542 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 00:01:59 +00:00
Aaron Myers 17791eb373 HDFS-3305. GetImageServlet should consider SBN a valid requestor in a secure HA setup. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328116 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:46:46 +00:00
Robert Joseph Evans 0c244e8703 svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328112 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:36:47 +00:00
Alejandro Abdelnur 479e5b0102 Merge -r 1328108:1328109 from trunk to branch. FIXES: MAPREDUCE-3867
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:34:49 +00:00
Robert Joseph Evans 8f4c3499f5 svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328107 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:24:45 +00:00
Robert Joseph Evans e439d3bb39 MAPREDUCE-4093. Improve RM WebApp start up when proxy address is not set (Devaraj K vai bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328091 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 19:44:55 +00:00
Robert Joseph Evans eec2fd9f74 MAPREDUCE-4165. Committing is misspelled as commiting in task logs (John Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328087 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 19:33:04 +00:00
Thomas White 803a2aae3f Merge -r 1328082:1328083 from trunk to branch-2. Fixes: HADOOP-7350
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328085 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 19:28:27 +00:00
Robert Joseph Evans a18ad09c94 svn merge -c 1328031 from trunk. FIXES: MAPREDUCE-4159. Job is running in Uber mode after setting "mapreduce.job.ubertask.maxreduces" to zero (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328033 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 16:23:35 +00:00
Robert Joseph Evans ebb3792a6a svn merge -c 1328018 from trunk. FIXES: HADOOP-8288. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328021 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 16:11:58 +00:00
Thomas Graves 7221ae82e5 merge -r 1327971:1327972 from trunk. FIXES: MAPREDUCE-4074
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327977 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 14:54:03 +00:00
Eli Collins 1909c7a056 HDFS-3169. svn merge -c 1327776 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327777 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 01:59:21 +00:00
Eli Collins f6a794ddd1 HDFS-3206. svn merge -c 1327768 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327770 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 01:35:31 +00:00
Eli Collins 9b2fbf41bb HDFS-891. svn merge -c 1327762 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327763 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 01:10:04 +00:00
Todd Lipcon ab0e99c0ee HADOOP-8117. Upgrade test build to Surefire 2.12. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327706 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 22:22:31 +00:00
Alejandro Abdelnur cbcb7b09a8 Merge -r 1327626:1327627 from trunk to branch. FIXES: HDFS-3263
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327630 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:55:33 +00:00
Robert Joseph Evans 461b330ebf svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:48:20 +00:00
Tsz-wo Sze 3a908b7f0e svn merge -c 1327365 from trunk for HDFS-3294. Fix code indentation in NamenodeWebHdfsMethods and DatanodeWebHdfsMethods.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327366 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 03:26:42 +00:00
Siddharth Seth be7e487ef3 Merge MAPREDUCE-3972 from trunk. Fix locking and exception issues in JobHistory server. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327355 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 02:01:02 +00:00
Tsz-wo Sze 055e2cdd22 svn merge -c 1327309 from trunk for HDFS-2652. Add support for host-based delegation tokens.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327310 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 22:23:32 +00:00
Robert Joseph Evans 45b2835e9f svn merge -c 1327304 from trunk. FIXES: MAPREDUCE-4134. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327306 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 22:13:52 +00:00
Tsz-wo Sze 0c1fb7abb7 Add "target" to svn:ignore.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327270 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 20:18:23 +00:00
Thomas Graves 1769fd46e2 merge -r 1327262:1327263 from trunk. FIXES: MAPREDUCE-4151
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327265 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 20:06:49 +00:00
Thomas Graves 7fec5b7d94 merge -r 1327232:1327233 from trunk. FIXES: MAPREDUCE-4160
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327234 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 19:23:01 +00:00
Siddharth Seth ab8ea1db58 Merge MAPREDUCE-3942 from trunk. Randomize master key generation for ApplicationTokenSecretManager and roll it every so often. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327221 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 18:55:53 +00:00
Aaron Myers 0e138756d4 HADOOP-8280. Move VersionUtil/TestVersionUtil and GenericTestUtils from HDFS into Common. Contributed by Ahmed Radwan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327186 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 17:16:16 +00:00
Aaron Myers 214c8eab78 Revert HADOOP-8280 so it can be recommitted using `svn mv ...'
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327183 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 17:08:48 +00:00
Robert Joseph Evans 32d1af3d88 pulled HADOOP-8108 into branch-0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327142 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 15:24:09 +00:00
Robert Joseph Evans 6d3055f041 svn merge -c 1327127 from trunk. FIXES: HADOOP-8227. Allow RPC to limit ephemeral port range. (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327130 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 15:08:10 +00:00
Robert Joseph Evans 8a672d0837 svn merge -c 1327108 from trunk. FIXES: HADOOP-8286. Simplify getting a socket address from conf (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327109 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 14:22:27 +00:00
Eli Collins 13b40b4843 HADOOP-8282. svn merge -c 1326890 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326891 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 02:44:52 +00:00
Eli Collins 38511d889a HDFS-3165. svn merge -c 1326848 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326850 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 00:51:16 +00:00
Tsz-wo Sze 630e8b0669 svn merge -c 1326762 from trunk for HDFS-3279. Move the FSEditLog constructor with @VisibleForTesting to TestEditLog.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326818 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 22:08:40 +00:00
Todd Lipcon fdffec2f25 HDFS-3284. bootstrapStandby fails in secure cluster. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326812 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 21:51:42 +00:00
Thomas Graves 27cdd16a50 merge -r 1326794:1326795 from trunk. FIXES: MAPREDUCE-4156
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326796 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 20:47:44 +00:00
Todd Lipcon 2ae5006128 HDFS-3268. FileContext API mishandles token service and incompatible with HA. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326748 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 19:08:36 +00:00
Aaron Myers 44ca988753 HADOOP-8280. Move VersionUtil/TestVersionUtil and GenericTestUtils from HDFS into Common. Contributed by Ahmed Radwan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326729 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 18:33:16 +00:00
Thomas Graves e1aa56712c merge -r 1326706:1326707 from trunk. FIXES: MAPREDUCE-4008
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326709 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 18:04:25 +00:00
Robert Joseph Evans 95520d45ce svn merge -c 1326668 from trunk. FIXES: HADOOP-8283. Allow tests to control token service value (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326669 13f79535-47bb-0310-9956-ffa450edef68
2012-04-16 16:10:02 +00:00
Todd Lipcon 567778d5c0 HDFS-3280. DFSOutputStream.sync should not be synchronized. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326049 13f79535-47bb-0310-9956-ffa450edef68
2012-04-14 02:51:09 +00:00