Commit Graph

864 Commits

Author SHA1 Message Date
Eli Collins dc1fd84bd1 HDFS-3910. DFSTestUtil#waitReplication should timeout. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1383618 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 21:24:12 +00:00
Eli Collins e1ffefa860 HDFS-3907. Allow multiple users for local block readers. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1383031 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 18:46:13 +00:00
Tsz-wo Sze 009235f4a9 HDFS-2656. Add libwebhdfs, a pure C client based on WebHDFS. Contributed by Jaimin D Jetly and Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1382836 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 13:43:28 +00:00
Eli Collins 3a4dcfba57 HDFS-2757. Cannot read a local block that's being written to when using the local read short circuit. Contributed by Jean-Daniel Cryans
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1382409 13f79535-47bb-0310-9956-ffa450edef68
2012-09-09 06:37:31 +00:00
Arun Murthy 681408f898 Set date for hadoop-2.0.2-alpha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1382199 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 22:39:45 +00:00
Arun Murthy 7851676f22 Preparing for hadoop-2.0.2-alpha release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1382191 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 22:09:48 +00:00
Alejandro Abdelnur 9da626af41 HDFS-3895. hadoop-client must include commons-cli (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381719 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 19:03:37 +00:00
Uma Maheswara Rao G 6fd7df77a5 HDFS-3809. Make BKJM use protobufs for all serialization with ZK. Contributed by Ivan Kelly
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381699 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 18:03:16 +00:00
Daryn Sharp 82b981cca4 HDFS-3890. filecontext mkdirs doesn't apply umask as expected (Tom Graves via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381606 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 14:06:58 +00:00
Eli Collins 01db4d2bb2 HDFS-3828. Block Scanner rescans blocks too frequently. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381472 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 06:19:30 +00:00
Todd Lipcon 31142aa892 HDFS-1490. TransferFSImage should timeout. Contributed by Dmytro Molkov and Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380988 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 04:53:15 +00:00
Todd Lipcon c334cc89a8 HDFS-2793. Add an admin command to trigger an edit log roll. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380982 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 04:40:23 +00:00
Tsz-wo Sze 658e7b5818 HDFS-3888. Clean up BlockPlacementPolicyDefault. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380939 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 23:56:10 +00:00
Tsz-wo Sze f3927595cc HDFS-3887. Remove redundant chooseTarget methods in BlockPlacementPolicy. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380934 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 23:48:01 +00:00
Alejandro Abdelnur 4244c1443c HDFS-3866. HttpFS POM should have property where to download tomcat from (zero45 via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380927 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 22:55:40 +00:00
Robert Joseph Evans f5943c1eef Updated CHANGES.txt for 0.23.4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380906 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 21:45:33 +00:00
Uma Maheswara Rao G 3969bcb7c9 HDFS-3469. start-dfs.sh will start zkfc, but stop-dfs.sh will not stop zkfc similarly. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1380003 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 16:20:13 +00:00
Suresh Srinivas da3bd67138 HDFS-3880. Use Builder to build RPC server in HDFS. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379917 13f79535-47bb-0310-9956-ffa450edef68
2012-09-02 06:20:41 +00:00
Harsh J 54e612bfb9 HDFS-2580. NameNode#main(...) can make use of GenericOptionsParser. Contributed by harsh. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379828 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 19:22:11 +00:00
Tsz-wo Sze 50222ff529 HDFS-3871. Change NameNodeProxies to use RetryUtils. Contributed by Arun C Murthy
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379743 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 11:41:15 +00:00
Owen O'Malley c76a7893f9 HDFS-3466. Get HTTP kerberos principal from the web authentication keytab.
(omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379646 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 22:31:03 +00:00
Daryn Sharp 94c69f2c82 HDFS-3852. TestHftpDelegationToken is broken after HADOOP-8225 (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379623 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 21:31:55 +00:00
Daryn Sharp 3819c964fa HDFS-3873. Hftp assumes security is disabled if token fetch fails (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379615 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 21:24:48 +00:00
Suresh Srinivas 2fd49f5a57 HDFS-3833. TestDFSShell fails on windows due to concurrent file read/write. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379525 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 17:43:35 +00:00
Eli Collins 7d1c8d92f9 HDFS-3733. Audit logs should include WebHDFS access. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379278 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 04:08:23 +00:00
Eli Collins 34d1e73235 HDFS-3837. Fix DataNode.recoverBlock findbugs warning. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379172 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 21:40:28 +00:00
Daryn Sharp bb64f860eb HDFS-3861. Deadlock in DFSClient (Kihwal Lee via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379093 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 19:46:14 +00:00
Aaron Myers b2d186d865 HDFS-3864. NN does not update internal file mtime for OP_CLOSE when reading from the edit log. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1378413 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 01:19:07 +00:00
Aaron Myers d4d2bf73a9 HDFS-3849. When re-loading the FSImage, we should clear the existing genStamp and leases. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1378364 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 22:09:27 +00:00
Aaron Myers 8d724dd8b9 HDFS-3860. HeartbeatManager#Monitor may wrongly hold the writelock of namesystem. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1378228 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 17:01:38 +00:00
Eli Collins 36c5388080 Fixup CHANGELOG for HDFS-3856.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377936 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 01:45:26 +00:00
Eli Collins b29cb2d997 HDFS-3856. TestHDFSServerPorts failure is causing surefire fork failure. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377934 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 01:41:13 +00:00
Suresh Srinivas 735046ebec HDFS-3851. DFSOutputStream class code cleanup. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377372 13f79535-47bb-0310-9956-ffa450edef68
2012-08-26 04:00:26 +00:00
Aaron Myers 56285e1bee HDFS-3683. Edit log replay progress indicator shows >100% complete. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377367 13f79535-47bb-0310-9956-ffa450edef68
2012-08-26 00:31:12 +00:00
Suresh Srinivas deead78e35 HDFS-3844. Add @Override and remove {@inheritdoc} and unnecessary imports. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377168 13f79535-47bb-0310-9956-ffa450edef68
2012-08-25 01:03:22 +00:00
Eli Collins a11042365f HDFS-3731. 2.0 release upgrade must handle blocks being written from 1.0. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377137 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 22:10:38 +00:00
Aaron Myers 92cb6b093c HDFS-3678. Edit log files are never being purged from 2NN. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377046 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 18:52:59 +00:00
Suresh Srinivas a95bbb107f Correcting the jira number back to HDFS-3834 from HDFS-3844. I should pay better attention.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377008 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 17:53:19 +00:00
Suresh Srinivas 8c8d679cd5 Correcting the jira number from HDFS-3834 to HDFS-3844 for the commit 1377001
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377007 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 17:51:10 +00:00
Suresh Srinivas 7a1dc1ab70 HDFS-3834. Remove unused static fields NAME, DESCRIPTION and Usage from Command. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1377001 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 17:36:22 +00:00
Tsz-wo Sze c46de830da HDFS-3177. Update DFSClient and DataXceiver to handle different checkum types in file checksum computation. Contributed by Kihwal Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376928 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 14:15:14 +00:00
Eli Collins c10a73350e Revert HDFS-3837. Fix DataNode.recoverBlock findbugs warning.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376701 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 21:08:19 +00:00
Eli Collins 6885d03501 HDFS-3715. Fix TestFileCreation#testFileCreationNamenodeRestart. Contributed by Andrew Whang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376689 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 20:49:55 +00:00
Aaron Myers de8b34a70e HDFS-3835. Long-lived 2NN cannot perform a checkpoint if security is enabled and the NN restarts with outstanding delegation tokens. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376188 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 18:47:07 +00:00
Jitendra Nath Pandey 901b1739c6 HDFS-3819. Should check whether invalidate work percentage default value is not greater than 1.0f. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376185 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 18:44:44 +00:00
Suresh Srinivas 30bd8ef9d1 Moving HDFS-2686 and HDFS-3832 to branch-2 section in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376142 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 17:04:08 +00:00
Suresh Srinivas 380870d544 HDFS-3832. Remove protocol methods related to DistributedUpgrade. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376139 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 16:59:50 +00:00
Eli Collins 89e16be81b HDFS-3837. Fix DataNode.recoverBlock findbugs warning. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376129 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 16:26:50 +00:00
Eli Collins 2b030c6a4a HDFS-3830. test_libhdfs_threaded: use forceNewInstance. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376121 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 16:19:27 +00:00
Suresh Srinivas a99cfe3ca0 HDFS-3817. Avoid printing SafeModeException stack trace in RPC server. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376054 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 13:59:40 +00:00
Suresh Srinivas 557b937f47 HDFS-3827. TestHASafeMode#assertSafemode method should be made static. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375828 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 22:25:49 +00:00
Suresh Srinivas 6c0ccb5989 HDFS-2686. Remove DistributedUpgrade related code. Contributed by Suresh Srinivas
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375800 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 21:18:40 +00:00
Eli Collins a6262430ff HDFS-2727. libhdfs should get the default block size from the server. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375383 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 03:48:00 +00:00
Eli Collins 97bb7b180e HDFS-3707. TestFSInputChecker: improper use of skip. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1375336 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 00:00:33 +00:00
Suresh Srinivas 086c855198 HDFS-3816. Invalidate work percentage default value should be 0.32f. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374645 13f79535-47bb-0310-9956-ffa450edef68
2012-08-18 19:50:15 +00:00
Aaron Myers fccace6116 HDFS-3672. Expose disk-location information for blocks to enable better scheduling. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374355 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 16:52:07 +00:00
Tsz-wo Sze ffbadbdd36 HDFS-2421. Improve the concurrency of SerialNumberMap in NameNode. Contributed by Jing Zhao and Weiyan Wang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374127 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 01:54:16 +00:00
Tsz-wo Sze 87d87b04e6 HDFS-3788. ByteRangeInputStream should not expect HTTP Content-Length header when chunked transfer-encoding is used.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374122 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 01:42:35 +00:00
Aaron Myers bbe4584ebf HDFS-3808. fuse_dfs: postpone libhdfs intialization until after fork. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374106 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 23:47:33 +00:00
Eli Collins cf93dfba4e HDFS-2963. Console Output is confusing while executing metasave (dfsadmin command). Contributed by Andrew Wang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1374040 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 20:35:50 +00:00
Eli Collins 4524655afd HDFS-3194. DataNode block scanner is running too frequently. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373928 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 17:13:13 +00:00
Eli Collins f75deca0f9 HDFS-3048. Small race in BlockManager#close. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373664 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 22:43:01 +00:00
Todd Lipcon 89153a9c68 HDFS-3796. Speed up edit log tests by avoiding fsync(). Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373567 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 18:53:13 +00:00
Tsz-wo Sze 9dff7876d9 HDFS-3802. StartupOption.name in HdfsServerConstants should be final. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373253 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 08:07:29 +00:00
Tsz-wo Sze f41497c141 HDFS-3794. WebHDFS OPEN returns the incorrect Content-Length in the HTTP header when offset is specified and length is omitted. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373193 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 02:23:21 +00:00
Suresh Srinivas 6c96039693 HDFS-3803. Change BlockPoolSliceScanner chatty INFO log to DEBUG. Contributed by Andrew Purtell
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373174 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:33:53 +00:00
Suresh Srinivas 28e87740c5 HDFS-3723. Add support -h, -help to all the commands. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373173 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:28:41 +00:00
Suresh Srinivas 231a52a7df Reverting previous incomplete change r1373170 for HDFS-3723
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373172 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:25:07 +00:00
Suresh Srinivas f026d8bb1b HDFS-3723. Add support -h, -help to all the commands. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373170 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 00:03:19 +00:00
Eli Collins f98d8eb291 HDFS-3150. Add option for clients to contact DNs via hostname. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373094 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 20:59:54 +00:00
Daryn Sharp f46b6ea55c HDFS-3718. Datanode won't shutdown because of runaway DataBlockScanner thread (Kihwal Lee via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373090 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 20:56:49 +00:00
Todd Lipcon b38bd555e8 HDFS-3765. namenode -initializeSharedEdits should be able to initialize all shared storages. Contributed by Vinay and Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1373061 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 20:11:40 +00:00
Tsz-wo Sze 0c27c77080 HDFS-3658. Fix bugs in TestDFSClientRetries and add more tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372707 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 03:02:43 +00:00
Todd Lipcon ab3ab17a43 HDFS-3792. Fix two findbugs introduced by HDFS-3695. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372690 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 00:52:10 +00:00
Aaron Myers 4139298b61 HDFS-3790. test_fuse_dfs.c doesn't compile on centos 5. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372676 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 00:04:55 +00:00
Todd Lipcon c93185df66 HDFS-3276. initializeSharedEdits should have a -nonInteractive flag. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372628 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:26:39 +00:00
Todd Lipcon c9ed8342f5 Move HDFS-2330 and HDFS-3190 to branch-2 section, since they have been backported from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372605 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 20:52:17 +00:00
Todd Lipcon 7aacfd5a08 HDFS-3789. JournalManager#format() should be able to throw IOException. Contributed by Ivan Kelly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372566 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 19:36:31 +00:00
Aaron Myers bbe0e823db Revert HDFS-3719. See discussion there and HDFS-3770 for more info.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372544 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 18:42:51 +00:00
Eli Collins bcb715459c HDFS-3758. TestFuseDFS test failing. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371555 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 03:42:36 +00:00
Todd Lipcon 9d0f8792a9 HDFS-3695. Genericize format() to non-file JournalManagers. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371513 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 22:13:54 +00:00
Aaron Myers 9ea7c06468 HDFS-3721. hsync support broke wire compatibility. Contributed by Todd Lipcon and Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371495 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 21:31:12 +00:00
Aaron Myers fb970f3df7 HDFS-3634. Add self-contained, mavenized fuse_dfs test. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1371231 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 14:44:05 +00:00
Jakob Homan ac31ae6a79 HDFS-3768. Exception in TestJettyHelper is incorrect. Contributed by Eli Reisman.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370952 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 20:34:03 +00:00
Todd Lipcon 6dcf2e4815 HDFS-3755. Creating an already-open-for-write file with overwrite=true fails. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370937 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 20:15:40 +00:00
Aaron Myers b587af4631 HDFS-3710. libhdfs misuses O_RDONLY/WRONLY/RDWR. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370898 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 19:11:30 +00:00
Aaron Myers 34554d1e11 HDFS-3760. primitiveCreate is a write, not a read. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370649 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 02:53:56 +00:00
Eli Collins c12e994eda HDFS-3754. BlockSender doesn't shutdown ReadaheadPool threads. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370495 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 20:17:59 +00:00
Alejandro Abdelnur 754fd7b2fb HDFS-3291. add test that covers HttpFS working w/ a non-HDFS Hadoop filesystem (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370387 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 17:43:32 +00:00
Aaron Myers 9b4a7900c7 HDFS-3637. Add support for encrypting the DataTransferProtocol. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370354 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 16:40:03 +00:00
Aaron Myers f7b37c009b HDFS-3579. libhdfs: fix exception handling. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1370015 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 21:02:30 +00:00
Aaron Myers 294b514596 HDFS-3719. Re-enable append-related tests in TestFileConcurrentReader. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1369848 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 13:59:00 +00:00
Alejandro Abdelnur 42d071ab6f HDFS-3756. DelegationTokenFetcher creates 2 HTTP connections, the second one not properly configured. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1368733 13f79535-47bb-0310-9956-ffa450edef68
2012-08-02 22:10:51 +00:00
Alejandro Abdelnur fe17d871d0 HDFS-3513. HttpFS should cache filesystems. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1368304 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 23:09:19 +00:00
Aaron Myers 8ea7112595 HDFS-3738. TestDFSClientRetries#testFailuresArePerOperation sets incorrect timeout config. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367844 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 02:16:57 +00:00
Tsz-wo Sze cb787968c5 HDFS-3667. Add retry support to WebHdfsFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367841 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 01:41:23 +00:00
Tsz-wo Sze 556be2af92 svn merge -c -1366601 for reverting HDFS-3667.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367407 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 04:33:59 +00:00
Aaron Myers aeade62b95 HDFS-3732. fuse_dfs: incorrect configuration value checked for connection expiry timer period. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1367199 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 18:07:07 +00:00
Tsz-wo Sze e4eec269d9 HDFS-3667. Add retry support to WebHdfsFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1366601 13f79535-47bb-0310-9956-ffa450edef68
2012-07-28 05:57:47 +00:00
Suresh Srinivas 0c4e670eff HDFS-3679. fuse_dfs notrash option sets usetrash. Contributed by Conrad Meyer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1366545 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 21:51:07 +00:00
Daryn Sharp cbd59c1c50 HDFS-3553. Hftp proxy tokens are broken (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1366471 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 18:02:56 +00:00
Aaron Myers c1ea9b4490 HDFS-3650. Use MutableQuantiles to provide latency histograms for various operations. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1366246 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 00:26:21 +00:00
Alejandro Abdelnur 4d4560189a HDFS-3113. httpfs does not support delegation tokens. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1365988 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:39:05 +00:00
Tsz-wo Sze 8f395c2f78 HDFS-3696. Set chunked streaming mode in WebHdfsFileSystem write operations to get around a Java library bug causing OutOfMemoryError.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1365839 13f79535-47bb-0310-9956-ffa450edef68
2012-07-25 23:37:25 +00:00
Todd Lipcon 972953bd77 HDFS-3626. Creating file with invalid path can corrupt edit log. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1365801 13f79535-47bb-0310-9956-ffa450edef68
2012-07-25 21:52:38 +00:00
Aaron Myers 56b0912b6c HDFS-3720. hdfs.h must get packaged. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1365759 13f79535-47bb-0310-9956-ffa450edef68
2012-07-25 21:21:14 +00:00
Aaron Myers d8f3913856 HDFS-3711. Manually convert remaining tests to JUnit4. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1365119 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 15:19:08 +00:00
Eli Collins 1fd21078d8 HDFS-3709. TestStartup tests still binding to the ephemeral port. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1364865 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 01:53:29 +00:00
Todd Lipcon b7b8db51de HDFS-3697. Enable fadvise readahead by default. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1364698 13f79535-47bb-0310-9956-ffa450edef68
2012-07-23 16:27:59 +00:00
Aaron Myers decd9e1c74 Move entry for HDFS-3583 in CHANGES.txt to be under branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363949 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 20:46:25 +00:00
Aaron Myers 02a5551ba3 HDFS-3608. fuse_dfs: detect changes in UID ticket cache. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363904 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 19:15:52 +00:00
Todd Lipcon 9833468302 HDFS-3597. SNN fails to start after DFS upgrade. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363899 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 18:58:58 +00:00
Eli Collins 6383679872 HDFS-3690. BlockPlacementPolicyDefault incorrectly casts LOG. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363576 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 23:04:01 +00:00
Eli Collins 5d5a83877a HDFS-1249. With fuse-dfs, chown which only has owner (or only group) argument fails with Input/output error. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363466 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 18:37:47 +00:00
Eli Collins 7d5d63c13e HDFS-3675. libhdfs: follow documented return codes. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363459 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 18:26:04 +00:00
Eli Collins 15eec42316 HDFS-3673. libhdfs: fix some compiler warnings. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363457 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 18:22:56 +00:00
Todd Lipcon 23b6ed973e HDFS-3605. Block mistakenly marked corrupt during edit log catchup phase of failover. Contributed by Todd Lipcon and Brahma Reddy Battula.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363175 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 23:42:13 +00:00
Daryn Sharp 0a6806ce8c HDFS-3646. LeaseRenewer can hold reference to inactive DFSClient instances forever (Kihwal Lee via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1363170 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 23:21:30 +00:00
Tsz-wo Sze 6e56376023 HDFS-3577. In DatanodeWebHdfsMethods, use MessageBodyWriter instead of StreamingOutput, otherwise, it will fail to transfer large files.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362976 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 15:12:47 +00:00
Eli Collins d61c5bcb0b Revert HDFS-3639. JspHelper#getUGI should always verify the token if security is enabled.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362760 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 05:11:01 +00:00
Eli Collins 6981b14003 Revert HDFS-3654. TestJspHelper#testGetUgi fails with NPE.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362759 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 05:05:50 +00:00
Aaron Myers e2253b539e HDFS-3583. Convert remaining tests to Junit4. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362753 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 03:46:28 +00:00
Eli Collins 527933f4f3 HDFS-3666. Plumb more exception messages to terminate. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362270 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 21:26:58 +00:00
Todd Lipcon 6df36b58e1 HDFS-3625. Fix TestBackupNode by properly initializing edit log during startup. Contributed by Junping Du.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362189 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 18:54:46 +00:00
Eli Collins 572823c82c HDFS-3665. Add a test for renaming across file systems via a symlink. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362177 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 18:29:25 +00:00
Eli Collins 69f7a329ba HDFS-3537. Move libhdfs and fuse-dfs source to native subdirectories. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362119 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 16:42:53 +00:00
Harsh J 0e8e499ff4 HDFS-3659. Add missing @Override to methods across the hadoop-hdfs project. Contributed by Brandon Li. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361894 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 02:58:03 +00:00
Eli Collins 64fc2cb03d HDFS-3663. MiniDFSCluster should capture the code path that led to the first ExitException. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361775 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 19:43:39 +00:00
Eli Collins 2eb39c55d6 HDFS-3610. fuse_dfs: Provide a way to use the default (configured) NN URI. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361565 13f79535-47bb-0310-9956-ffa450edef68
2012-07-14 17:19:01 +00:00
Eli Collins 32d4c148df HDFS-3654. TestJspHelper#testGetUgi fails with NPE. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361463 13f79535-47bb-0310-9956-ffa450edef68
2012-07-14 01:07:57 +00:00
Eli Collins f5dd4583bb HDFS-3539. libhdfs code cleanups. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361459 13f79535-47bb-0310-9956-ffa450edef68
2012-07-14 00:47:43 +00:00
Eli Collins cfd692b866 HDFS-3609. libhdfs: don't force the URI to look like hdfs://hostname:port. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361454 13f79535-47bb-0310-9956-ffa450edef68
2012-07-14 00:34:28 +00:00
Eli Collins 06d635cd2c HDFS-3492. fix some misuses of InputStream#skip. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361449 13f79535-47bb-0310-9956-ffa450edef68
2012-07-14 00:18:56 +00:00
Eli Collins 8c2a2f909c HDFS-470. libhdfs should handle 0-length reads from FSInputStream correctly. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361446 13f79535-47bb-0310-9956-ffa450edef68
2012-07-14 00:03:58 +00:00
Eli Collins dcf0ac7a8a HDFS-3606. libhdfs: create self-contained unit test. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361440 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 23:28:03 +00:00
Harsh J d9911e923d HDFS-3612. Single namenode image directory config warning can be improved. Contributed by Andy Isaacson. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361059 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 07:20:27 +00:00
Eli Collins bfa51a33d0 HDFS-3306. fuse_dfs: don't lock release operations. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361021 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 00:44:27 +00:00
Eli Collins 0f3ba4870b HDFS-799. libhdfs must call DetachCurrentThread when a thread is destroyed. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361008 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 00:10:04 +00:00
Eli Collins e2318c2895 HDFS-3633. libhdfs: hdfsDelete should pass JNI_FALSE or JNI_TRUE. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1361005 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 23:52:48 +00:00
Sanjay Radia 6a59f08a15 HDFS-3630 Modify TestPersistBlocks to use both flush and hflush (sanjay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360991 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 22:46:53 +00:00
Eli Collins 4a5ba3b7bd HDFS-3641. Move server Util time methods to common and use now instead of System#currentTimeMillis. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360858 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 19:01:49 +00:00
Eli Collins 8ced7381a4 HDFS-3639. JspHelper#getUGI should always verify the token if security is enabled. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360485 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 00:12:15 +00:00
Eli Collins cdae6953e8 HDFS-3582. Hook daemon process exit for testing. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360329 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 17:58:02 +00:00
Aaron Myers 664ca6b75e HDFS-3615. Two BlockTokenSecretManager findbugs warnings. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360255 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 16:09:18 +00:00
Harsh J 2c27b5826d HDFS-3611. NameNode prints unnecessary WARNs about edit log normally skipping a few bytes. Contributed by Colin Patrick McCabe. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1360001 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 03:37:07 +00:00
Harsh J c81aed0271 HDFS-3613. GSet prints some INFO level values, which aren't really very useful to all. Contributed by Andrew Wang. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1359999 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 03:15:03 +00:00
Harsh J 3b5ea87502 HDFS-3629. Fix the typo in the error message about inconsistent storage layout version. Contributed by Brandon Li. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1359905 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 21:14:27 +00:00
Aaron Myers fb4a6ac9e9 HDFS-3568. fuse_dfs: add support for security. Contributed by Colin McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1359824 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 18:28:13 +00:00
Harsh J e0f96aa249 HDFS-3555. idle client socket triggers DN ERROR log (should be INFO or DEBUG). Contributed by Andy Isaacson. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1359619 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 11:52:13 +00:00
Aaron Myers b6a9d38c09 Move CHANGES.txt entry for HDFS-3067 to branch-2 instead of trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1359331 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 18:34:36 +00:00