Commit Graph

451 Commits

Author SHA1 Message Date
Alejandro Abdelnur 596831bcba Merge -r 1331492:1331493 from trunk to branch. FIXES: HDFS-3309
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331494 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 16:30:56 +00:00
Tsz-wo Sze be4dfe86af svn merge -c 1331138 from trunk for HDFS-3181. Fix a test case in TestLeaseRecovery2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331139 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 22:45:53 +00:00
Tsz-wo Sze 973ae0114d svn merge -c 1331114 from trunk for HDFS-3322. Use HdfsDataInputStream and HdfsDataOutputStream in Hdfs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331118 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 21:57:05 +00:00
Uma Maheswara Rao G 16d6cbc9ef Merge HDFS-3222. DFSInputStream#openInfo should not silently get the length as 0 when locations length is zero for last partial block. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331067 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 20:25:10 +00:00
Eli Collins 85e160deaa HDFS-3258. svn merge -c 1330613 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330618 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 01:12:24 +00:00
Tsz-wo Sze ab658346fb svn merge -c 1330535 from trunk for HDFS-3319. Change DFSOutputStream to not to start a thread in constructors.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330536 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 20:18:35 +00:00
Tsz-wo Sze f65f193d78 svn merge -c 1330506 from trunk for HDFS-3321. Fix safe mode turn off tip message.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330508 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 19:35:47 +00:00
Tsz-wo Sze 376c6918b9 svn merge -c 1330500 from trunk for HDFS-3318. Use BoundedInputStream in ByteRangeInputStream, otherwise, it hangs on transfers >2 GB.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330503 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 19:25:45 +00:00
Tsz-wo Sze 1968058617 svn merge -c 1330064 from trunk for HDFS-3298. Add HdfsDataOutputStream as a public API.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330437 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:42:48 +00:00
Tsz-wo Sze b3787c3d87 Merge r1327788 and r1327790 from trunk for HDFS-3282. Add HdfsDataInputStream as a public API.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330436 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:39:13 +00:00
Alejandro Abdelnur bd9d0da9d4 Merge -r 1329993:1329994 from trunk to branch. FIXES: HADOOP-7549
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329996 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 20:34:59 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 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
Eli Collins 70142209b9 HDFS-3004. svn merge -c 1311394 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311401 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 19:47:08 +00:00