Commit Graph

2500 Commits

Author SHA1 Message Date
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
Aaron Myers 204f4d83f3 HDFS-2708. Stats for the # of blocks per DN. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326040 13f79535-47bb-0310-9956-ffa450edef68
2012-04-14 01:53:19 +00:00
Aaron Myers ca3ed5e320 HDFS-2765. TestNameEditsConfigs is incorrectly swallowing IOE. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326012 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 23:30:52 +00:00
Siddharth Seth 68f136337d Merge MAPREDUCE-4144 from trunk. Fix a NPE in the ResourceManager when handling node updates. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325993 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 22:26:07 +00:00
Eli Collins d41c0ede09 HDFS-2799. svn merge -c 1325963 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325969 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 21:41:16 +00:00
Robert Joseph Evans 8ca897dea2 svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 13:46:45 +00:00
Thomas White f537469c7e Merge -r 1325572:1325573 from trunk to branch-2. Fixes: MAPREDUCE-4147
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325574 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 00:11:53 +00:00
Aaron Myers e3bef05fcc HDFS-3256. HDFS considers blocks under-replicated if topology script is configured with only 1 rack. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325532 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 21:31:36 +00:00
Aaron Myers c94cfd8179 HDFS-3259. NameNode#initializeSharedEdits should populate shared edits dir with edit log segments. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325528 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 21:24:31 +00:00
Robert Joseph Evans ecde9c7f16 svn merge -c 1325500 from trunk. FIXES: HADOOP-7510. Tokens should use original hostname provided instead of ip (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325503 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 20:45:51 +00:00
Siddharth Seth d550503dbb Merge MAPREDUCE-4050 from trunk. For tasks without assigned containers, changes the node text on the UI to N/A instead of a link to null. (Contributed by Bhallamudi Venkata Siva Kamesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325436 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 18:41:09 +00:00
Todd Lipcon cca655f4ab HDFS-3255. HA DFS returns wrong token service. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325415 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 18:08:16 +00:00
Eli Collins cb7907aef2 HADOOP-8144. svn merge -c 1325367 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325368 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 16:38:52 +00:00
Thomas White cb3d6c3d98 Merge -r 1325351:1325352 from trunk to branch-2. Fixes: MAPREDUCE-4140
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325359 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 16:31:15 +00:00
Aaron Myers 6a23ecf03f HDFS-3260. TestDatanodeRegistration should set minimum DN version in addition to minimum NN version. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325120 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 05:28:52 +00:00
Aaron Myers 5e1ce633a2 HDFS-2983. Relax the build version check to permit rolling upgrades within a release. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325113 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 03:55:51 +00:00
Eli Collins d64a8d3e2c svn merge -c 1325069 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325070 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 23:59:20 +00:00
Thomas Graves d31abfe3f8 merge -r 1325009:1325010 from trunk. FIXES: MAPREDUCE-4107
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325011 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 21:14:55 +00:00
Siddharth Seth 462f9a5249 MAPREDUCE-3932. Fix the TaskAttempt state machine to handle CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional states. (Contributed by Robert Joseph Evans)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324903 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 18:20:08 +00:00
Tsz-wo Sze 415e7fecb1 svn merge -c 1324892 from trunk for HDFS-3179. Improve the exception message thrown by DataStreamer when it failed to add a datanode.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324894 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 17:52:44 +00:00
Siddharth Seth 50c13a44af merge MAPREDUCE-4099 amendment from trunk. ApplicationMaster will remove staging directory after the history service is stopped. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324868 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 17:11:34 +00:00
Eli Collins fac3cadf08 HDFS-3254. Branch-2 build broken due to wrong version number in fuse-dfs' pom.xml. Contributed by Anupam Seth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324856 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 16:39:22 +00:00
Todd Lipcon 3272a1c2f8 HDFS-3249. Use ToolRunner.confirmPrompt in NameNode. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324563 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 05:28:51 +00:00
Todd Lipcon f47d418e07 HDFS-3247. Improve bootstrapStandby behavior when original NN is not active. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324559 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 05:16:28 +00:00
Siddharth Seth 40497a9d04 merge MAPREDUCE-4040 from trunk. History links should use hostname rather than IP address. (Contributed by Bhallamudi Venkata Siva Kamesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312077 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 02:52:13 +00:00
Eli Collins e9180d1e5b HDFS-2696. svn merge -c 1312068 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312069 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 01:56:32 +00:00
Eli Collins a9ae92eb76 HDFS-3244. svn merge -c 1312061 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312065 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 01:20:08 +00:00
Todd Lipcon e78aaef526 HDFS-3248. bootstrapStandby repeated twice in hdfs namenode usage message. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312027 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:28:12 +00:00
Todd Lipcon bb7bf7ab6c HDFS-3094. add -nonInteractive and -force option to namenode -format command. Contributed by Arpit Gupta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312024 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:22:29 +00:00
Thomas Graves 15d3d52f1b merge -r 1312017:1312018 from trunk. FIXES: MAPREDUCE-4108
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312020 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:10:34 +00:00
Robert Joseph Evans 3cf79f4c7e svn merge -c 1312003 from trunk. FIXES: MAPREDUCE-4076. Stream job fails with ZipException when use yarn jar command (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312004 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 21:31:41 +00:00
Robert Joseph Evans b04f23fc96 svn merge -c 1311972 from trunk. FIXES: MAPREDUCE-4017. Add jobname to jobsummary log (tgraves and Koji Noguchi via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311973 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 20:37:13 +00:00
Tsz-wo Sze b46380e463 svn merge -c 1311959 from trunk for MAPREDUCE-4057.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311960 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 19:50:09 +00:00
Robert Joseph Evans 07321a677c svn merge -c 1311926 from trunk. FIXES: MAPREDUCE-4099. ApplicationMaster may fail to remove staging directory (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311927 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:59:03 +00:00
Thomas Graves ce9bdceac7 merge -r 1311895:1311896 from trunk. FIXES: MAPREDUCE-4059
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311897 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:13:09 +00:00
Robert Joseph Evans a2c86e8e3d MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be deleted
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311823 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 16:14:59 +00:00
Eli Collins 73f775f865 HDFS-3238. svn merge -c 1311774 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311775 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 15:06:00 +00:00
Robert Joseph Evans e3901a1e5f svn merge -c 1311738 from trunk. FIXES HADOOP-8264. Remove irritating double double quotes in front of hostname (Bernd Fondermann via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311741 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 14:13:03 +00:00
Todd Lipcon 8c1026b4c5 HDFS-3240. Drop log level of "heartbeat: ..." in BPServiceActor to DEBUG. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311576 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 05:11:53 +00:00
Aaron Myers e10e3c0c20 HDFS-3236. NameNode does not initialize generic conf keys when started with -initializeSharedEditsDir. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311555 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 02:20:07 +00:00
Todd Lipcon 72c44aa50e HADOOP-8263. Stringification of IPC calls not useful. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311542 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 01:02:00 +00:00
Todd Lipcon 5293bf2910 HDFS-3234. Accidentally left log message in GetConf after HDFS-3226. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311540 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 00:59:17 +00:00