Commit Graph

2417 Commits

Author SHA1 Message Date
Arpit Agarwal ea1c5ea086 HDFS-5510. Fix a findbug warning in DataStorage.java on HDFS-2832 branch. (Contributed by Junping Du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1542006 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 18:16:02 +00:00
Kihwal Lee fe67e30bc2 HDFS-4995. Make getContentSummary less expensive. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541971 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 16:49:31 +00:00
Jing Zhao b771197ed5 HDFS-5487. Introduce unit test for TokenAspect. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541776 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 01:14:38 +00:00
Jing Zhao 735aae32e4 HDFS-5504. In HA mode, OP_DELETE_SNAPSHOT is not decrementing the safemode threshold, leads to NN safemode. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541773 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 01:03:34 +00:00
Jing Zhao de9271686a HDFS-5444. Choose default web UI based on browser capabilities. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541753 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 22:57:53 +00:00
Jing Zhao f22b512203 Move HDFS-5325 and HDFS-5488 from BUG-FIX to IMPROVEMENT in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541718 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 21:10:22 +00:00
Steve Loughran 1a38b48026 HDFS-5075 httpfs-config.sh calls out incorrect env script name
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541692 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:19:41 +00:00
Jing Zhao ced740e580 HDFS-5474. Deletesnapshot can make Namenode in safemode on NN restarts. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541685 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:59:55 +00:00
Jing Zhao 1c211f6749 HDFS-5440. Extract the logic of handling delegation tokens in HftpFileSystem to the TokenAspect class. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541665 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:25:09 +00:00
Colin McCabe 3c591aa442 HDFS-5366. recaching improvements (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541647 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 18:18:37 +00:00
Arpit Agarwal bf9f8511fa Merging r1541342 through r1541617 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541620 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 17:15:36 +00:00
Colin McCabe 39def49661 HDFS-5485. add command-line support for modifyDirective (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541377 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 03:29:02 +00:00
Arpit Agarwal d06a782c1e HDFS-5501. Fix pendingReceivedRequests tracking in BPServiceActor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541371 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 02:59:46 +00:00
Arpit Agarwal 46cbce9af1 HDFS-5508. Fix compilation error after merge. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541352 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 02:00:41 +00:00
Tsz-wo Sze ba98e8f737 merge r1535792 through r1541341 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541342 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 01:14:37 +00:00
Andrew Wang 9d06631719 HDFS-5450. better API for getting the cached blocks locations. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541338 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 00:31:55 +00:00
Colin McCabe ce35e0950c HDFS-5471. CacheAdmin -listPools fails when user lacks permissions to view all pools (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541323 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 23:52:23 +00:00
Jing Zhao 8162fdcdbc HDFS-5425. Renaming underconstruction file with snapshots can make NN failure on restart. Contributed by Vinay and Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541261 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 22:10:09 +00:00
Arpit Agarwal e5b3171c3b HDFS-5494. Fix findbugs warnings for HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540924 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 02:36:24 +00:00
Andrew Wang 455269cf9f Move HDFS-5495 to 2.3.0 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540917 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 02:06:21 +00:00
Andrew Wang 646fcc8a56 HDFS-5495. Remove further JUnit3 usages from HDFS. Contributed by Jarek Jarcec Cecho.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540914 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 01:56:56 +00:00
Arpit Agarwal ec5eebc450 Merging r1540548 through r1540909 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540910 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 01:16:10 +00:00
Arpit Agarwal 26f2bd67f2 HDFS-5491. Update editsStored for HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540903 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 00:48:55 +00:00
Jing Zhao f10642a8fd HDFS-5488. Clean up TestHftpURLTimeout. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540894 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 00:21:57 +00:00
Andrew Wang 2b3e1abcda HDFS-5467. Remove tab characters in hdfs-default.xml. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540816 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 19:25:47 +00:00
Andrew Wang 9673baa7e8 HDFS-5320. Add datanode caching metrics. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540796 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 18:30:07 +00:00
Arpit Agarwal a161ff8f09 HDFS-5486. Fix TestNameNodeMetrics for HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540619 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 06:40:06 +00:00
Arpit Agarwal bb5bd30df6 Merging r1540239 through r1540547 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540549 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 21:01:12 +00:00
Arpit Agarwal 907fb15ee8 HDFS-5480. Update Balancer for HDFS-2832. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540547 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 20:59:32 +00:00
Brandon Li ec9ec0084e HDFS-5469. Add configuration property for the sub-directroy export path. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540443 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 04:07:39 +00:00
Chris Nauroth 25ebe6bfd7 HDFS-5482. DistributedFileSystem#listPathBasedCacheDirectives must support relative paths. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540257 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 05:54:19 +00:00
Tsz-wo Sze fccbb5072c merge of r1535792 through r1540238 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540239 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 01:34:22 +00:00
Jing Zhao 37bc8e0c14 HDFS-5325. Remove WebHdfsFileSystem#ConnRunner. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540235 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 01:19:54 +00:00
Arpit Agarwal 90d1b1b6a4 HDFS-5481. Fix TestDataNodeVolumeFailure in branch HDFS-2832. (Contributed by Junping Du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540228 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 00:19:48 +00:00
Jing Zhao a4bc1a6218 HDFS-5371. Let client retry the same NN when dfs.client.test.drop.namenode.response.number is enabled. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540197 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 21:39:58 +00:00
Jing Zhao f2ad787a27 HDFS-5476. Snapshot: clean the blocks/files/directories under a renamed file/directory while deletion. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540142 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 18:18:03 +00:00
Colin McCabe 97199baea1 HDFS-5394: Fix race conditions in DN caching and uncaching (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539909 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 03:00:19 +00:00
Arpit Agarwal 6b0611ed24 Merging r1539737 through r1539896 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539898 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 01:44:24 +00:00
Arpit Agarwal 06d24efed0 HDFS-5475. NN incorrectly tracks more than one replica per DN.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539890 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 01:01:18 +00:00
Colin McCabe f79b3e6b17 HDFS-5326. add modifyDirective to cacheAdmin (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539839 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 22:07:16 +00:00
Brandon Li 3fccdec6e0 HDFS-5364. Add OpenFileCtx cache. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539834 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 21:49:13 +00:00
Colin McCabe 77afc605fd HDFS-5468. CacheAdmin help command does not recognize commands (Stephen Chu via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539786 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 19:58:52 +00:00
Jing Zhao 9964a94386 HDFS-5443. Delete 0-sized block when deleting an under-construction file that is included in snapshot. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539754 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 18:37:38 +00:00
Brandon Li 16c6755554 HDFS-5252. Stable write is not handled correctly in someplace. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539740 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 18:02:37 +00:00
Arpit Agarwal a604e3b73b HDFS-5472. Fix TestDatanodeManager, TestSafeMode and TestNNThroughputBenchmark. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539736 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 17:57:30 +00:00
Tsz-wo Sze 75777f1626 HDFS-5470. Add back trunk's reportDiff algorithm to the branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539504 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 00:13:05 +00:00
Arpit Agarwal fa5ba6d977 HDFS-5439. Fix TestPendingReplication. (Contributed by Junping Du, Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539247 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 06:50:33 +00:00
Arpit Agarwal 103fd6c6d8 Merging r1538408 through r1539244 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539245 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 06:14:13 +00:00
Arpit Agarwal 3e3fea7cd4 HDFS-5466. Update storage IDs when the pipeline is updated. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539203 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 00:25:10 +00:00
Andrew Wang 8639ecb26d HDFS-5458. Datanode failed volume threshold ignored if exception is thrown in getDataDirsFromURIs. Contributed by Mike Mellenthin.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539091 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 18:27:00 +00:00
Jing Zhao a6250a4943 HDFS-5427. Not able to read deleted files from snapshot directly under snapshottable dir after checkpoint and NN restart. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538875 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 06:38:50 +00:00
Chris Nauroth c47b3d7502 HDFS-5456. NameNode startup progress creates new steps if caller attempts to create a counter for a step that doesn't already exist. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538872 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 06:04:07 +00:00
Arpit Agarwal d2b7b6589d HDFS-5457. Fix TestDatanodeRegistration, TestFsck and TestAddBlockRetry. (Contributed by szetszwo)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538794 13f79535-47bb-0310-9956-ffa450edef68
2013-11-04 22:49:00 +00:00
Arpit Agarwal 1d357365b7 HDFS-5455. NN should update storageMap on first heartbeat.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538787 13f79535-47bb-0310-9956-ffa450edef68
2013-11-04 21:47:51 +00:00
Arpit Agarwal 0091606e2d HDFS-5448. Fix break caused by previous checkin for HDFS-5448.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538655 13f79535-47bb-0310-9956-ffa450edef68
2013-11-04 16:00:12 +00:00
Arpit Agarwal 9660bfa84c HDFS-5448. Datanode should generate its ID on first registration
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538496 13f79535-47bb-0310-9956-ffa450edef68
2013-11-04 02:13:04 +00:00
Tsz-wo Sze 7e46025f91 Merge r1537584 through r1538407 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538408 13f79535-47bb-0310-9956-ffa450edef68
2013-11-03 17:51:52 +00:00
Tsz-wo Sze 26a1fda51e HDFS-5452. Fix TestReplicationPolicy and TestBlocksScheduledCounter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538407 13f79535-47bb-0310-9956-ffa450edef68
2013-11-03 17:49:08 +00:00
Colin McCabe 7abf7e8151 HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538248 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 18:42:27 +00:00
Uma Maheswara Rao G 833da65d86 HDFS-5344. Make LsSnapshottableDir as Tool interface implementation. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538156 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 09:02:35 +00:00
Arpit Agarwal cbdeba29bd HDFS-5447. Fix TestJspHelper in branch HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1538145 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 05:21:48 +00:00
Andrew Wang f607a8ddff Move HDFS-5035 to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538124 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 01:08:26 +00:00
Andrew Wang 3b91b7dece HDFS-5037. Active NN should trigger its own edit log rolls. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538059 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 20:49:54 +00:00
Arpit Agarwal a891076159 Merging r1537252 through r1537583 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1537584 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 18:49:54 +00:00
Arpit Agarwal 2af5083a35 HDFS-5437. Fix TestBlockReport and TestBPOfferService failures.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1537365 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 02:32:25 +00:00
Chris Nauroth e42b17950e HDFS-4633. Change attribution in CHANGES.txt to version 2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537345 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 23:43:40 +00:00
Chris Nauroth ff549faea0 HDFS-5065. Change attribution in CHANGES.txt to version 2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537319 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 21:51:57 +00:00
Arpit Agarwal 4eebf56ccf Merging r1536890 through r1537251 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1537252 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 19:28:44 +00:00
Chris Nauroth 6aeaef9276 HDFS-5386. Add feature documentation for datanode caching. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537243 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 19:01:13 +00:00
Chris Nauroth 9c29b86cab HDFS-5432. TestDatanodeJsp fails on Windows due to assumption that loopback address resolves to host name localhost. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537230 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 18:37:48 +00:00
Andrew Wang 75a162ff92 HDFS-5433. When reloading fsimage during checkpointing, we should clear existing snapshottable directories. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537192 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 17:27:51 +00:00
Arpit Agarwal 68a79b0d3f HDFS-5436. Move HsFtpFileSystem and HFtpFileSystem into org.apache.hdfs.web. (Contributed by Haohui Mai)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536921 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 22:44:34 +00:00
Arpit Agarwal 73cf16ce48 Merging r1536573 through r1536889 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536890 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:05:15 +00:00
Arpit Agarwal c2495a7bff Merging r1536572 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536889 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:04:31 +00:00
Colin McCabe 0ac867c9eb move HDFS-4657 to branch-2.2.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536887 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:02:14 +00:00
Arpit Agarwal 16359ec2c7 Merging r1536182 through r1536558 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536801 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 16:44:53 +00:00
Colin McCabe 1b48f44feb Merge HDFS-4949 branch back into trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536572 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 00:49:20 +00:00
Chris Nauroth a2d81e3017 HDFS-5413. hdfs.cmd does not support passthrough to any arbitrary class. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536448 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 17:57:00 +00:00
Arpit Agarwal dc0b44a884 HDFS-5435. File append fails to initialize storageIDs. (Junping Du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536434 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 17:29:06 +00:00
Arpit Agarwal 67b93d6e25 Merging r1535792 through r1536181 from trunk to HDFS-2832.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536182 13f79535-47bb-0310-9956-ffa450edef68
2013-10-27 18:43:58 +00:00
Arpit Agarwal b9d561c548 HDFS-5214. Fix NPEs in BlockManager and DirectoryScanner.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536179 13f79535-47bb-0310-9956-ffa450edef68
2013-10-27 18:29:49 +00:00
Jing Zhao 5829029154 HDFS-5257. addBlock() retry should return LocatedBlock with locations else client will get AIOBE. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535811 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 18:43:06 +00:00
Tsz-wo Sze 9043a92219 Merge r1535533 through r1535791 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535792 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 17:23:11 +00:00
Tsz-wo Sze ec01db59ce HDFS-5417. Fix storage IDs in PBHelper and UpgradeUtilities.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535791 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 17:21:49 +00:00
Andrew Wang 83609cd7fb merge trunk to hdfs-4949 branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535608 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 01:56:56 +00:00
Andrew Wang dc2ee20aec HDFS-5419. Fixup test-patch.sh warnings on HDFS-4949 branch. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535607 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 01:56:05 +00:00
Brandon Li 05f35518f1 HDFS-5171. NFS should create input stream for a file and try to share it with multiple read requests. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535586 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 23:40:34 +00:00
Andrew Wang e87b2a3684 merge trunk into HDFS-4949 branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535563 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 21:38:25 +00:00
Arpit Agarwal 1fcc24d56a Merging r1535122 through r1535532 from trunk to HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535534 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 20:33:04 +00:00
Andrew Wang 222dbfe2ce HDFS-5405. Fix possible RetryCache hang for caching RPC handlers in FSNamesystem. (Contributed by Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535282 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 05:40:28 +00:00
Andrew Wang 4004a42d53 HDFS-5404 Resolve regressions in Windows compatibility on HDFS-4949 branch. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1535217 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 00:08:15 +00:00
Kihwal Lee bf3271bd2b HDFS-5341. Reduce fsdataset lock duration during directory scanning. Contributed by Qus-Jiawei.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535188 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 21:29:51 +00:00
Jing Zhao 1387fb1394 HDFS-5363. Refactor WebHdfsFileSystem: move SPENGO-authenticated connection creation to URLConnectionFactory. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535169 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 20:48:25 +00:00
Arpit Agarwal f39f8c5734 HDFS-5401. Fix NPE in Directory Scanner.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535158 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 20:28:54 +00:00
Tsz-wo Sze b442fe92fb Merge r1534894 through r1535121 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535122 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 19:00:35 +00:00
Aaron Myers 82ed72d1d4 HDFS-5403. WebHdfs client cannot communicate with older WebHdfs servers post HDFS-5306. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1535056 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 15:15:29 +00:00
Arpit Agarwal 01f37e42f0 HDFS-5390. Send one incremental block report per storage directory.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534891 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 01:28:48 +00:00
Arpit Agarwal b884af72c5 HDFS-5398. NameNode changes to process storage reports per storage directory.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534847 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 23:29:40 +00:00
Arpit Agarwal ef17685f79 Merging r1534279 through r1534706 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534707 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 17:24:52 +00:00
Colin McCabe d45ca49e3d HDFS-5400. DFS_CLIENT_MMAP_CACHE_THREAD_RUNS_PER_TIMEOUT constant is set to the wrong value (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534655 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 15:10:17 +00:00
Arpit Agarwal 0ebab3a88a HDFS-5377. Heartbeats from Datandode should include one storage report per storage directory
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534464 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 02:22:17 +00:00
Tsz-wo Sze df87ed34f2 HDFS-4885. Improve the verifyBlockPlacement() API in BlockPlacementPolicy. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534426 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 00:20:39 +00:00
Tsz-wo Sze 40fec97bef svn merge -c -1534417 . for reverting HDFS-4885, which should be committed to trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534424 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 00:19:04 +00:00
Tsz-wo Sze 12ed24af66 HDFS-4885. Improve the verifyBlockPlacement() API in BlockPlacementPolicy. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534417 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 23:48:08 +00:00
Brandon Li 4380e480ce HDFS-5347. Add HDFS NFS user guide. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534377 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:15:20 +00:00
Jing Zhao fc99f3e8a3 HDFS-5382. Implement the UI of browsing filesystems in HTML 5 page. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534368 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 20:42:13 +00:00
Colin McCabe 69e5f90e9f HDFS-5385. Caching RPCs are AtMostOnce, but do not persist client ID and call ID to edit log. (Chris Nauroth via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1534345 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 19:42:35 +00:00
Colin McCabe f9c08d02eb HDFS-5378. In CacheReport, don't send genstamp and length on the wire (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1534334 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 19:29:46 +00:00
Arpit Agarwal 62f95b003b Merging r1533208 through r1534278 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1534279 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 17:11:34 +00:00
Uma Maheswara Rao G 7fd9148800 HDFS-5331 make SnapshotDiff.java to a o.a.h.util.Tool interface implementation. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533917 13f79535-47bb-0310-9956-ffa450edef68
2013-10-20 15:23:10 +00:00
Colin McCabe d61af97810 HDFS-5203. Concurrent clients that add a cache directive on the same path may prematurely uncache each other. (Chris Nauroth via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1533651 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 22:15:26 +00:00
Colin McCabe 1d96e36013 HDFS-5388. Loading fsimage fails to find cache pools during namenode startup (Chris Nauroth via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1533616 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 20:20:20 +00:00
Chris Nauroth f3043374ff HDFS-5365. Move attribution to 2.2.1 in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533574 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 18:13:55 +00:00
Chris Nauroth 4d5a66f4b0 HDFS-5365. Fix libhdfs compile error on FreeBSD9. Contributed by Radim Kolar.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533283 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 23:05:44 +00:00
Jonathan Turner Eagles a19b956975 HDFS-4511. Cover package org.apache.hadoop.hdfs.tools with unit test (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533270 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 21:49:30 +00:00
Suresh Srinivas 631ccbdd20 HDFS-5374. Remove deadcode in DFSOutputStream. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533258 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 20:47:31 +00:00
Andrew Wang dcb0b85333 HDFS-5383. fix broken caching unit tests (Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1533253 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 20:31:13 +00:00
Arpit Agarwal f8d5755a69 Merging r1532911 through r1533207 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1533208 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:54:53 +00:00
Chris Nauroth 1fde8bcc85 HDFS-5336. DataNode should not output StartupProgress metrics. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533183 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:06:01 +00:00
Jing Zhao 9d24715a89 HDFS-5379. Update links to datanode information in dfshealth.html. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533181 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 17:58:27 +00:00
Chris Nauroth c4e57ee4c3 HDFS-5375. hdfs.cmd does not expose several snapshot commands. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533165 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 17:14:11 +00:00
Andrew Wang da1f4419e3 merge the rest of trunk to branch HDFS-4949
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532967 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 05:32:42 +00:00
Andrew Wang 34f08944b7 merge trunk to branch HDFS-4949
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532952 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 02:14:33 +00:00
Jing Zhao 909ab360c0 HDFS-5334. Implement dfshealth.jsp in HTML pages. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532949 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 01:31:33 +00:00
Andrew Wang 76c49b6e95 Move HDFS-5360 to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532935 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:13:50 +00:00
Tsz-wo Sze 1ba58e2e2c HDFS-4376. Fix race conditions in Balancer. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532932 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:06:00 +00:00
Andrew Wang e432b4fe5e HDFS-5360. Improvement of usage message of renameSnapshot and deleteSnapshot. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532930 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:59:51 +00:00
Jonathan Turner Eagles b838776163 HADOOP-9078. enhance unit-test coverage of class org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532928 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:42:12 +00:00
Colin McCabe 40c97caf19 add missing file for HDFS-5096
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532925 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:15:47 +00:00
Colin McCabe 3cc7a38a53 HDFS-5096. Automatically cache new data added to a cached path (contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532924 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:15:33 +00:00
Kihwal Lee a0fc90ea92 HDFS-5346. Avoid unnecessary call to getNumLiveDataNodes() for each block during IBR processing. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532915 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:14:28 +00:00
Arpit Agarwal a6076adbef Merging r1532877 through r1532910 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1532913 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:12:17 +00:00
Arpit Agarwal 168b133337 Merging r1527684 through r1532876 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1532910 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:07:28 +00:00
Suresh Srinivas dea1b2e84a HADOOP-10005. No need to check INFO severity level is enabled or not. Contributed by Jackie Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532907 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:00:07 +00:00
Suresh Srinivas f28f5ed628 HDFS-5370. Typo in Error Message: different between range in condition and range in error message. Contributed by Kousuke Saruta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532899 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:45:03 +00:00
Chris Nauroth 8da82eba1c HDFS-5373. hdfs cacheadmin -addDirective short usage does not mention -replication parameter. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532888 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:23:14 +00:00
Chris Nauroth 2cf5084c32 HDFS-5358: Add updated editsStored file for tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532863 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:58:38 +00:00
Tsz-wo Sze c46525ef27 Add TestOpenFilesWithSnapshot.java for HDFS-5283.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532860 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:44:21 +00:00
Tsz-wo Sze ffe347151e HDFS-5283. Under construction blocks only inside snapshots should not be counted in safemode threshhold. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532857 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:38:31 +00:00
Jing Zhao 2145486ea9 HDFS-5130. Add test for snapshot related FsShell and DFSAdmin commands. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532580 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 22:45:08 +00:00
Brandon Li a9befa6f0a HDFS-5330. fix readdir and readdirplus for large directories. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532539 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 21:23:00 +00:00
Tsz-wo Sze 0a5f0efcb4 HDFS-5338. Add a conf to disable hostname check in datanode registration.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532468 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 18:21:22 +00:00
Jing Zhao 258c181ade HDFS-5352. Server#initLog() doesn't close InputStream in httpfs. Contributed by Ted Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532158 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 01:17:21 +00:00
Andrew Wang af89caf9e4 HDFS-5359. Allow LightWeightGSet#Iterator to remove elements. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532153 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 00:19:48 +00:00
Andrew Wang efe545b0c2 HDFS-5358. Add replication field to PathBasedCacheDirective. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532124 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 22:56:11 +00:00
Colin McCabe 15d08c4778 HDFS-5349. DNA_CACHE and DNA_UNCACHE should be by blockId only (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532116 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 22:19:10 +00:00
Jing Zhao cf0cf0a691 HDFS-5342. Provide more information in the FSNamesystem JMX interfaces. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532090 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 20:56:37 +00:00
Chris Nauroth 11716cf390 HADOOP-10040. Revert svn propset for CRLF line endings on Windows files. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531977 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:01:33 +00:00
Brandon Li 7cd044b1aa HDFS-5329. Update FSNamesystem#getListing() to handle inode path in startAfter token. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531617 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 04:28:49 +00:00
Luke Lu 0840906699 Fix typo (HDFS-5276 -> HDFS-5267) in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531500 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 04:54:58 +00:00