Commit Graph

396 Commits

Author SHA1 Message Date
Steve Loughran a57b9b8335 HDFS-2725 script to mention dfs command
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245943 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 15:25:11 +00:00
Arun Murthy e38b7e6ddd Preparing for hadoop-0.23.1-rc2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245845 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 02:30:48 +00:00
Todd Lipcon 9ae4fac8dd HDFS-2968. Protocol translator for BlockRecoveryCommand broken when multiple blocks need recovery. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245832 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 01:18:01 +00:00
Todd Lipcon a8e7f745cd HDFS-2969. ExtendedBlock.equals is incorrectly implemented. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245830 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 01:13:09 +00:00
Suresh Srinivas 257e9440ed Moving HDFS-2525 to relevant release section (0.23.2) in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245312 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 03:56:45 +00:00
Jitendra Nath Pandey b8448dea82 HDFS-2655. BlockReaderLocal#skip performs unnecessary IO. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245118 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 18:58:19 +00:00
Suresh Srinivas ff91453227 HDFS-2938. Recursive delete of a large directory make namenode unresponsive. Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244752 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 22:00:08 +00:00
Jitendra Nath Pandey f82e862e1f HDFS-2525. Race between BlockPoolSliceScanner and append. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244640 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 18:43:01 +00:00
Todd Lipcon 3bd230af11 HDFS-2950. Secondary NN HTTPS address should be listed as a NAMESERVICE_SPECIFIC_KEY. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1244635 13f79535-47bb-0310-9956-ffa450edef68
2012-02-15 18:27:37 +00:00
Aaron Myers a87328dfab HDFS-2943. Expose last checkpoint time and transaction stats as JMX metrics. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243822 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 08:27:15 +00:00
Aaron Myers 2acafd1783 HDFS-2944. Typo in hdfs-default.xml causes dfs.client.block.write.replace-datanode-on-failure.enable to be mistakenly disabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243690 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 20:57:48 +00:00
Suresh Srinivas a70bc6c6a2 HDFS-2815. Namenode sometimes oes not come out of safemode during NN crash + restart. Contributed by Uma Maheswara Rao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243673 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 20:11:43 +00:00
Tsz-wo Sze 52004aa8e9 HDFS-776. Fix exception handling in Balancer. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243654 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 19:07:04 +00:00
Harsh J 8b730c867f HDFS-2869. Fix an error in the webhdfs docs for the mkdir op (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1243104 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 17:13:30 +00:00
Todd Lipcon 8be9441b9b HDFS-2878. Fix TestBlockRecovery and move it back into main test directory. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242995 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 01:20:59 +00:00
Tsz-wo Sze 83fd3160da HDFS-2931. Switch DataNode's BlockVolumeChoosingPolicy to private-audience. Contributed by harsh
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242891 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 19:15:15 +00:00
Tsz-wo Sze dc847b39fd HDFS-2486. Remove unnecessary priority level checks in UnderReplicatedBlocks. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242636 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 02:05:38 +00:00
Aaron Myers 3c6863ab4a Update CHANGES.txt to reflect the back-port of HDFS-2764 from trunk to branch-0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242554 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 22:09:25 +00:00
Todd Lipcon a1574e1715 HDFS-2923. Namenode IPC handler count uses the wrong configuration key. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242220 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 05:28:40 +00:00
Jitendra Nath Pandey 987449b9b8 HDFS-2908. Add apache license header for StorageReport.java. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242192 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 00:24:06 +00:00
Tsz-wo Sze b6ffb08a46 HDFS-2887. FSVolume, is a part of FSDatasetInterface implementation, should not be referred outside FSDataset. A new FSVolumeInterface is defined. The BlockVolumeChoosingPolicy.chooseVolume(..) method signature is also updated. (szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242087 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 20:58:29 +00:00
Arun Murthy 647f374607 Preparing for release 0.23.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241795 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 07:27:58 +00:00
Aaron Myers 4d3dc530e8 HDFS-2764. TestBackupNode is racy. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241780 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 05:38:29 +00:00
Jitendra Nath Pandey 11db1b855f HDFS-2786. Fix host-based token incompatibilities in DFSUtil. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241766 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 03:55:36 +00:00
Suresh Srinivas 8e524e731c Fixing 0.23.1 version of the CHANGES.txt to make it consistent with the CHANGES.txt from 0.23.1 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241751 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 02:58:28 +00:00
Arun Murthy eabe75d6f2 HDFS-2572. Moved to trunk section from 0.23.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241746 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 02:31:26 +00:00
Suresh Srinivas 28eadb7cd7 HDFS-2899. Service protocol changes in DatanodeProtocol to add multiple storages. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241519 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 16:59:48 +00:00
Konstantin Shvachko 7e4bd89590 HDFS-2886. CreateEditLogs should generate a realistic edit log. Contributed by Konstantin Shvachko.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241296 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 00:44:27 +00:00
Suresh Srinivas 2a9e430ff9 HDS-2895. Remove Writable wire protocol types and translators to complete transition to protocol buffers. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1241007 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 13:33:35 +00:00
Eli Collins b837bbb7d5 HDFS-2893. The start/stop scripts don't start/stop the 2NN when using the default configuration. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240928 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 08:52:50 +00:00
Harsh J da7b0d90c6 HDFS-2868. Expose xceiver counts via the DataNode MXBean. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240897 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 05:25:12 +00:00
Suresh Srinivas f88574acde HDFS-2880. Protobuf chagnes in DatanodeProtocol to add multiple storages. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240653 13f79535-47bb-0310-9956-ffa450edef68
2012-02-05 01:39:30 +00:00
Jitendra Nath Pandey 205f0470f4 HDFS-2785. Update webhdfs and httpfs for host-based token support. Contributed by Robert Joseph Evans.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240460 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 06:57:40 +00:00
Aaron Myers 447e81f51a HDFS-2889. getNumCurrentReplicas is package private but should be public on0.23 (see HDFS-2408). Contributed by Gregory Chanan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240412 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 00:01:06 +00:00
Tsz-wo Sze 38ad4b5036 HDFS-2879. Change FSDataset to package private.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1240020 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 07:26:02 +00:00
Todd Lipcon 6d5510dfb8 HDFS-2877. If locking of a storage dir fails, it will remove the other NN's lock file on exit. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239880 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 22:12:02 +00:00
Jitendra Nath Pandey 9eb8f4d267 HDFS-2784. Update hftp and hdfs for host-based token support. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239763 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 19:04:40 +00:00
Konstantin Shvachko 191db6a907 HDFS-2718. Optimize OP_ADD in edits loading. Contributed by Konstantin Shvachko.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239760 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 18:57:49 +00:00
Jitendra Nath Pandey c909aedbc1 HDFS-2814 NamenodeMXBean does not account for svn revision in the version information. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1239464 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 05:31:46 +00:00
Tsz-wo Sze dbbfaebb71 HDFS-2864. Remove some redundant methods and the constant METADATA_VERSION from FSDataset.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238969 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 07:46:50 +00:00
Suresh Srinivas 536b30ec91 HDFS-2835. Fix findbugs and javadoc issue with GetConf.java. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238779 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 20:03:49 +00:00
Suresh Srinivas 319021d6fb HDFS-2857. Cleanup BlockInfo class. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238747 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 18:59:58 +00:00
Tsz-wo Sze 8dfef7d2dc HDFS-2827. When the parent of a directory is the root, renaming the directory results in leases updated incorrectly. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1238700 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 17:36:42 +00:00
Jitendra Nath Pandey 98302971c2 HDFS-2801. Provide a method in client side translators to check for a methods supported in underlying protocol.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1237192 13f79535-47bb-0310-9956-ffa450edef68
2012-01-29 02:01:24 +00:00
Aaron Myers 976c07696d HDFS-2759. Pre-allocate HDFS edit log files after writing version number. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1237153 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 20:26:13 +00:00
Todd Lipcon da91e0d427 HDFS-2791. If block report races with closing of file, replica is incorrectly marked corrupt. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236945 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 00:42:34 +00:00
Alejandro Abdelnur 0d5b734681 HDFS-2840. TestHostnameFilter should work with localhost or localhost.localdomain (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236940 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 00:24:46 +00:00
Alejandro Abdelnur cf16929584 HDFS-2837. mvn javadoc:javadoc not seeing LimitedPrivate class (revans2 via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236338 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 18:15:04 +00:00
Alejandro Abdelnur a7091893de HDFS-2836. HttpFSServer still has 2 javadoc warnings in trunk (revans2 via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1236328 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 17:58:42 +00:00
Harsh J 7c69883917 HDFS-442. dfsthroughput in test jar throws NPE (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235137 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 06:10:28 +00:00
Eli Collins 5dfe62d845 HDFS-2397. Undeprecate SecondaryNameNode. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235135 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 06:05:52 +00:00
Todd Lipcon 1525aae4b3 HDFS-2826. Add test case for HDFS-1476 (safemode can initialize replication queues before exiting) (todd)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235067 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 23:42:17 +00:00
Todd Lipcon c0016ba85f HDFS-2825. Add test hook to turn off the writer preferring its local DN. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1235025 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 22:07:49 +00:00
Todd Lipcon 12645ff6c0 HDFS-2822. processMisReplicatedBlock incorrectly identifies under-construction blocks as under-replicated. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234925 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 18:11:09 +00:00
Harsh J ece854211f HDFS-2818. Fix a missing space issue in HDFS webapps' title tags. (Devaraj K via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234555 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 17:30:33 +00:00
Todd Lipcon c840548d6b HDFS-2817. Combine the two TestSafeMode test suites. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234221 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 00:42:35 +00:00
Alejandro Abdelnur 654b90fa23 HDFS-2816. Fix missing license header in httpfs findbugsExcludeFile.xml. (hitesh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1234135 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 21:04:24 +00:00
Todd Lipcon f7d20b2198 HDFS-2751. Datanode may incorrectly drop OS cache behind reads even for short reads. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233796 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 07:32:06 +00:00
Todd Lipcon 520a39ac2d HDFS-2810. Leases not getting renewed properly by clients. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233794 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 07:26:19 +00:00
Eli Collins fa6033a029 HDFS-2768. BackupNode stop can not close proxy connections because it is not a proxy instance. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233584 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 21:41:50 +00:00
Todd Lipcon 1d2e706dd1 HDFS-2803. Add logging to LeaseRenewer for better lease expiration debugging. Contributed by Jimmy Xiang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1233453 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 16:35:25 +00:00
Eli Collins c53c94ec46 Update changelog for HDFS-362 to reflect the merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1232205 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 22:43:11 +00:00
Eli Collins f02ea82bd1 HDFS-2790. FSNamesystem.setTimes throws exception with wrong configuration name in the message. Contributed by Arpit Gupta
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231572 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 19:50:14 +00:00
Eli Collins 6b8bcfa916 HDFS-2788. HdfsServerConstants#DN_KEEPALIVE_TIMEOUT is dead code. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1231569 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 19:45:12 +00:00
Jitendra Nath Pandey 6234f3d91c HADOOP-2776. Missing interface annotation on JournalSet. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1230412 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 06:21:05 +00:00
Harsh J dcea80a21b HDFS-69. Improve the 'dfsadmin' commandline help. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1230398 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 05:13:19 +00:00
Tsz-wo Sze 1c8e3e8854 Add HDFS-2499 to CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229897 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 05:40:57 +00:00
Jitendra Nath Pandey 8faf7e8fb6 HDFS-2739. SecondaryNameNode doesn't start up.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229877 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 02:54:48 +00:00
Aaron Myers a7195bdd14 HDFS-2765. TestNameEditsConfigs is incorrectly swallowing IOE. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229028 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 04:53:20 +00:00
Harsh J 8819fda489 Merged HDFS-2349, HDFS-2729, HDFS-2726, HDFS-554, HDFS-1314, HADOOP-7910 to branch-0.23, updating CHANGES.txt for trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1228567 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 03:44:48 +00:00
Jitendra Nath Pandey 4efd3699a6 HDFS-2697. Move RefreshAuthPolicy, RefreshUserMappings, GetUserMappings protocol to protocol buffers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227887 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 23:03:31 +00:00
Alejandro Abdelnur 5f5561d057 Fixing CHANGES.txt files, moving JIRAs from trunk to 0.23.1 section. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227859 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 21:55:43 +00:00
Suresh Srinivas 472e971891 HDFS-2710. Add HDFS tests related to HADOOP-7933. Contributed by Siddarth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227756 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 18:57:01 +00:00
Harsh J 075122690c HDFS-1314. Make dfs.blocksize accept size-indicating prefixes (Sho Shimauchi via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1227165 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 14:15:15 +00:00
Harsh J 05ed36cd52 HDFS-2722. HttpFs should not be using an int for block size. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226861 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 16:47:49 +00:00
Harsh J 8e8203f3c5 HDFS-554. Use System.arraycopy in BlockInfo.ensureCapacity. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226239 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 12:06:49 +00:00
Harsh J 11905517f1 HDFS-2574. Remove references to some deprecated properties in conf templates and defaults files. (Joe Crobak via harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1226211 13f79535-47bb-0310-9956-ffa450edef68
2012-01-01 03:11: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
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
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
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
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
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
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
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
Suresh Srinivas f2f4e93413 HDFS-2650. Replace @inheritDoc with @Override. Contributed by Hari Mankude.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213813 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 18:07:29 +00:00
Suresh Srinivas 4ec8424e5d HDFS-2666. Fix TestBackupNode failure. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213808 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 17:59:37 +00:00
Eli Collins 5f39d6c239 HDFS-2654. Make BlockReaderLocal not extend RemoteBlockReader2. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213592 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 08:09:50 +00:00
Eli Collins 197634f2f7 HDFS-2653. DFSClient should cache whether addrs are non-local when short-circuiting is enabled. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213586 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 07:51:23 +00:00
Eli Collins 2892b058e0 Put HDFS-1765 in the right place in the changelog.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213541 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 02:23:07 +00:00
Eli Collins 43100e9c0e HDFS-1765. Block Replication should respect under-replication block priority. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213537 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 01:58:25 +00:00
Suresh Srinivas 13345f3a85 HDFS-2663. Handle protobuf optional parameters correctly. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213512 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 00:21:48 +00:00
Sanjay Radia 48da033901 HDFS-2651 ClientNameNodeProtocol Translators for Protocol Buffers (sanjay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213143 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 05:36:35 +00:00
Konstantin Shvachko 2c1ee1d342 Preparing for release 0.22.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213121 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 00:26:01 +00:00
Suresh Srinivas 2740112bb6 HDFS-2647. Used protobuf based RPC for InterDatanodeProtocol, ClientDatanodeProtocol, JournalProtocol, NamenodeProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1213040 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 18:53:21 +00:00
Alejandro Abdelnur e7682e1496 HDFS-2511. Add dev script to generate HDFS protobufs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212609 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 20:21:19 +00:00
Jitendra Nath Pandey 38a19bc293 HDFS-2642. Protobuf translators for DatanodeProtocol.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212606 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 20:02:33 +00:00
Tsz-wo Sze 9b1f47226b HDFS-2594. Support getDelegationTokens and createSymlink in WebHDFS.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212299 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 09:26:33 +00:00
Alejandro Abdelnur 3334306512 HDFS-2178. Contributing Hoop to HDFS, replacement for HDFS proxy with read/write capabilities. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1212060 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 19:25:28 +00:00
Sanjay Radia 9f69ae5a9e HDFS-2597 ClientNameNodeProtocol in Protocol Buffers (sanjay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1211769 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 06:48:45 +00:00
Aaron Myers a27adf3de4 HDFS-2430. The number of failed or low-resource volumes the NN can tolerate should be configurable. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1211650 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 21:47:13 +00:00
Suresh Srinivas c17bb83644 HDFS-2636. Implement protobuf service for ClientDatanodeProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1211249 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 01:05:56 +00:00
Suresh Srinivas 7a59150bff HDFS-2629. Implement protobuf service for InterDatanodeProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1211206 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 22:19:10 +00:00
Suresh Srinivas 0a713035f2 HDFS-2618. Implement protobuf service for NamenodeProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210719 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 00:25:25 +00:00
Suresh Srinivas c256f8266d HDFS-2581. Implement protobuf service for JournalProtocol. Contributed Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210657 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 21:52:23 +00:00
Jitendra Nath Pandey d18e5b3844 HDFS-1580. Add interface for generic Write Ahead Logging mechanisms. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210602 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 20:10:27 +00:00
Sanjay Radia 65200998c0 HADOOP-7862 Move the support for multiple protocols to lower layer so that Writable, PB and Avro can all use it (includes HDFS and MR changes to match) (Sanjay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1210208 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 20:44:36 +00:00
Alejandro Abdelnur afbc3aa30c HDFS-2606. webhdfs client filesystem impl must set the content-type header for create/append. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208157 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 00:25:54 +00:00
Tsz-wo Sze 0398a9e88d HDFS-2604. Add a log message to show if WebHDFS is enabled and a configuration section in the forrest doc.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1208140 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 23:38:59 +00:00
Konstantin Shvachko 68f56ca906 HDFS-2287. Fix second assert.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207710 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 00:03:49 +00:00
Konstantin Shvachko 3083d7d7db Fix CHANGES.txt. Moving changes from 0.21.1 section to 0.22.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207709 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 00:00:20 +00:00
Konstantin Shvachko 82da8fb490 Fix CHANGES.txt. Some changes have been committed under 0.21.1 section rather than 0.22.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207706 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 23:53:49 +00:00
Konstantin Shvachko 32935d3e67 Fix CHANGES.txt for HDFS-2346 in trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207700 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 23:40:24 +00:00
Eli Collins b32543d9ae HDFS-2596. TestDirectoryScanner doesn't test parallel scans. (eli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207694 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 23:20:16 +00:00
Konstantin Shvachko 49c44117f3 Fix typo in HDFS-993 commit. Was -933.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207676 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 22:51:45 +00:00
Tsz-wo Sze 91a75ad34f Fix WebHDFS capitalization in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1207585 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 20:47:38 +00:00
Matthew Foley e9c2307838 HDFS-2316. Record completion of umbrella jira. Contributed by Tsz Wo (Nicholas), Sze.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1206990 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 06:30:49 +00:00
Tsz-wo Sze 4b65d10cfe HDFS-2590. Fix the missing links in the WebHDFS forrest doc.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1206178 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 13:58:29 +00:00
Tsz-wo Sze d3a51478e3 HDFS-2587. Add apt doc for WebHDFS REST API.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1205626 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 22:02:19 +00:00
Matthew Foley db092f5048 HADOOP-7827 HDFS-2588 MAPREDUCE-3464. jsp pages missing DOCTYPE. Contributed by Dave Vronay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1205519 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 18:15:37 +00:00
Tsz-wo Sze 7381884e85 HDFS-2552. Add Forrest doc for WebHDFS REST API.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1205146 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 20:04:58 +00:00
Suresh Srinivas 49417594e8 HDFS-2519. Add protobuf service for DatanodeProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204825 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 06:25:13 +00:00
Tsz-wo Sze 2ab10e29d9 HDFS-2246. Enable reading a block directly from local file system for a client on the same node as the block file. Contributed by Andrew Purtell, Suresh Srinivas and Jitendra Nath Pandey
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204792 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 02:57:04 +00:00
Konstantin Boudnik a2e66776a9 HDFS-2573. TestFiDataXceiverServer is failing, not testing OOME. Contributed by Konstantin Boudnik.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204781 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 02:15:49 +00:00
Suresh Srinivas 5293760973 HDFS-2410. Further cleanup of hardcoded configuration keys and values. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204753 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 23:49:44 +00:00
Suresh Srinivas b76b85986e HDFS-2520. Add protobuf service for InterDatanodeProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204709 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 21:11:43 +00:00
Suresh Srinivas 4754b80862 HDFS-2518. Add protobuf service for NamenodeProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204707 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 21:10:04 +00:00
Todd Lipcon 39ce694d05 HDFS-2566. Move BPOfferService to be a non-inner class. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204659 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 19:27:00 +00:00
Todd Lipcon 68173af69d HDFS-2575. DFSTestUtil may create empty files. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204652 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 19:03:31 +00:00
Suresh Srinivas 54ac7e5413 HDFS-2517. Add protobuf service for JounralProtocol. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204544 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 15:39:33 +00:00
Eli Collins 9c2f4f634d HDFS-2514. Link resolution bug for intermediate symlinks with relative targets. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204370 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 07:01:29 +00:00
Todd Lipcon 5bc66c4c86 HDFS-2532. TestDfsOverAvroRpc timing out in trunk. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204366 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 06:41:56 +00:00
Harsh J 67f25b0a1b HDFS-2572. Remove Unnecessary double-check in DN#getHostName (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204177 13f79535-47bb-0310-9956-ffa450edef68
2011-11-20 15:18:14 +00:00