Commit Graph

312 Commits

Author SHA1 Message Date
Aaron Myers
f216303598 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1225612 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 18:25:48 +00:00
Harsh J
6c349f9420 HDFS-2729. Update BlockManager's comments regarding the invalid block set (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225591 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 16:51:59 +00:00
Harsh J
41737432c0 HDFS-2726. Fix a logging issue under DFSClient's createBlockOutputStream method (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225456 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 07:22:54 +00:00
Aaron Myers
a500ba50c2 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1224965 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 18:18:36 +00:00
Alejandro Abdelnur
ae0d48854d HDFS-2707. HttpFS should read the hadoop-auth secret from a file instead inline from the configuration. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1224794 13f79535-47bb-0310-9956-ffa450edef68
2011-12-26 19:37:25 +00:00
Alejandro Abdelnur
6b4f40cbf9 HttpFS server should check that upload requests have correct content-type. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221616 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 05:26:20 +00:00
Todd Lipcon
31c91706f7 HDFS-1972. Fencing mechanism for block invalidations and replications. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1221608 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 04:32:40 +00:00
Todd Lipcon
36d1c49486 HDFS-2693. Fix synchronization issues around state transition. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1221582 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 03:03:23 +00:00
Alejandro Abdelnur
8fe3dd3fea HDFS-2657. TestHttpFSServer and TestServerWebApp are failing on trunk. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221580 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 03:03:16 +00:00
Alejandro Abdelnur
45620eee68 HDFS-2646. Hadoop HttpFS introduced 4 findbug warnings. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221572 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 02:46:04 +00:00
Tsz-wo Sze
3503d9a4a8 HDFS-2706. Use configuration for blockInvalidateLimit if it is set.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1221106 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 05:49:24 +00:00
Todd Lipcon
57ef902bbc HDFS-2682. When a FailoverProxyProvider is used, Client should not retry for 45 times if it is timing out to connect to server. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220965 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 21:49:39 +00:00
Todd Lipcon
4bb0456c66 HDFS-2678. When a FailoverProxyProvider is used, DFSClient should not retry connection ten times before failing over. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220942 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 20:57:13 +00:00
Todd Lipcon
08bde10e24 Merge trunk into HA branch to pick up fix for bkjournal findbugs
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220941 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 20:46:58 +00:00
Todd Lipcon
dfba847eb6 Amend HDFS-234 (bkjournal contrib). Fix findbugs build
- Fixes pom parent to point to hadoop-project instead of hadoop-project-dist
- Fix relative path in pom to have the correct number of ../s


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220940 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 20:42:25 +00:00
Alejandro Abdelnur
de928a4aa0 HDFS-2658. HttpFS introduced 70 javadoc warnings. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220810 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 15:53:53 +00:00
Todd Lipcon
8ff28f4549 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220616 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:34:51 +00:00
Todd Lipcon
625d1b380a HDFS-2677. Web UI should indicate the NN state. Contributed by Eli Collins.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220613 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:26:07 +00:00
Todd Lipcon
329717264f HDFS-2679. Add interface to query current state to HAServiceProtocol. Contributed by Eli Collins.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220612 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 05:24:32 +00:00
Eli Collins
5e185702ea HDFS-2335. DataNodeCluster and NNStorage always pull fresh entropy. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220510 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 18:12:48 +00:00
Todd Lipcon
a89baed833 HDFS-2553. Fix BlockPoolSliceScanner spinning in a tight loop. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220317 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 01:13:00 +00:00
Todd Lipcon
fa1edc9a1e HDFS-2700. Fix failing TestDataNodeMultipleRegistrations in trunk. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220315 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 01:10:49 +00:00
Aaron Myers
08c9dc3780 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215367 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:31:46 +00:00
Suresh Srinivas
89553be90e HDFS-2687. Tests failing with ClassCastException post protobuf RPC changes. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215366 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:26:46 +00:00
Aaron Myers
52c1491155 HDFS-2694. Removal of Avro broke non-PB NN services. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215364 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:19:01 +00:00
Thomas White
9b7617a909 HDFS-2640. Javadoc generation hangs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215354 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:09:04 +00:00
Todd Lipcon
371f4228e8 HDFS-2684. Fix up some failing unit tests on HA branch. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215241 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 18:36:24 +00:00
Todd Lipcon
cdb9f01ad4 HDFS-2667. Fix transition from active to standby. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215037 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 04:25:13 +00:00
Aaron Myers
71071b904d HDFS-2602. NN should log newly-allocated blocks without losing BlockInfo. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1215036 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 04:18:58 +00:00
Aaron Myers
353bc3799d HDFS-2689. HA: BookKeeperEditLogInputStream doesn't implement isInProgress(). Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214965 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 21:54:00 +00:00
Aaron Myers
d937abd434 Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214944 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 20:05:38 +00:00
Alejandro Abdelnur
6cf3a15c52 HADOOP_7917. compilation of protobuf files fails in windows/cygwin. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214790 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 14:41:01 +00:00
Todd Lipcon
afd0333196 HDFS-2683. Authority-based lookup of proxy provider fails if path becomes canonicalized. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214579 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 00:42:50 +00:00
Todd Lipcon
ecdf9da770 Fix treatment of NNHAStatusHeartbeat in protobuffer.
Committing without pre-commit review since it's a pretty trivial merge fix


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214543 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:28:43 +00:00
Todd Lipcon
8134b1c870 Merge trunk into HA branch.
Several conflicts around introduction of protobuf translator for DatanodeProtocol - mostly trivial resolutions.

NB: this does not successfully pass any tests since the HAStatus field needs
to be integrated into the HeartbeatResponse Protobuf implementation.
That will be a separate commit for clearer history.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214518 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 22:47:41 +00:00
Todd Lipcon
6c2da4bc0f HDFS-2680. DFSClient should construct failover proxy with exponential backoff. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214487 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 21:41:31 +00:00
Sanjay Radia
d8dfcdcbc2 HDFS-2669 Enable protobuf rpc for ClientNamenodeProtocol
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214128 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 09:27:51 +00:00
Todd Lipcon
7e8accd68e HDFS-2671. NN should throw StandbyException in response to RPCs in STANDBY state. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1214117 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:56:21 +00:00
Suresh Srinivas
95bdb29aaf r1214102 should have removed the file. Committing this to remove empty file.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214103 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:25:47 +00:00
Suresh Srinivas
60dd76c6ab HDFS-2676. Remove Avro RPC. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214102 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:20:23 +00:00
Todd Lipcon
b9238e3bad HDFS-2675. Reduce warning verbosity when double-closing edit logs. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214098 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:13:55 +00:00
Eli Collins
bdc2a77d6b HDFS-2649. eclipse:eclipse build fails for hadoop-hdfs-httpfs. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214046 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 03:42:24 +00:00
Jitendra Nath Pandey
3cffe34177 HDFS-2661. Enable protobuf RPC for DatanodeProtocol.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214033 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 02:15:37 +00:00
Tsz-wo Sze
433a6e78f6 HDFS-2545. Change WebHDFS to support multiple namenodes in federation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1214027 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 01:47:57 +00:00
Suresh Srinivas
3954a2fb1c HDFS-2663. Optional protobuf parameters are not handled correctly. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213985 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:31:44 +00:00
Suresh Srinivas
6a609cb471 Reverting the patch r1213981
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213984 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:27:58 +00:00
Jitendra Nath Pandey
1f2f4e105b HDFS-234. Integration with BookKeeper logging system. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213983 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:27:13 +00:00
Suresh Srinivas
b5229fd19b HDFS-2663. Optional protobuf parameters are not handled correctly. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213981 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:22:28 +00:00
Suresh Srinivas
3001a172c8 Reverting r1213512 because it committed changes that were not part of the patch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213980 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:17:02 +00:00
Aaron Myers
a0fe4f476a Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1213867 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 19:02:37 +00:00