Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,014 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

4269 Commits

Author SHA1 Message Date
Akira Ajisaka 700dacf8c4 HDFS-7597. DelegationTokenIdentifier should cache the TokenIdentifier to UGI mapping. Contributed by Daryn Sharp, Bob Hansen, and Xiao Chen. 
(cherry picked from commit d433b16ce6)
(cherry picked from commit ad50a64ded)
 2016-06-22 11:02:48 +09:00
Brahma Reddy Battula aa8f4cc48c HDFS-9530. ReservedSpace is not cleared for abandoned Blocks (Contributed by Brahma Reddy Battula) 
(cherry picked from commit f2ac132d6a)
(cherry picked from commit ee0f389ecd)
 2016-06-21 15:55:57 +05:30
Colin Patrick Mccabe 9b51420ea5 HDFS-10448. CacheManager#addInternal tracks bytesNeeded incorrectly when dealing with replication factors other than 1 (Yiqun Lin via cmccabe) 
(cherry picked from commit 46f1602e89)
(cherry picked from commit 4e11f33ccc)
 2016-06-20 18:32:00 -07:00
Jitendra Pandey 29c3ee9744 HDFS-10538. Remove AsyncDistributedFileSystem. Contributed by Xiaobing Zhou and Jitendra Pandey. 2016-06-20 18:05:32 -07:00
Jitendra Pandey 2f95d22b17 HADOOP-13291. Probing stats in DFSOpsCountStatistics/S3AStorageStatistics should be correctly implemented. Contributed by Mingliang Liu. 2016-06-20 16:31:54 -07:00
Ravi Prakash 588ea6d431 HDFS-10220. A large number of expired leases can make namenode unresponsive and cause failover (Nicolas Fraison via raviprak) 
(cherry picked from commit ae047655f4)
(cherry picked from commit 9c5f7f290e)
 2016-06-20 14:38:05 -07:00
Brahma Reddy Battula 9d27530c36 HDFS-10474. hftp copy fails when file name with Chinese+special char in branch-2 (Contributed by Brahma Reddy Battula) 
(cherry picked from commit 3f27f40503)
 2016-06-20 12:40:11 +05:30
Andrew Wang 3f2d2cd0a1 Fix hadoop-hdfs-native-client compilation on Windows. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 3ff0510ffd)
(cherry picked from commit 94759470b8)
 2016-06-17 15:55:43 -07:00
Kihwal Lee edd5373095 HDFS-10493. Add links to datanode web UI in namenode datanodes page. Contributed by Weiwei Yang. 
(cherry picked from commit 280069510b)
 2016-06-17 11:13:12 -05:00
Akira Ajisaka 242263c56d HADOOP-12943. Add -w -r options in dfs -test command. Contributed by Weiwei Yang. 
(cherry picked from commit 09e82acaf9)
(cherry picked from commit a36aa920f4)
 2016-06-17 16:21:31 +09:00
Colin Patrick Mccabe cc53ca8d69 HDFS-9466. TestShortCircuitCache#testDataXceiverCleansUpSlotsOnFailure is flaky (Wei-Chiu Chuang via cmccabe) 
(cherry picked from commit c7921c9bdd)
(cherry picked from commit 49c0d9b325)
 2016-06-16 13:53:55 -07:00
Arpit Agarwal 394dae17ac HDFS-10532. Typo in RollingUpgrade docs. (Contributed by Yiqun Lin) 2016-06-16 10:11:05 -07:00
Colin Patrick Mccabe ea2e7321d6 HDFS-10525. Fix NPE in CacheReplicationMonitor#rescanCachedBlockMap (Xiao Chen via cmccabe) 
(cherry picked from commit 2ca73445f5)
(cherry picked from commit 8280e3bcc2)
 2016-06-15 22:51:27 -07:00
Colin Patrick Mccabe ef08eb9031 HDFS-10505. OIV's ReverseXML processor should support ACLs (Surendra Singh Lilhore via cmccabe) 
(cherry picked from commit 2449db507d)
(cherry picked from commit 17301ab395)
 2016-06-15 22:44:41 -07:00
Akira Ajisaka b35c7cdd14 HADOOP-12892. fix/rewrite create-release. Contributed by Allen Wittenauer. 2016-06-16 14:06:08 +09:00
Ming Ma 03ed3f9b66 Revert "HDFS-9016. Display upgrade domain information in fsck. (mingma)" 
This reverts commit 68ab0aa9d0.
 2016-06-14 20:14:00 -07:00
Ming Ma 68ab0aa9d0 HDFS-9016. Display upgrade domain information in fsck. (mingma) 
(cherry picked from commit b7436f4468)
 2016-06-14 20:08:29 -07:00
Andrew Wang 56e29d2711 HDFS-10516. Fix bug when warming up EDEK cache of more than one encryption zone. Contributed by Xiao Chen. 
(cherry picked from commit 709a814fe0)
(cherry picked from commit ff4466fe15)
 2016-06-13 11:50:27 -07:00
Andrew Wang f583fa5f4e Remove redundant TestMiniDFSCluster.testDualClusters. Contributed by Jiayi Zhou. 
(cherry picked from commit 1ee9ea0026)
(cherry picked from commit 9319665461)
 2016-06-08 12:59:08 -07:00
Zhe Zhang 72addd8d5c HDFS-10458. getFileEncryptionInfo should return quickly for non-encrypted cluster. 
(cherry picked from commit 6de9213df1)
(cherry picked from commit 06e38c835d)
(cherry picked from commit 0499907466)
 2016-06-07 09:09:18 -07:00
Jason Lowe 738b67e9d3 HDFS-9580. TestComputeInvalidateWork#testDatanodeReRegistration failed due to unexpected number of invalidate blocks. Contributed by Wei-Chiu Chuang. 
Change-Id: I9411dfb1dd4605cbcc515ca3361218d35d7c5fe3
(cherry picked from commit 0087734cc1)

Conflicts:

	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2016-06-07 15:36:53 +00:00
Wangda Tan e91eba2f81 Revert "HDFS-10458. getFileEncryptionInfo should return quickly for non-encrypted cluster." 
This reverts commit 0274636529.
 2016-06-06 22:13:02 -07:00
Zhe Zhang 0274636529 HDFS-10458. getFileEncryptionInfo should return quickly for non-encrypted cluster. 
(cherry picked from commit 6de9213df1)
(cherry picked from commit 06e38c835d)
 2016-06-06 15:54:36 -07:00
Tsz-Wo Nicholas Sze 49535c0683 Revert "Revert "HADOOP-13226 Support async call retry and failover."" 
This reverts commit 886e239606.
 2016-06-06 16:54:02 +08:00
Tsz-Wo Nicholas Sze 359a316736 Revert "Revert "HDFS-10430. Reuse FileSystem#access in TestAsyncDFS. Contributed by Xiaobing Zhou."" 
This reverts commit f176311366.
 2016-06-06 16:53:56 +08:00
Tsz-Wo Nicholas Sze 025f62afcc Revert "Revert "HDFS-10431 Refactor and speedup TestAsyncDFSRename. Contributed by Xiaobing Zhou"" 
This reverts commit 0af02cfd37.
 2016-06-06 16:53:51 +08:00
Tsz-Wo Nicholas Sze 79beac49ec Revert "Revert "HDFS-10390. Implement asynchronous setAcl/getAclStatus for DistributedFileSystem. Contributed by Xiaobing Zhou"" 
This reverts commit 1de712f22a.
 2016-06-06 16:53:46 +08:00
Tsz-Wo Nicholas Sze c949001eee Revert "Revert "HADOOP-13168. Support Future.get with timeout in ipc async calls."" 
This reverts commit 308d28640d.
 2016-06-06 16:53:41 +08:00
Tsz-Wo Nicholas Sze 5b054b1bfc Revert "Revert "HDFS-10346. Implement asynchronous setPermission/setOwner for DistributedFileSystem. Contributed by Xiaobing Zhou"" 
This reverts commit ffa85f28a2.
 2016-06-06 16:53:36 +08:00
Tsz-Wo Nicholas Sze 8ccc8aeb6c Revert "Revert "HADOOP-12957. Limit the number of outstanding async calls. Contributed by Xiaobing Zhou"" 
This reverts commit 8a07026e77.
 2016-06-06 16:53:31 +08:00
Tsz-Wo Nicholas Sze 2cf663bb59 Revert "Revert "HDFS-10224. Implement asynchronous rename for DistributedFileSystem. Contributed by Xiaobing Zhou"" 
This reverts commit d740a90260.
 2016-06-06 16:53:24 +08:00
Andrew Wang d740a90260 Revert "HDFS-10224. Implement asynchronous rename for DistributedFileSystem. Contributed by Xiaobing Zhou" 
This reverts commit bdc45bef64.
 2016-06-03 18:17:33 -07:00
Andrew Wang 8a07026e77 Revert "HADOOP-12957. Limit the number of outstanding async calls. Contributed by Xiaobing Zhou" 
This reverts commit a1ba6eee38.
 2016-06-03 18:17:33 -07:00
Andrew Wang ffa85f28a2 Revert "HDFS-10346. Implement asynchronous setPermission/setOwner for DistributedFileSystem. Contributed by Xiaobing Zhou" 
This reverts commit ac04900450.
 2016-06-03 18:12:31 -07:00
Andrew Wang 308d28640d Revert "HADOOP-13168. Support Future.get with timeout in ipc async calls." 
This reverts commit fa7c7f2510.
 2016-06-03 18:12:31 -07:00
Andrew Wang 1de712f22a Revert "HDFS-10390. Implement asynchronous setAcl/getAclStatus for DistributedFileSystem. Contributed by Xiaobing Zhou" 
This reverts commit 339b803a52.
 2016-06-03 18:12:31 -07:00
Andrew Wang 0af02cfd37 Revert "HDFS-10431 Refactor and speedup TestAsyncDFSRename. Contributed by Xiaobing Zhou" 
This reverts commit 2e755a7f0e.
 2016-06-03 18:12:31 -07:00
Andrew Wang f176311366 Revert "HDFS-10430. Reuse FileSystem#access in TestAsyncDFS. Contributed by Xiaobing Zhou." 
This reverts commit de69b1da34.
 2016-06-03 18:12:30 -07:00
Andrew Wang 886e239606 Revert "HADOOP-13226 Support async call retry and failover." 
This reverts commit a8941d7790.
 2016-06-03 18:12:30 -07:00
Andrew Wang 6f69113417 HDFS-10481. HTTPFS server should correctly impersonate as end user to open file. Contributed by Xiao Chen. 
(cherry picked from commit 47e0321ee9)
(cherry picked from commit d5609e3499)
 2016-06-03 17:21:34 -07:00
Andrew Wang d712b2ee3b HADOOP-13155. Implement TokenRenewer to renew and cancel delegation tokens in KMS. Contributed by Xiao Chen. 
(cherry picked from commit 713cb71820)

 Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderDelegationTokenExtension.java
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java

(cherry picked from commit 03c4724c88)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java
 2016-06-03 17:03:40 -07:00
Akira Ajisaka d0dc5aaa2d HDFS-10341. Add a metric to expose the timeout number of pending replication blocks. (aajisaka) 
(cherry picked from commit b6d5546e24)
 2016-06-03 16:04:40 +09:00
Akira Ajisaka a8a2f4b500 HDFS-10471. DFSAdmin#SetQuotaCommand's help msg is not correct. Contributed by Yiqun Lin. 
(cherry picked from commit 1df6f5735c)
(cherry picked from commit cddf6b4fc7)
 2016-06-03 04:11:13 +09:00
Masatake Iwasaki 5b3d9ca0cd HDFS-10367. TestDFSShell.testMoveWithTargetPortEmpty fails with Address bind exception. Contributed by Brahma Reddy Battula. 
(cherry picked from commit aadb77e412)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java

(cherry picked from commit 3740974413)
 2016-06-02 21:04:48 +09:00
Akira Ajisaka fe4ad4a39c HDFS-9476. TestDFSUpgradeFromImage#testUpgradeFromRel1BBWImage occasionally fail. Contributed by Masatake Iwasaki. 
(cherry picked from commit 69555fca06)
(cherry picked from commit 3dd557e4b6)
 2016-06-02 18:53:42 +09:00
Colin Patrick Mccabe 6fe1c67fa1 HADOOP-13137. TraceAdmin should support Kerberized cluster (Wei-Chiu Chuang via cmccabe) 
(cherry picked from commit 8ceb06e239)
(cherry picked from commit a64e1425ed)
 2016-05-31 18:26:37 -07:00
Colin Patrick Mccabe 0d6a65a40a HDFS-10415. TestDistributedFileSystem#MyDistributedFileSystem attempts to set up statistics before initialize() is called (Mingliang Liu via cmccabe) 
(cherry picked from commit 14907d9b8c)
 2016-05-31 17:27:14 -07:00
Tsz-Wo Nicholas Sze a8941d7790 HADOOP-13226 Support async call retry and failover. 2016-05-31 17:16:44 -07:00
Chris Nauroth de69b1da34 HDFS-10430. Reuse FileSystem#access in TestAsyncDFS. Contributed by Xiaobing Zhou. 
(cherry picked from commit 21890c4239)
(cherry picked from commit 193f822b9a)
 2016-05-27 14:20:50 -07:00
Yongjun Zhang 3e4c7906c2 HDFS-10276. HDFS should not expose path info that user has no permission to see. (Yuanbo Liu via Yongjun Zhang) 
(cherry picked from commit 5ea6fd85c7)
 2016-05-27 10:18:47 -07:00
Tsz-Wo Nicholas Sze 2e755a7f0e HDFS-10431 Refactor and speedup TestAsyncDFSRename. Contributed by Xiaobing Zhou 2016-05-26 12:24:21 -07:00
Tsz-Wo Nicholas Sze 339b803a52 HDFS-10390. Implement asynchronous setAcl/getAclStatus for DistributedFileSystem. Contributed by Xiaobing Zhou 2016-05-26 12:23:05 -07:00
Tsz-Wo Nicholas Sze fa7c7f2510 HADOOP-13168. Support Future.get with timeout in ipc async calls. 2016-05-26 12:22:57 -07:00
Tsz-Wo Nicholas Sze ac04900450 HDFS-10346. Implement asynchronous setPermission/setOwner for DistributedFileSystem. Contributed by Xiaobing Zhou 2016-05-26 12:20:31 -07:00
Tsz-Wo Nicholas Sze f6dfb71762 HDFS-8057 Move BlockReader implementation to the client implementation package. Contributed by Takanobu Asanuma 2016-05-25 12:26:25 -07:00
Vinayakumar B 00011e6a98 HDFS-10217. show 'blockScheduled' tooltip in datanodes table. 
(cherry picked from commit 2dab64da2f)
(cherry picked from commit e28a51e988)
 2016-05-25 12:35:42 +05:30
Tsz-Wo Nicholas Sze 2ab789b19e HDFS-9365. Balaner does not work with the HDFS-6376 HA setup. 2016-05-24 13:11:32 -07:00
Masatake Iwasaki 1ab79e255c HDFS-10439. Update setOwner doc in HdfsPermissionsGuide. Contributed by John Zhuge. 
(cherry picked from commit 12eb5a7b11)
 2016-05-22 19:43:47 +09:00
Chris Nauroth 5b907a17ed HDFS-10438. When NameNode HA is configured to use the lifeline RPC server, it should log the address of that server. Contributed by Chris Nauroth. 
(cherry picked from commit 500e946729)
(cherry picked from commit e7b56cf93c)
 2016-05-20 13:02:06 -07:00
Chris Nauroth 877af3ec7e HDFS-10424. DatanodeLifelineProtocol not able to use under security cluster. Contributed by Chris Nauroth. 
(cherry picked from commit bcde1562d2)
(cherry picked from commit d38f2090fa)
 2016-05-20 12:50:23 -07:00
Kihwal Lee a81150ae9e HDFS-10417. Improve error message from checkBlockLocalPathAccess. Contributed by Tianyin Xu. 
(cherry picked from commit 204de430bf)
 2016-05-19 15:54:18 -05:00
Arpit Agarwal 01a0730996 HDFS-9926. MiniDFSCluster leaks dependency Mockito via DataNodeTestUtils. (Contributed by Josh Elser) 2016-05-18 09:25:33 -07:00
Xiaoyu Yao ccb1cade5b HDFS-10383. Safely close resources in DFSTestUtil. Contributed by Mingliang Liu. 2016-05-17 18:00:18 -07:00
Yongjun Zhang 2bcf1eb36a HDFS-10381, DataStreamer DataNode exclusion log message should be warning. (John Zhuge via Yongjun Zhang) 
(cherry picked from commit 16c07cc68a)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripedDataStreamer.java

(cherry picked from commit 456fe08a6d)
 2016-05-17 16:00:49 -07:00
Kihwal Lee 01de843a31 Revert "HDFS-10417. Improve error message from checkBlockLocalPathAccess. Contributed by Tianyin Xu." 
This reverts commit cb5a1edd1c.
 2016-05-17 15:21:41 -05:00
Kihwal Lee cb5a1edd1c HDFS-10417. Improve error message from checkBlockLocalPathAccess. Contributed by Tianyin Xu. 
(cherry picked from commit 0942954e8a)
 2016-05-17 15:11:40 -05:00
Kihwal Lee 362a778bf5 HDFS-10303. DataStreamer#ResponseProcessor calculates packet ack latency incorrectly. Contributed by Surendra Singh Lilhore. 
(cherry picked from commit 4a5819dae2)
 2016-05-17 09:00:59 -05:00
Akira Ajisaka 388b2010ae HDFS-10242. Cannot create space quota of zero. Contributed by Takashi Ohnishi. 
(cherry picked from commit 9fe5828f05)
(cherry picked from commit 7f03c1c90e)
 2016-05-17 15:56:36 +09:00
Andrew Wang 29ed65ff9b HDFS-10333. Intermittent org.apache.hadoop.hdfs.TestFileAppend failure in trunk. Contributed by Yiqun Lin. 
(cherry picked from commit 45788204ae)
(cherry picked from commit 413f3dabbd)
 2016-05-15 22:15:18 -07:00
Colin Patrick Mccabe 5f04795aed HADOOP-13065. Add a new interface for retrieving FS and FC Statistics (Mingliang Liu via cmccabe) 
(cherry picked from commit 687233f20d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java

(cherry picked from commit 15bfcde238)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
 2016-05-11 14:24:51 -07:00
Colin Patrick Mccabe 154332bb54 HDFS-10377. CacheReplicationMonitor shutdown log message should use INFO level (Yiqun Lin via cmccabe) 
(cherry picked from commit f0252ad252)
(cherry picked from commit 43f32d3f4a)
 2016-05-10 11:21:16 -07:00
Akira Ajisaka a84c4d7d4b HDFS-6187. Update the document of hftp/hsftp in branch-2 to mention that they are deprecated. Contributed by Gergely Novák. 
(cherry picked from commit 901588542b)
 2016-05-10 09:33:55 -07:00
Akira Ajisaka 1622fc1373 Revert "HDFS-6187. Update the document of hftp/hsftp in branch-2 to mention that they are deprecated." 
This reverts commit f25dcb935e.
 2016-05-10 09:33:18 -07:00
Akira Ajisaka f25dcb935e HDFS-6187. Update the document of hftp/hsftp in branch-2 to mention that they are deprecated. 
(cherry picked from commit c297df5995)
 2016-05-10 09:29:47 -07:00
Kihwal Lee d7cda6d031 HDFS-10372. Fix for failing TestFsDatasetImpl#testCleanShutdownOfVolume. Contributed by Rushabh Shah. 
(cherry picked from commit b9e5a32fa1)
 2016-05-09 15:52:12 -05:00
Masatake Iwasaki c80b47e73f HDFS-2043. TestHFlush failing intermittently. Contributed by Lin Yiqun. 
(cherry picked from commit 2835f146b5)
 2016-05-06 15:50:48 +09:00
Xiaoyu Yao 59eeee7501 HDFS-10324. Trash directory in an encryption zone should be pre-created with correct permissions. Contributed by Wei-Chiu Chuang. 
(cherry picked from commit dacd1f50fe)
(cherry picked from commit 35859872b7)
 2016-05-05 18:23:00 -07:00
Ming Ma d6e95ae47b HDFS-10320. Rack failures may result in NN terminate. (Xiao Chen via mingma) 
(cherry picked from commit 1268cf5fbe)
 2016-05-04 17:07:36 -07:00
Arpit Agarwal ce94203566 HDFS-9902. Support different values of dfs.datanode.du.reserved per storage type. (Contributed by Brahma Reddy Battula) 2016-05-03 16:53:07 -07:00
Xiaoyu Yao 5dfcfb2d2d HDFS-10344. DistributedFileSystem#getTrashRoots should skip encryption zone that does not have .Trash. Contributed by Xiaoyu Yao. 
(cherry picked from commit 45a753ccf7)
 2016-05-02 19:50:10 -07:00
Xiaoyu Yao 643d2fd3c1 HADOOP-12985. Support MetricsSource interface for DecayRpcScheduler Metrics. Contributed by Xiaoyu Yao. 
(cherry picked from commit 5bd7b592e5)
(cherry picked from commit a2a65922dd)
 2016-05-02 19:38:03 -07:00
Harsh J cf6efccebb HDFS-2580. NameNode#main(...) can make use of GenericOptionsParser. Contributed by harsh. (harsh) 
(cherry picked from commit 54e612bfb9)
 2016-05-02 17:53:10 -07:00
Tsz-Wo Nicholas Sze a1ba6eee38 HADOOP-12957. Limit the number of outstanding async calls. Contributed by Xiaobing Zhou 2016-05-02 11:34:59 -07:00
Tsz-Wo Nicholas Sze bdc45bef64 HDFS-10224. Implement asynchronous rename for DistributedFileSystem. Contributed by Xiaobing Zhou 2016-05-02 11:34:22 -07:00
Lei Xu 5477c31c5c HDFS-3702. Add an option for NOT writing the blocks locally if there is a datanode on the same box as the client. (Contributed by Lei (Eddy) Xu) 
(cherry picked from commit 0a152103f1)
(cherry picked from commit 4289cb8b36)
 2016-05-02 10:21:59 -07:00
Kihwal Lee e9cd88d484 HDFS-10347. Namenode report bad block method doesn't log the bad block or datanode. Contributed by Rushabh Shah. 
(cherry picked from commit 7da540d03e)
 2016-04-29 15:58:45 -05:00
Tsz-Wo Nicholas Sze 31ed34c982 HDFS-10335 Mover$Processor#chooseTarget() always chooses the first matching target storage group. Contributed by Mingliang Liu 2016-04-29 11:27:14 -07:00
Kihwal Lee a4db3729be HDFS-10260. TestFsDatasetImpl#testCleanShutdownOfVolume often fails. Contributed by Rushabh Shah. 
(cherry picked from commit af9b000535)
 2016-04-29 10:05:58 -05:00
Andrew Wang bdb0e98483 HDFS-10297. Increase default balance bandwidth and concurrent moves. Contributed by John Zhuge. 2016-04-27 17:03:36 -07:00
Kihwal Lee dd7c9f5b8f HDFS-10330. Add Corrupt Blocks Information in Metasave output. Contributed by Kuhu Shukla. 
(cherry picked from commit e181092b86)
 2016-04-27 08:30:29 -05:00
Kihwal Lee 621be60592 HDFS-10329. Bad initialisation of StringBuffer in RequestHedgingProxyProvider. Contributed by Lin Yiqun. 
(cherry picked from commit c6a2430b47)
 2016-04-26 11:47:15 -05:00
Kihwal Lee 973c73aa68 HDFS-10318. TestJMXGet hides the real error in case of test failure. Contributed by Andras Bokor. 
(cherry picked from commit 10f0f7851a)
 2016-04-25 11:42:17 -05:00
Masatake Iwasaki c4d8090b72 HDFS-9905. WebHdfsFileSystem#runWithRetry should display original stack trace on error. (Wei-Chiu Chuang via iwasakims) 
(cherry picked from commit 6fcde2e38d)
 2016-04-23 23:55:27 +09:00
Kihwal Lee 3d3ed9b68e HDFS-9555. LazyPersistFileScrubber should still sleep if there are errors in the clear progress. Contributed by Phil Yang. 
(cherry picked from commit 5d4255a801)
 2016-04-22 11:10:36 -05:00
Tsz-Wo Nicholas Sze 60c68c65c1 HDFS-10309 Balancer doesn't honor dfs.blocksize value defined with suffix k(kilo), m(mega), g(giga). Contributed by Amit Anand 2016-04-21 15:45:36 -07:00
Tsz-Wo Nicholas Sze 704c57e3eb HDFS-10319. Balancer should not try to pair storages with different types. 2016-04-21 15:25:49 -07:00
Chris Nauroth 7fb1cfc591 HDFS-10312. Large block reports may fail to decode at NameNode due to 64 MB protobuf maximum length restriction. Contributed by Chris Nauroth. 
(cherry picked from commit 63ac2db59a)
(cherry picked from commit cc56bed686)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImplTestUtils.java
 2016-04-20 14:00:06 -07:00
Colin Patrick Mccabe e2968f5da2 HDFS-10308. TestRetryCacheWithHA#testRetryCacheOnStandbyNN failing (Rakesh R via cmccabe) 
(cherry picked from commit ad36fa6f42)
(cherry picked from commit 76d963acb4)
 2016-04-20 11:52:49 -07:00
Arpit Agarwal a13628fe4a HDFS-10264. Logging improvements in FSImageFormatProtobuf.Saver. (Contributed by Xiaobing Zhou) 2016-04-19 11:27:46 -07:00
Walter Su 1860b8ceb5 HDFS-9744. TestDirectoryScanner#testThrottling occasionally time out after 300 seconds. Contributed by Lin Yiqun. 
(cherry picked from commit 90d1af1416)
 2016-04-19 18:56:23 +08:00
Colin Patrick Mccabe e1d9e5ab82 HDFS-10265. OEV tool fails to read edit xml file if OP_UPDATE_BLOCKS has no BLOCK tag (Wan Chang via cmccabe) 
(cherry picked from commit cb3ca460ef)
(cherry picked from commit a69b6b1e8b)
 2016-04-18 13:49:05 -07:00
Kihwal Lee 7ac2e5ec7b HDFS-10302. BlockPlacementPolicyDefault should use default replication considerload value. Contributed by Lin Yiqun. 
(cherry picked from commit d8b729e16f)
 2016-04-18 08:01:17 -05:00
Walter Su 09ffc65d94 HDFS-10275. TestDataNodeMetrics failing intermittently due to TotalWriteTime counted incorrectly. Contributed by Lin Yiqun. 
(cherry picked from commit ab903029a9)
 2016-04-18 20:32:36 +08:00
Steve Loughran e9699aa443 HDFS-10291 TestShortCircuitLocalRead failing (stevel) 2016-04-18 10:26:35 +01:00
Walter Su 7f47d984fa HDFS-9412. getBlocks occupies FSLock and takes too long to complete. Contributed by He Tianyi. 
(cherry picked from commit 67523ffcf4)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetBlocks.java

(cherry picked from commit a6d0e9e56a)
 2016-04-18 09:39:46 +08:00
Kihwal Lee 8b1e7842e3 HDFS-10281. TestPendingCorruptDnMessages fails intermittently. Contributed by Mingliang Liu. 
(cherry picked from commit b9c9d03591)
 2016-04-14 15:30:59 -05:00
Kihwal Lee 7dd8798933 HDFS-10292. Add block id when client got Unable to close file exception. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 2c155afe27)
 2016-04-14 14:26:59 -05:00
Kihwal Lee 019ca8f7c1 HDFS-10280. Document new dfsadmin command -evictWriters. Contributed by Wei-Chiu Chuang. 
(cherry picked from commit c970f1d005)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HDFSCommands.md
 2016-04-14 12:50:36 -05:00
Andrew Wang 1dee3e1200 HDFS-10279. Improve validation of the configured number of tolerated failed volumes. Contributed by Lin Yiqun. 
(cherry picked from commit 314aa21a89)
(cherry picked from commit 4c18f54c1d)
 2016-04-13 16:40:08 -07:00
Kihwal Lee ccaf746eea HDFS-10270. TestJMXGet:testNameNode() fails. Contributed by Gergely Novák 
(cherry picked from commit d2f3bbc290)
 2016-04-13 11:24:45 -05:00
Walter Su f3dbabb13a HDFS-9772. TestBlockReplacement#testThrottler doesn't work as expected. Contributed by Lin Yiqun. 
(cherry picked from commit 903428bf94)
 2016-04-13 17:50:47 +08:00
Colin Patrick Mccabe 59b0661c7f HADOOP-12973. Make DU pluggable. (Elliott Clark via cmccabe) 
(cherry picked from commit 35f0770555)
(cherry picked from commit 2b0b332e2f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
 2016-04-12 16:30:58 -07:00
Vinayakumar B b804b20843 HDFS-10271. Extra bytes are getting released from reservedSpace for append (Contributed by Brahma Reddy Battula) 
(cherry picked from commit a9a607f8fc)
(cherry picked from commit 04621537c9)
 2016-04-12 11:47:01 +05:30
Akira Ajisaka e2b8bdbe0a HDFS-10277. PositionedReadable test testReadFullyZeroByteFile failing in HDFS. Contributed by Steve Loughran. 
(cherry picked from commit a409508b3f)
(cherry picked from commit 8f968171bd)
 2016-04-12 14:55:42 +09:00
Chris Nauroth 1b5b85e560 HADOOP-12994. Specify PositionedReadable, add contract tests, fix problems. Contributed by Steve Loughran. 
(cherry picked from commit 843ee8d59d)
(cherry picked from commit 26a23eff82)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
 2016-04-08 13:44:27 -07:00
Tsz-Wo Nicholas Sze f872d519db HDFS-10186. DirectoryScanner: Improve logs by adding full path of both actual and expected block directories. Contributed by Rakesh R 2016-04-07 12:42:27 +08:00
Colin Patrick Mccabe 354801fe61 HDFS-10267. Extra "synchronized" on FsDatasetImpl#recoverAppend and FsDatasetImpl#recoverClose 
(cherry picked from commit 4bd7cbc29d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java

(cherry picked from commit b5e6ad457f)
 2016-04-06 21:11:48 -07:00
Eric Payne 497c65ad0c HDFS-9945. Datanode command for evicting writers. Contributed by Kihwal Lee 
(cherry picked from commit aede8c10ec)
 2016-04-06 20:33:40 +00:00
Colin Patrick Mccabe 8514ab8cb5 HDFS-6520. hdfs fsck passes invalid length value when creating BlockReader (Xiao Chen via cmccabe) 
(cherry picked from commit 188f65287d)
(cherry picked from commit 387d3f25c1)
 2016-04-06 11:38:19 -07:00
Akira Ajisaka e426d1bb3f HADOOP-12022. fix site -Pdocs -Pdist in hadoop-project-dist; cleanout remaining forrest bits. Contributed by Allen Wittenauer. 
(cherry picked from commit 1371f993a9)
 2016-04-06 17:44:54 +09:00
Kihwal Lee 8bb4655649 HDFS-10261. TestBookKeeperHACheckpoints doesn't handle ephemeral HTTP ports. Contributed by Eric Badger. 
(cherry picked from commit 9ba1e5af06)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperHACheckpoints.java

(cherry picked from commit 6e37c5fe80)
 2016-04-05 16:54:46 -05:00
Ravi Prakash 7286c435c4 HDFS-10235. Last contact for Live Nodes should be relative time. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 0cd320a846)
 2016-04-05 13:43:08 -07:00
Masatake Iwasaki 886273e123 HADOOP-12672. RPC timeout should not override IPC ping interval (iwasakims) 
(cherry picked from commit 85ec5573eb)
 2016-04-06 03:29:49 +09:00
Kihwal Lee f9764d073f HDFS-10239. Fsshell mv fails if port usage doesn't match in src and destination paths. Contributed by Kuhu Shukla. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java

(cherry picked from commit ef3da82357)
 2016-04-05 09:16:51 -05:00
Vinayakumar B 3deeb9a15f HDFS-9917. IBR accumulate more objects when SNN was down for sometime. (Contributed by Brahma Reddy Battula) 
(cherry picked from commit 818d6b799e)
(cherry picked from commit ad08114b92)
 2016-04-05 09:54:50 +08:00
Colin Patrick Mccabe 63fe2ae72c HDFS-8496. Calling stopWriter() with FSDatasetImpl lock held may block other threads (cmccabe) 
(cherry picked from commit f6b1a81812)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java

(cherry picked from commit d55af8b5a3)
 2016-04-04 18:07:21 -07:00
Kihwal Lee 7d671cad3f HDFS-10178. Permanent write failures can happen if pipeline recoveries occur for the first packet. Contributed by Kihwal Lee. 
(cherry picked from commit a7d1fb0cd2)
 2016-04-04 16:41:23 -05:00
Masatake Iwasaki 97cda4077a HDFS-9599. TestDecommissioningStatus.testDecommissionStatus occasionally fails (Lin Yiqun via iwasakims) 
(cherry picked from commit 154d2532cf)
 2016-04-05 03:44:12 +09:00
Vinayakumar B bafcb584a8 HDFS-10253. Fix TestRefreshCallQueue failure (Contributed by Xiaoyu Yao) 
(cherry picked from commit 54b2e78fd2)
(cherry picked from commit aa38748997)
 2016-04-03 13:28:52 +05:30
Akira Ajisaka 3892efd3fb HDFS-10221. Add .json to the rat exclusions. Contributed by Ming Ma. 
(cherry picked from commit 32c0c3ecdf)
(cherry picked from commit 0795ee687b)
 2016-03-31 09:06:48 +09:00
Colin Patrick Mccabe 5cf55c5fb6 HDFS-10223. peerFromSocketAndKey performs SASL exchange before setting connection timeouts (cmccabe) 
(cherry picked from commit 37e23ce45c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/ErasureCodingWorker.java

(cherry picked from commit be5894c12d)
 2016-03-30 13:45:05 -07:00
Vinayakumar B def143e1e1 HDFS-5177. blocksScheduled count should be decremented for abandoned blocks (Contributed by Vinayakumar B) 
(cherry picked from commit 09d63d5a19)
(cherry picked from commit 0852e44110)
 2016-03-30 14:23:56 +08:00
Arpit Agarwal bfe657e83a HDFS-10228. TestHDFSCLI fails. (Contributed by Akira AJISAKA) 2016-03-29 13:56:12 -07:00
Andrew Wang 026b84bf70 HDFS-10197. TestFsDatasetCache failing intermittently due to timeout. Contributed by Lin Yiqun. 
(cherry picked from commit f2aec4eb82)
(cherry picked from commit 1d79b57c14)
 2016-03-29 11:55:04 -07:00
Vinayakumar B 88b56cdfaa HDFS-9871. "Bytes Being Moved" -ve(-1 B) when cluster was already balanced. (Contributed by Brahma Reddy Battulla) 
(cherry picked from commit 1f004b3367)
(cherry picked from commit f74364e8b9)
 2016-03-29 11:31:18 +08:00
Walter Su d71843558b HDFS-10182. Hedged read might overwrite user's buf. Contributed by zhouyingchao. 
(cherry picked from commit d8383c687c)
 2016-03-28 15:45:40 +08:00
Andrew Wang d4aeddee31 HDFS-10200. Docs for WebHDFS still describe GETDELEGATIONTOKENS operation. Contributed by Wellington Chevreuil. 
(cherry picked from commit 8f85e5d212)
(cherry picked from commit c658deabb6)
 2016-03-23 12:56:17 -07:00
Colin Patrick Mccabe 4ca13e7b98 HDFS-10193. fuse_dfs segfaults if uid cannot be resolved to a username (John Thiltges via cmccabe) 
(cherry picked from commit 0d19a0ce98)
(cherry picked from commit 7ad3162df4)
 2016-03-23 11:20:12 -07:00
Colin Patrick Mccabe 31843df277 HDFS-10189. PacketResponder#toString should include the downstreams for PacketResponderType.HAS_DOWNSTREAM_IN_PIPELINE (Joe Pallas via cmccabe) 
(cherry picked from commit a7d8f2b396)
(cherry picked from commit a68a9eb2b1)
 2016-03-22 17:22:15 -07:00
Colin Patrick Mccabe 29872506bc HDFS-9951. Use string constants for XML tags in OfflineImageReconstructor (Lin Yiqun via cmccabe) 
(cherry picked from commit 680716f31e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java

(cherry picked from commit 2ce24bf218)
 2016-03-21 11:49:19 -07:00
Andrew Wang ea44650a64 HDFS-9405. Warmup NameNode EDEK caches in background thread. Contributed by Xiao Chen. 
(cherry picked from commit e3bb38d625)
(cherry picked from commit e826d860a7)
 2016-03-21 11:40:26 -07:00
Haohui Mai 57fed702f1 HDFS-7166. SbNN Web UI shows #Under replicated blocks and #pending deletion blocks. Contributed by Wei-Chiu Chuang. 2016-03-20 17:22:09 -07:00
Akira Ajisaka 2fe4225051 HDFS-3677. dfs.namenode.edits.dir.required is missing from hdfs-default.xml. Contributed by Mark Yang. 
(cherry picked from commit 414f33126ac178a44146666cc7c00059cfc9cabf)
(cherry picked from commit 41621a994d)
 2016-03-19 01:11:06 +09:00
Kihwal Lee 242c7f1fee HDFS-9874. Long living DataXceiver threads cause volume shutdown to block. Contributed by Rushabh Shah. 
(cherry picked from commit 63c966a3fb)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2016-03-18 10:33:13 -05:00
Colin Patrick Mccabe 73b5a44b0e HDFS-9949. Add a test case to ensure that the DataNode does not regenerate its UUID when a storage directory is cleared (Harsh J via cmccabe) 
(cherry picked from commit dc951e606f)
(cherry picked from commit f69a6c3632)
 2016-03-17 10:43:07 -07:00
Kihwal Lee fce39557d3 HDFS-9904. testCheckpointCancellationDuringUpload occasionally fails. Contributed by Lin Yiqun. 
(cherry picked from commit d457401784)
 2016-03-15 10:55:10 -05:00
Ravi Prakash 9e804d14c9 HDFS-9953. Download File from UI broken after pagination. Contributed by Brahma Reddy Battula 
(cherry picked from commit 51b7d8935a)
 2016-03-14 14:33:29 -07:00
Chris Nauroth e6c6f4ddac HDFS-9941. Do not log StandbyException on NN, other minor logging fixes. Contributed by Arpit Agarwal. 
(cherry picked from commit 5644137ada)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockUnderConstructionFeature.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java

(cherry picked from commit dd462bc32f)
 2016-03-14 09:55:34 -07:00
Colin Patrick Mccabe a1f110a145 HDFS-9933. ReverseXML should be capitalized in oiv usage message (cmccabe) 
(cherry picked from commit 79961ecea8)
(cherry picked from commit 710811652c)
 2016-03-10 13:45:24 -08:00
Colin Patrick Mccabe 56462678f9 HDFS-9934. ReverseXML oiv processor should bail out if the XML file's layoutVersion doesn't match oiv's (cmccabe) 
(cherry picked from commit bd49354c6d)
(cherry picked from commit c82d1e1187)
 2016-03-10 13:44:33 -08:00
Colin Patrick Mccabe 370a956196 HDFS-9927. Document the new OIV ReverseXML processor (Wei-Chiu Chuang via cmccabe) 
(cherry picked from commit 500875dfcc)
(cherry picked from commit b8b580e6b8)
 2016-03-10 13:39:43 -08:00
Colin Patrick Mccabe 56ab796094 HDFS-9835. OIV: add ReverseXML processor which reconstructs an fsimage from an XML file (cmccabe) 
(cherry picked from commit 700b0e4019)
(cherry picked from commit 5998b20d63)
 2016-03-09 16:38:15 -08:00
Allen Wittenauer 8b4a8ff1b2 Revert "HADOOP-12366. expose calculated paths (aw)" 
This reverts commit 81a7ad45c9.
 2016-03-09 09:59:33 -08:00
Chris Nauroth a3cd43990c HADOOP-12905. Clean up CHANGES.txt RAT exclusions from pom.xml files. Contributed by Chris Nauroth. 
(cherry picked from commit 89b16d27e2)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/pom.xml
	hadoop-mapreduce-project/pom.xml

(cherry picked from commit 38a031ce68)
 2016-03-08 21:23:07 -08:00
Arpit Agarwal a63f1039f9 HDFS-9882. Add heartbeatsTotal in Datanode metrics. (Contributed by Hua Liu) 2016-03-07 21:10:42 -08:00
Akira Ajisaka d84d54e26c HDFS-9812. Streamer threads leak if failure happens when closing DFSOutputStream. Contributed by Lin Yiqun. 
(cherry picked from commit 352d299cf8)
(cherry picked from commit fe0009a2bd)
 2016-03-08 10:57:56 +09:00
Arpit Agarwal 02949b2151 HDFS-9906. Remove spammy log spew when a datanode is restarted. (Contributed by Brahma Reddy Battula) 2016-03-07 12:20:32 -08:00
Masatake Iwasaki 22f7730940 HDFS-9865. TestBlockReplacement fails intermittently in trunk (Lin Yiqun via iwasakims) 
(cherry picked from commit d718fc1ee5)
 2016-03-08 02:11:54 +09:00
Chris Nauroth d5134dadbc HDFS-9239. DataNode Lifeline Protocol: an alternative protocol for reporting DataNode liveness. Contributed by Chris Nauroth. 
(cherry picked from commit 2759689d7d)
(cherry picked from commit 592f161e13)
 2016-03-04 15:30:37 -08:00
Yongjun Zhang fb6661f3bd HDFS-9889. Update balancer/mover document about HDFS-6133 feature. Contributed by Yongjun Zhang. 
(cherry picked from commit 8e08861a14)
 2016-03-04 13:28:28 -08:00
Masatake Iwasaki 9d551a3adf HADOOP-12470. In-page TOC of documentation should be automatically generated by doxia macro (iwasakims) 
(cherry picked from commit cbd31328a6)

 Conflicts:
	hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
	hadoop-common-project/hadoop-common/src/site/markdown/UnixShellGuide.md

(cherry picked from commit 722182fdfb)
 2016-03-04 14:13:30 +09:00
Andrew Wang c6e37f6782 HADOOP-11792. Remove all of the CHANGES.txt files. 2016-03-03 21:03:13 -08:00
Masatake Iwasaki 55f7ceb0db HDFS-9048. DistCp documentation is out-of-dated (Daisuke Kobayashi via iwasakims) 
(cherry picked from commit 33a412e8a4)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2016-03-03 18:58:59 +09:00
Masatake Iwasaki 64213b5278 HADOOP-12793. Write a new group mapping service guide (Wei-Chiu Chuang via iwasakims) 
(cherry picked from commit f70e317ccc)
 2016-03-03 17:15:09 +09:00
Zhe Zhang 7dfe40a23b HDFS-9886. Configuration properties for hedged read is broken. Contributed by Akira AJISAKA. 2016-03-02 10:27:51 -08:00
Xiaoyu Yao 7b9a2bf278 HDFS-9887. WebHdfs socket timeouts should be configurable. Contributed by Austin Donnelly and Chris Douglas. 
(cherry picked from commit 5abf051249)
 2016-03-02 09:25:25 -08:00
Akira Ajisaka e3d5863677 HDFS-9851. NameNode throws NPE when setPermission is called on a path that does not exist. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 27e0681f28)
(cherry picked from commit 463ec6fa8c)
 2016-03-02 14:44:04 +09:00
Akira Ajisaka b13bd04100 HDFS-9766. TestDataNodeMetrics#testDataNodeTimeSpend fails intermittently. Contributed by Xiao Chen. 
(cherry picked from commit 81fbc40f084eab85750cc7d4cc967d43d70d8333)
(cherry picked from commit e840141726)
 2016-03-02 14:14:52 +09:00
Andrew Wang 90f39b899c HDFS-9881. DistributedFileSystem#getTrashRoot returns incorrect path for encryption zones. 
(cherry picked from commit 4abb2fa687)
(cherry picked from commit 81b7b9de27)
 2016-03-01 16:35:46 -08:00
Kihwal Lee 2c8733a19d HDFS-9880. TestDatanodeRegistration fails occasionally. Contributed by Kihwal Lee. 
(cherry picked from commit e76b13c415)
 2016-03-01 17:02:08 -06:00
Kihwal Lee cc28118eed HDFS-8791. block ID-based DN storage layout can be very slow for datanode on ext4. Contributed by Chris Trezzo. 
(cherry picked from commit b8dbffbef87c0ee0bee5e17649586fc9f0e1f55b)
 2016-03-01 15:02:26 -06:00
Chris Nauroth 79ef70f861 HDFS-9870. Remove unused imports from DFSUtil. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 2137e8feeb)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit 6659d13f12)
 2016-03-01 11:16:29 -08:00
Akira Ajisaka 7ddff4b37a HDFS-9864. Correct reference for RENEWDELEGATIONTOKEN and CANCELDELEGATIONTOKEN in webhdfs doc. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 056f9013122dc3f0effc62d620261c312dd7f8ed)
(cherry picked from commit 6a9f8d95b7c4f9c66253d975ebbca1d186267d4e)
 2016-02-29 18:42:48 +09:00
Tsz-Wo Nicholas Sze 5b95971f8a HDFS-9710. DN can be configured to send block receipt IBRs in batches. 2016-02-26 15:34:41 -08:00
Xiaoyu Yao fd9a0abba9 HDFS-9831. Document webhdfs retry configuration keys introduced by HDFS-5219/HDFS-5122. Contributed by Xiaobing Zhou. 
(cherry picked from commit 1513c0179e)
 2016-02-26 14:26:40 -08:00
Kihwal Lee e862fe7f02 HDFS-9855. Modify TestAuditLoggerWithCommands to workaround the absence of HDFS-8332. Contributed by Kuhu Shukla. 
(cherry picked from commit 03afcdd39d)
 2016-02-26 10:23:45 -06:00
Chris Nauroth 27edd164a0 HDFS-9843. Document distcp options required for copying between encrypted locations. Contributed by Xiaoyu Yao. 
(cherry picked from commit dbbfc58c33)
(cherry picked from commit 4892f6a0eb)
 2016-02-24 15:16:27 -08:00
cnauroth d5dfb278d6 HDFS-9854. Log cipher suite negotiation more verbosely. Contributed by Wei-Chiu Chuang. 
(cherry picked from commit d1dd248b75)
(cherry picked from commit 59cd23e279)
 2016-02-24 12:18:23 -08:00
Kihwal Lee 69acab5f23 HDFS-9395. Make HDFS audit logging consistant. Contributed by Kuhu Shukla. 
(cherry picked from commit d27d7fc72e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

(cherry picked from commit 83f7f62be3)
 2016-02-24 12:12:41 -06:00
Zhe Zhang bab4fb55c9 HDFS-9844. Correct path creation in getTrashRoot to handle root dir. 
Change-Id: I5afe6c7176063892e3e632698c849bd9f4b92906
 2016-02-23 13:30:47 -08:00
Colin Patrick Mccabe 7812cfdd81 HDFS-9549. TestCacheDirectives#testExceedsCapacity is flaky (Xiao Chen via cmccabe) 
(cherry picked from commit 211c78c090)
(cherry picked from commit 440379a0d4)
 2016-02-23 12:06:16 -08:00
Tsuyoshi Ozawa 19a08eff6f HDFS-9084. Pagination, sorting and filtering of files/directories in the HDFS Web UI. (Contributed by Ravi Prakash) 
(cherry picked from commit 48c61cd6aa)
 2016-02-23 19:31:33 +09:00
Tsz-Wo Nicholas Sze 82cd1580d0 HDFS-8578. On upgrade, Datanode should process all storage/data dirs in parallel. Contributed by vinayakumarb and szetszwo 2016-02-22 15:16:59 -08:00
Zhe Zhang 6d4a4e785b HADOOP-12668. Support excluding weak Ciphers in HttpServer2 through ssl-server.conf. Contributed by Vijay Singh. 
Change-Id: Ie46a5427d29188935427f67e55203c19fcd83335
 2016-02-22 14:15:11 -08:00
Arpit Agarwal 08666fb87e HDFS-9842. dfs.datanode.balance.bandwidthPerSec should accept friendly size units. (Contributed by Lin Yiqun) 2016-02-22 11:34:26 -08:00
Vinayakumar B 426f213088 HDFS-9425. Expose number of blocks per volume as a metric (Contributed by Brahma Reddy Battula) 
(cherry picked from commit 342c9572bf)
(cherry picked from commit 2e3c35a835)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
 2016-02-22 09:31:52 +05:30
Vinayakumar B 8ca8d218a4 HDFS-7452. skip StandbyException log for getCorruptFiles() (Contributed by Bramha Reddy Battula) 
(cherry picked from commit f313516731)
(cherry picked from commit 3e76768f21)
 2016-02-22 09:22:45 +05:30
Arpit Agarwal 4823fbb490 HDFS-9839. Reduce verbosity of processReport logging. (Contributed by Arpit Agarwal) 
This closes #78
 2016-02-20 23:20:28 -08:00
Yongjun Zhang 5a5f9ca1f0 HDFS-9764. DistCp doesn't print value for several arguments including -numListstatusThreads. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit ba1c9d484a)
 2016-02-19 10:29:46 -08:00
Tsz-Wo Nicholas Sze b30d71d450 Move HDFS-8923 to Release 2.8.0 in CHANGES.txt. 2016-02-18 18:44:23 -08:00
Tsz-Wo Nicholas Sze 11c6930a17 HDFS-8923. Add -source flag to balancer usage message. Contributed by Chris Trezzo 2016-02-18 18:39:45 -08:00
Tsz-Wo Nicholas Sze 207ed9601f HADOOP-10865. Add a Crc32 chunked verification benchmark for both directly and non-directly buffer cases. 2016-02-18 11:59:58 -08:00
Kihwal Lee bb8079e553 HDFS-4946. Allow preferLocalNode in BlockPlacementPolicyDefault to be configurable. Contributed by James Kinley and Nathan Roberts. 
(cherry picked from commit ba6d5ed955)
 2016-02-18 13:28:17 -06:00
cnauroth e5c8a34446 HDFS-9711. Integrate CSRF prevention filter in WebHDFS. Contributed by Chris Nauroth. 
(cherry picked from commit 5d1889a66d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java

(cherry picked from commit 779a69e28d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
 2016-02-18 10:16:06 -08:00
Akira Ajisaka a06036bb1e HDFS-6832. Fix the usage of 'hdfs namenode' command. Contributed by Manjunath Ballur. 
(cherry picked from commit e78d8e66f7)
(cherry picked from commit c183f235f1)
 2016-02-19 01:35:56 +09:00
Xiaoyu Yao 5ff2012f64 HDFS-8855. Webhdfs client leaks active NameNode connections. Contributed by Xiaobing Zhou. 
(cherry picked from commit fe5624b85d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java

(cherry picked from commit ad4fcd1f9f)
 2016-02-17 16:05:24 -08:00
Zhe Zhang 64d39b83cc HDFS-9799. Reimplement getCurrentTrashDir to remove incompatibility. (zhz) 
Change-Id: I7834bcebffed38cb384db5395ddb8b6dd9e79a0b
 2016-02-17 13:32:18 -08:00
Haohui Mai b318429ac9 HDFS-9815. Move o.a.h.fs.Hdfs to hadoop-hdfs-client. Contributed by Vinayakumar B. 2016-02-17 10:59:50 -08:00
Junping Du c7be3deff7 HDFS-9456. BlockPlacementPolicyWithNodeGroup should override verifyBlockPlacement(). Contributed by Xiaobing Zhou. 
(cherry picked from commit 77ba5add0d)
(cherry picked from commit 6874a142d8)
 2016-02-16 19:09:02 -08:00
Akira Ajisaka 19c149cdb9 HDFS-9765. TestBlockScanner#testVolumeIteratorWithCaching fails intermittently. (aajisaka) 
(cherry picked from commit 8ed07bd3e6)
(cherry picked from commit 8dec72bfd7)
 2016-02-15 19:09:51 +09:00
Akira Ajisaka 4d1c23f55c HDFS-9773. Remove dead code related to SimulatedFSDataset in tests. Contributed by Brahma Reddy Battula. 
(cherry picked from commit b0738ae673)
(cherry picked from commit 5e78264cde)
 2016-02-15 15:35:35 +09:00
Junping Du aed60ae0bf Set the release date for 2.6.4. 
(cherry picked from commit ec12ce8f48)
(cherry picked from commit a28be9edc7)

Conflicts:

	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2016-02-13 01:48:50 -08:00
Arpit Agarwal 8c1cf718aa HDFS-9801. ReconfigurableBase should update the cached configuration. (Arpit Agarwal) 2016-02-12 12:41:20 -08:00
Arun Suresh 4d7da8907f HDFS-9797. Log Standby exceptions thrown by RequestHedgingProxyProvider at DEBUG Level (Inigo Goiri via asuresh) 
(cherry picked from commit 9fdfb546fb)
 2016-02-12 11:21:16 -08:00
Zhe Zhang f72cfc416a HDFS-9644. Update encryption documentation to reflect nested EZs. (zhz) 
Change-Id: I84ae96f4711a16ded46d501c51ca322bfca5151d
 2016-02-12 10:49:41 -08:00
Masatake Iwasaki 2dd80938a2 HDFS-9700. DFSClient and DFSOutputStream should set TCP_NODELAY on sockets for DataTransferProtocol (Gary Helmling via iwasakims) 
(cherry picked from commit 372d1302c6)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/DfsClientConf.java

(cherry picked from commit f71fa500f9)
 2016-02-13 03:34:07 +09:00
Akira Ajisaka df23f9c49d HDFS-9768. Reuse ObjectMapper instance in HDFS to improve the performance. Contributed by Lin Yiqun. 
(cherry picked from commit e6a7044b85)
(cherry picked from commit a714d04f5d)
 2016-02-13 02:04:22 +09:00
Arpit Agarwal 58d4c045e6 HDFS-9790. HDFS Balancer should exit with a proper message if upgrade is not finalized (Contributed by Xiaobing Zhou) 2016-02-11 20:40:49 -08:00
Andrew Wang 47746f65b0 HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto. 
(cherry picked from commit aeb13ef2ab)
(cherry picked from commit d489570755)
 2016-02-10 15:26:34 -08:00
Akira Ajisaka 811ab1bf94 HDFS-9686. Remove useless boxing/unboxing code. Contributed by Kousuke Saruta. 
(cherry picked from commit 802a7edfae)
(cherry picked from commit a60a0a7128)
 2016-02-10 23:50:16 +09:00
Akira Ajisaka 321da0604a Revert "HDFS-9686. Remove useless boxing/unboxing code. Contributed by Kousuke Saruta." 
This reverts commit 3f8a30c956.
 2016-02-10 23:45:44 +09:00
Uma Maheswara Rao G de24588ca2 HDFS-9779 . TestReplicationPolicyWithNodeGroup NODE variable picks wrong rack value. Contributed by Kuhu Shukla. 
(cherry picked from commit a7fce9ab41)
 2016-02-09 15:18:07 -08:00
Allen Wittenauer dc325ee550 HDFS-9760. WebHDFS AuthFilter cannot be configured with custom AltKerberos auth handler (Ryan Sasson via aw) 2016-02-09 14:16:02 -08:00
Akira Ajisaka e4769775b0 HDFS-9784. Example usage is not correct in Transparent Encryption document. Contributed by Ohnishi Takashi. 
(cherry picked from commit 60d2011b7c)
(cherry picked from commit cb53dfcc95)
 2016-02-10 03:30:56 +09:00
zhezhang 3257ce73bd HDFS-9244. Support nested encryption zones. 
Change-Id: I43a13035a8b27956e90967ee82058efb647c3415
 2016-02-08 16:32:11 -08:00
Uma Maheswara Rao G 3399119e72 HDFS-9777. Fix typos in DFSAdmin command line and documentation.(Wei-Chiu Chuang via umamahesh) 
(cherry picked from commit bffaa38a91)
 2016-02-08 14:12:52 -08:00
Kihwal Lee aae0f183af HDFS-9752. Permanent write failures may happen to slow writers during datanode rolling upgrades. Contributed by Walter Su. 
(cherry picked from commit 193d27de0a)
 2016-02-08 12:17:39 -06:00
Uma Maheswara Rao G 5690e11206 HDFS-9713. DataXceiver#copyBlock should return if block is pinned. Contributed by Uma Maheswara Rao G. 
(cherry picked from commit aea31eee78)
 2016-02-07 20:59:35 -08:00
Akira Ajisaka 3f8a30c956 HDFS-9686. Remove useless boxing/unboxing code. Contributed by Kousuke Saruta. 
(cherry picked from commit fe124da5ff)
(cherry picked from commit e4c01b8b1c)
 2016-02-06 19:33:11 +09:00
cnauroth bad8006da1 HDFS-9761. Rebalancer sleeps too long between iterations. Contributed by Mingliang Liu. 
(cherry picked from commit c6497949e8)
(cherry picked from commit a7232f5e1d)
 2016-02-05 15:08:07 -08:00
Tsz-Wo Nicholas Sze 494b6c7c4b HDFS-9726. Refactor IBR code to a new class. 2016-02-05 23:22:17 +08:00
Haohui Mai fdb89ac0ae HDFS-9724. Degraded performance in WebHDFS listing as it does not reuse ObjectMapper. Contributed by Akira Ajisaka. 2016-02-04 13:41:14 -08:00
Kihwal Lee 6090211872 HDFS-9730. Storage ID update does not happen when there is a layout change. Contributed by Tsz Wo Nicholas Sze. 
(cherry picked from commit 496f33de0c)
 2016-02-04 13:22:05 -06:00
Vinayakumar B adadc220fa HDFS-9629. Update the footer of Web UI to show year 2016 (Contributed by Xiao Chen and Vinayakumar B) 
(cherry picked from commit ddcd6954d03d3caadc8b69f7b886a3a17c3c9d0c)
(cherry picked from commit 8cdfdbf815bf89eee3184ec7cd00e1924c1ea316)
 2016-02-04 13:19:53 +05:30
Konstantin V Shvachko 3f178be0bd HDFS-9503. Use generic option -fs for NNThroughputBenchmark instead of -namenode. Contributed by Mingliang Liu. 2016-02-03 14:45:09 -08:00
Masatake Iwasaki 5fd4bd1d8c HDFS-9601. NNThroughputBenchmark.BlockReportStats should handle NotReplicatedYetException on adding block (iwasakims) 2016-02-03 14:29:06 -08:00
Jing Zhao a79f570b6c HDFS-9748. Avoid duplication in pendingReplications when addExpectedReplicasToPending is called twice. Contributed by Walter Su. 
(cherry picked from commit 7badf15604)
(cherry picked from commit 459c31de4a)
 2016-02-03 13:33:59 -08:00
Vinayakumar B c2ec241989 HDFS-9740. Use a reasonable limit in DFSTestUtil.waitForMetric() (Contributed by Chang Li) 
(cherry picked from commit eb2fb943fd)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java

(cherry picked from commit 6941e2ccbf)
 2016-02-03 11:21:42 +05:30
Vinayakumar B e045856eda HDFS-9739. DatanodeStorage.isValidStorageId() is broken (Contributed by Mingliang Liu) 
(cherry picked from commit d6b1acb940)
(cherry picked from commit e8a9a69a27)
 2016-02-03 10:34:35 +05:30
Junping Du 847158811b Adding release 2.6.5 to CHANGES.txt 2016-02-02 18:36:39 -08:00
Vinayakumar B bf2936fd38 HDFS-9715. Check storage ID uniqueness on datanode startup (Contributed by Lei (Eddy) Xu) 
(cherry picked from commit 04375756a5)
(cherry picked from commit 8577c0b6a2)
 2016-02-03 07:42:18 +05:30
Tsz-Wo Nicholas Sze 0ad3c51dfb HDFS-8999. Allow a file to be closed with COMMITTED but not yet COMPLETE blocks. 
(cherry picked from commit b10d8ced21)
 2016-02-03 07:41:06 +05:30
Colin Patrick Mccabe c4c94e1cf2 HDFS-9669. TcpPeerServer should respect ipc.server.listen.queue.size (Elliot Clark via cmccabe) 
(cherry picked from commit 2da03b48eb)
(cherry picked from commit 60d3a3c30b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 2016-02-02 11:05:41 -08:00
Lei Xu dfbd0d4df4 HDFS-9721. Allow Delimited PB OIV tool to run upon fsimage that contains INodeReference. (Xiao Chen via lei) 
(cherry picked from commit 9d494f0c0e)
 2016-02-02 10:43:06 -08:00
Vinayakumar B 94950c15c2 HDFS-9718. HAUtil#getConfForOtherNodes should unset independent generic keys before initialize (Contributed by DENG FEI) 
(cherry picked from commit 4d7055e0c8)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHAConfiguration.java

(cherry picked from commit 80dd039b6e)
 2016-02-02 12:57:42 +05:30
Yongjun Zhang d7b01ebcbe HDFS-9406. FSImage may get corrupted after deleting snapshot. (Contributed by Jing Zhao, Stanislav Antic, Vinayakumar B, Yongjun Zhang) 
(cherry picked from commit 34ab50ea92)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeFile.java

(cherry picked from commit fc8d9cc758)
 2016-02-01 14:22:35 -08:00
Lei Xu b8360139af HDFS-9701. DN may deadlock when hot-swapping under load. (Xiao Chen via lei) 
(cherry picked from commit 12a4ebb4471f78b642e12c2ec0784c20f62cca3c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
 2016-02-01 12:49:09 -08:00
Xiaoyu Yao 924e1583ed HDFS-9210. Fix some misuse of %n in VolumeScanner#printStats. Contributed by Xiaoyu Yao. 
(cherry picked from commit b11008d54d)
 2016-02-01 11:57:51 -08:00
Steve Loughran dcf2c8b3c8 HDFS-9708. FSNamesystem.initAuditLoggers() doesn't trim classnames (Mingliang Liu via stevel) 2016-02-01 16:01:22 +00:00
Vinayakumar B 6eae76f7a5 HDFS-9566. Remove expensive 'BlocksMap#getStorages(Block b, final DatanodeStorage.State state)' method (Contributed by Daryn Sharp) 
(cherry picked from commit e418bd1fb0)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java

(cherry picked from commit 71374cca9d)
 2016-02-01 13:32:59 +05:30
Yongjun Zhang f028e3d7bc HDFS-9638. Improve DistCp Help and documentation. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit eddd823cd6)
 2016-01-29 12:13:18 -08:00
Yongjun Zhang 6a06a492ec HDFS-9706. Log more details in debug logs in BlockReceiver's constructor. (Xiao Chen via Yongjun Zhang) 
(cherry picked from commit 8ee060311c)
 2016-01-28 23:14:56 -08:00
Tsz-Wo Nicholas Sze f09b0fe5c4 HDFS-9654. Code refactoring for HDFS-8578. 2016-01-28 11:01:47 +08:00
Tsz-Wo Nicholas Sze 0271fb1f18 HDFS-9690. ClientProtocol.addBlock is not idempotent after HDFS-8071. 2016-01-26 14:58:44 +08:00
Jitendra Pandey f1f61eac15 HDFS-9672. o.a.h.hdfs.TestLeaseRecovery2 fails intermittently. Contributed by Mingliang Liu. 2016-01-25 17:06:23 -08:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 3efc72ccd5 Release process for 2.7.2: Set the release date for 2.7.2 
(cherry picked from commit ec4d2d9f40)
 2016-01-25 15:47:39 -08:00
Eric Yang 6ba6f993f8 HDFS-9653. Added blocks pending deletion report to dfsadmin. 
(Weiwei Yang via eyang)
 2016-01-24 14:27:17 -08:00
Kihwal Lee 330876689b HDFS-8898. Create API and command-line argument to get quota and quota usage without detailed content summary. Contributed by Ming Ma. 
(cherry picked from commit b5db1d4410)
 2016-01-22 09:20:39 -06:00
Akira Ajisaka 4b121be77e HDFS-9682. Fix a typo "aplication" in HttpFS document. Contributed by Weiwei yang. 
(cherry picked from commit 6831634682)
(cherry picked from commit 4fe28a644e)
 2016-01-22 20:12:55 +09:00
Kihwal Lee 67ba20e364 HDFS-9634. webhdfs client side exceptions don't provide enough details. Contributed by Eric Payne. 
(cherry picked from commit 7b70500484574a565dd8cd5c7d8b5bc7c6d91154)
 2016-01-21 09:34:06 -06:00
Vinayakumar B 4449677049 HDFS-9625. set replication for empty file failed when set storage policy (Contributed by DENG FEI) 
(cherry picked from commit b7372b7166)
(cherry picked from commit 845acfd96c)
 2016-01-21 19:19:43 +05:30
Lei Xu b4b5468152 HDFS-9655. NN should start JVM pause monitor before loading fsimage. (John Zhuge via Lei (Eddy) Xu) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
 2016-01-20 14:35:59 -08:00
Vinayakumar B 3d38c1ef3a HDFS-9661. Deadlock in DN.FsDatasetImpl between moveBlockAcrossStorage and createRbw (Contributed by ade) 
(cherry picked from commit 1425578690)
 2016-01-20 21:09:08 +05:30
Yongjun Zhang 15713f947c HDFS-6054. MiniQJMHACluster should not use static port to avoid binding failure in unit test. (Yongjun Zhang) 
(cherry picked from commit 57d0a94305)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java

(cherry picked from commit a5ee4c09de)
 2016-01-19 23:14:56 -08:00
Akira Ajisaka ca22066582 HDFS-9623. Update example configuration of block state change log in log4j.properties. Contributed by Masatake Iwasaki. 
(cherry picked from commit 92c5f565fd)
(cherry picked from commit 3a8d372518)
 2016-01-19 13:32:54 +09:00
Tsz-Wo Nicholas Sze e75ca52138 In CHANGES.txt, move HDFS-9294 to Release 2.6.4. 2016-01-16 23:47:20 +08:00
Yongjun Zhang 4c8131b1bf HDFS-9612. DistCp worker threads are not terminated after jobs are done. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit a9c69ebeb7)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2016-01-15 10:12:15 -08:00
Benoy Antony 6ceee07357 HDFS-9597. BaseReplicationPolicyTest should update data node stats after adding a data node. Contributed by Wei-Chiu Chuang. 2016-01-14 14:42:04 -08:00
Benoy Antony 5a50651e5b HDFS-9034. StorageTypeStats Metric should not count failed storage. Contributed by Surendra Singh Lilhore. 2016-01-14 14:42:04 -08:00
Arpit Agarwal 3266709b5d HDFS-9415. Document dfs.cluster.administrators and dfs.permissions.superusergroup. (Contributed by Xiaobing Zhou) 2016-01-14 14:18:21 -08:00
Yongjun Zhang f2eea3a1b4 HDFS-9648. TestStartup.testImageChecksum is broken by HDFS-9569's message change. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit 817cc1f02a)
 2016-01-14 13:06:23 -08:00
Lei Xu 894345e2f0 HDFS-9493. Test o.a.h.hdfs.server.namenode.TestMetaSave fails in trunk. (Tony Wu via lei) 
(cherry picked from commit fd8065a763)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java
 2016-01-13 16:34:13 -08:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 7eb63d4e7c HADOOP-5323. Trash documentation should describe its directory structure and configurations. (Weiwei Yang via ozawa) 
Moved entry from HDFS CHANGES.txt to that of common.

(cherry picked from commit cb73c753da)
 2016-01-13 14:56:35 -08:00
Yongjun Zhang 6650387bfb HDFS-9569. Log the name of the fsimage being loaded for better supportability. (Yongjun Zhang) 
(cherry picked from commit 25051c3bd0)
 2016-01-12 09:23:40 -08:00
Xiaoyu Yao 74c05e5359 Correct commit message for HDFS-9584 
(cherry picked from commit 103d3cfc4e)
 2016-01-11 19:01:11 -08:00
Xiaoyu Yao a9cbfd717c HDFS-8584. NPE in distcp when ssl configuration file does not exist in class path. Contributed by Surendra Singh Lilhore. 
(cherry picked from commit c2e2e13455)
 2016-01-11 17:16:43 -08:00
Arpit Agarwal 319c71b89b HDFS-9639. Fix up CHANGES.txt 2016-01-11 15:11:30 -08:00
Arpit Agarwal 476f7d0be3 HDFS-9639. Inconsistent Logging in BootstrapStandby. (Contributed by Xiaobing Zhou) 2016-01-11 15:10:21 -08:00
Zhe Zhang 87d614c70b HDFS-9630. DistCp minor refactoring and clean up. Contributed by Kai Zheng. 
Change-Id: I363c4ffcac32116ddcdc0a22fac3db92f14a0db0
 2016-01-11 09:57:01 -08:00
Zhe Zhang eef26388ca HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. Contributed by Xiao Chen. 
Change-Id: I5cee398dfc361121d8b666ffd1203cc14a4ace24
 2016-01-08 13:20:02 -08:00
Kihwal Lee d1cbc8442c HDFS-9574. Reduce client failures during datanode restart. Contributed by Kihwal Lee. 
(cherry picked from commit 38c4c14472)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
 2016-01-08 11:16:40 -06:00
Vinayakumar B 3303326dd9 HDFS-9619. SimulatedFSDataset sometimes can not find blockpool for the correct namenode (Contributed by Wei-Chiu Chuang) 
(cherry picked from commit 6702e7d66a)
(cherry picked from commit 08f39bd5d1)
 2016-01-07 14:21:18 +05:30
Vinayakumar B a14baa05b0 HDFS-9600. do not check replication if the block is under construction (Contributed by Phil Yang) 
(cherry picked from commit 34cd7cd765)
(cherry picked from commit aa710bd461)
 2016-01-07 12:11:55 +05:30
Haohui Mai bb6f03d597 HDFS-9047. Retire libwebhdfs. Contributed by Haohui Mai. 2016-01-06 16:39:51 -08:00
Haohui Mai 6dcf3cb6a1 HDFS-9605. Add links to failed volumes to explorer.html in HDFS Web UI. Contributed by Archana T. 2016-01-05 13:56:18 -08:00
Haohui Mai 2aa99e6df0 HDFS-7779. Support changing ownership, group and replication in HDFS Web UI. Contributed by Ravi Prakash. 2016-01-05 13:45:10 -08:00
Uma Mahesh 68ee13e4f5 HADOOP-12658. Clear javadoc and check style issues around DomainSocket. Contributed by Kai Zheng 
(cherry picked from commit 778146eaae)
 2016-01-04 15:14:14 -08:00
Akira Ajisaka 22ac1a1ac0 Set release date for 2.6.3 
(cherry picked from commit db99e30f67)
(cherry picked from commit 247ab92464)
 2016-01-04 16:13:06 +09:00
Akira Ajisaka 13a48f6256 HADOOP-11252. RPC client does not time out by default. Contributed by Wilfred Spiegelenburg and Masatake Iwasaki. 
(cherry picked from commit 64ae85fd2e)
(cherry picked from commit d98cfe611f)
 2016-01-04 14:32:21 +09:00
cnauroth 6d9f210c4d HDFS-7553. fix the TestDFSUpgradeWithHA due to BindException. Contributed by Xiao Chen. 
(cherry picked from commit 1f8162b74e)
 2015-12-29 10:57:30 -08:00
Kihwal Lee 263c544021 HDFS-7163. WebHdfsFileSystem should retry reads according to the configured retry policy. Contributed by Eric Payne. 
(cherry picked from commit 867048c3e4)
(cherry picked from commit 131260f0a7)
 2015-12-22 14:20:10 -06:00
cnauroth 8fad4c780a HDFS-9458. TestBackupNode always binds to port 50070, which can cause bind failures. Contributed by Xiao Chen. 
(cherry picked from commit 5c0ff69618)
(cherry picked from commit 9b039a5004)
 2015-12-22 10:29:47 -08:00
Colin Patrick Mccabe 9218890c7f HDFS-9589. Block files which have been hardlinked should be duplicated before the DataNode appends to the them (cmccabe) 
(cherry picked from commit bb540ba85a)
(cherry picked from commit a56c5ef636)
 2015-12-22 09:39:04 -08:00
Akira Ajisaka 4254ca9898 Move HDFS-8914 from 2.8.0 to 2.7.3 in CHANGES.txt. 
(cherry picked from commit 2cb5afffc4)
(cherry picked from commit 12caea3274)
 2015-12-21 21:53:53 +09:00
Akira Ajisaka 1cd85efd71 HDFS-9505. HDFS Architecture documentation needs to be refreshed. Contributed by Masatake Iwasaki. 
(cherry picked from commit fa544020f6)
(cherry picked from commit 7526a2a005)
 2015-12-21 21:23:40 +09:00
Uma Mahesh 6f30919336 YARN-4480. Clean up some inappropriate imports. (Kai Zheng via umamahesh) 
(cherry picked from commit 0f82b5d878)
 2015-12-19 23:28:51 -08:00
cnauroth d6f1d3b6ca HADOOP-12570. HDFS Secure Mode Documentation updates. Contributed by Arpit Agarwal. 
(cherry picked from commit 932956458d)
(cherry picked from commit dd91cf9fa5)
 2015-12-18 16:54:36 -08:00
Xiaoyu Yao 4f21f9408e HDFS-8326. Documentation about when checkpoints are run is out of date. (Misty Stanley-Jones via xyao) 
(cherry picked from commit d0e75e60fb)
(cherry picked from commit 5595b912e4)
 2015-12-18 16:34:44 -08:00
Xiaoyu Yao f3ee0e7857 HDFS-8831. Trash Support for deletion in HDFS encryption zone. Contributed by Xiaoyu Yao. 
(cherry picked from commit cbc7b6bf97)
(cherry picked from commit eb7f9901b4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-12-18 16:34:43 -08:00
Lei Xu 134195df55 HDFS-9490. MiniDFSCluster should change block generation stamp via FsDatasetTestUtils. (Tony Wu via lei) 
(cherry picked from commit 0ac8fb4b33)
(cherry picked from commit 58714f3b73)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-12-18 16:34:42 -08:00
Konstantin V Shvachko 0b88a7f259 HDFS-9484. NNThroughputBenchmark$BlockReportStats should not send empty block reports. Contributed by Mingliang Liu. 
(cherry picked from commit 33d4588a7c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-12-18 16:34:42 -08:00
Konstantin V Shvachko 69d3a71f14 HDFS-9436. Make NNThroughputBenchmark$BlockReportStats run with 10 datanodes by default. Contributed by Mingliang. 
(cherry picked from commit 3aa73a867a)
 2015-12-18 16:33:53 -08:00
Zhe Zhang 65effb76d9 HDFS-9347. Invariant assumption in TestQuorumJournalManager.shutdown() is wrong. Contributed by Wei-Chiu Chuang. 
Change-Id: Idde8522e11c77f82b376e0c90a9bf33d163d5cb9
 2015-12-18 16:06:42 -08:00
Vinayakumar B 384628a2d6 HDFS-9393. After choosing favored nodes, choosing nodes for remaining replicas should go through BlockPlacementPolicy (Contributed by J.Andreina) 
(cherry picked from commit bfadf11b36)
(cherry picked from commit c887bcd1f0)
 2015-12-18 11:41:27 +05:30
cnauroth 9a6814f37c HDFS-9571. Fix ASF Licence warnings in Jenkins reports. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 6da9deec20)
(cherry picked from commit 7e5306e795)
 2015-12-17 16:26:16 -08:00
Kihwal Lee e5e5ba495f HDFS-9533. seen_txid in the shared edits directory is modified during bootstrapping. Contributed by Kihwal Lee. 
(cherry picked from commit 5cb1e0118b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestBootstrapStandby.java
(cherry picked from commit 3c0ae5914c)
 2015-12-17 17:23:55 -06:00
cnauroth 12e6f38f52 HDFS-9572. Prevent DataNode log spam if a client connects on the data transfer port but sends no data. Contributed by Chris Nauroth 
(cherry picked from commit 03bab8dea1)
(cherry picked from commit 294d0f6f6a)
 2015-12-17 14:05:19 -08:00
Arpit Agarwal c8e5d2eba4 HDFS-9515. NPE when MiniDFSCluster#shutdown is invoked on uninitialized reference. (Contributed by Wei-Chiu Chuang) 2015-12-17 13:57:03 -08:00
cnauroth 1e81e1f891 Revert "HDFS-9569. Log the name of the fsimage being loaded for better supportability. Contributed by Yongjun Zhang." 
This reverts commit a8dc35dfdf.
 2015-12-17 13:50:02 -08:00
Allen Wittenauer b11362fd2a HDFS-9570. Minor typos, grammar, and case sensitivity cleanup in HdfsPermissionsGuide.md's (Travis Campbell via aw) 
(cherry picked from commit 8d278d8d2e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit a5c74cd921)
 2015-12-17 11:41:11 -08:00
cnauroth 7cc11b22dd HDFS-9552. Document types of permission checks performed for HDFS operations. Contributed by Chris Nauroth. 
(cherry picked from commit 724e71f63b)
(cherry picked from commit 940026fc6b)
 2015-12-17 10:44:00 -08:00
Arpit Agarwal 12df736673 HDFS-9565. TestDistributedFileSystem.testLocatedFileStatusStorageIdsTypes is flaky due to race condition. (Contributed by Wei-Chiu Chuang) 2015-12-17 10:38:58 -08:00
Kihwal Lee a8dc35dfdf HDFS-9569. Log the name of the fsimage being loaded for better supportability. Contributed by Yongjun Zhang. 
(cherry picked from commit eb6939cea0)
 2015-12-17 10:31:37 -06:00
Plamen Jeliazkov cffa262f11 HDFS-9516. Truncate file fails with data dirs on multiple disks. Contributed by Plamen Jeliazkov. 2015-12-17 00:03:51 -08:00
Uma Mahesh e6dc6f24a2 HDFS-9198. Coalesce IBR processing in the NN. (Daryn Sharp via umamahesh) 
(cherry picked from commit f741476146)
 2015-12-16 22:50:12 -08:00
cnauroth d3e1161b8d HDFS-9557. Reduce object allocation in PB conversion. Contributed by Daryn Sharp. 
(cherry picked from commit c470c8953d)
(cherry picked from commit e8e3737ce8)
 2015-12-16 11:11:34 -08:00
Andrew Wang 8e5de6cc42 HDFS-8894. Set SO_KEEPALIVE on DN server sockets. Contributed by Kanaka Kumar Avvaru. 
(cherry picked from commit 49949a4bb0)
(cherry picked from commit 2796c1099f)
 2015-12-15 14:40:23 -08:00
Yongjun Zhang 4bc1aab49d HDFS-9514. TestDistributedFileSystem.testDFSClientPeerWriteTimeout failing; exception being swallowed. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit bf5295b118)
 2015-12-14 15:40:55 -08:00
Yongjun Zhang 6c0e36b91c HDFS-9519. Some coding improvement in SecondaryNameNode#main. (Xiao Chen via Yongjun Zhang) 
(cherry picked from commit 2a4c7d4fac)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-12-14 15:40:13 -08:00
Xiaoyu Yao cdf43bb438 HDFS-8785. TestDistributedFileSystem is failing in trunk. Contributed by Xiaoyu Yao. 
(cherry picked from commit 2196e39e14)
 2015-12-14 15:31:37 -08:00
Jing Zhao 73a055bb9f HDFS-9535. Newly completed blocks in IBR should not be considered under-replicated too quickly. Contributed by Mingliang Liu. 
(cherry picked from commit e534569814)
(cherry picked from commit e02ad5a618)
 2015-12-14 11:20:10 -08:00
Uma Mahesh 4c0b9c9062 HDFS-9528. Cleanup namenode audit/log/exception messages. (szetszwo via umamahesh) 
(cherry picked from commit 796a676d18)
 2015-12-11 19:32:40 -08:00
Yongjun Zhang d02886bf8d HDFS-9532. Detailed exception info is lost in reportTo methods of ErrorReportAction and ReportBadBlockAction. (Yongjun Zhang) 
(cherry picked from commit f5a911452f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit e00888d5cb)
 2015-12-11 18:30:57 -08:00
Kihwal Lee 937a43dc29 HDFS-9445. Datanode may deadlock while handling a bad volume. Contributed by Walter Su. 
(cherry picked from commit a48301791e)
 2015-12-11 08:46:42 -06:00
Uma Mahesh d028295414 HDFS-9472. concat() API does not give proper exception messages on ./reserved relative path (Rakesh R via umamahesh) 
(cherry picked from commit e363417e7b)
 2015-12-11 00:02:49 -08:00
Tsz-Wo Nicholas Sze 26c8950fb4 HDFS-9527. The return type of FSNamesystem.getBlockCollection should be changed to INodeFile. 2015-12-09 18:14:07 -08:00
Vinod Kumar Vavilapalli 469bf56801 HDFS-9273. Moving to 2.6.3 CHANGES section to reflect the backport. 2015-12-08 11:35:28 -08:00
Arpit Agarwal 43241bf8e5 HDFS-9214. Add missing license header 2015-12-04 15:33:30 -08:00
Arpit Agarwal da3dfd77fd HDFS-9214. Support reconfiguring dfs.datanode.balance.max.concurrent.moves without DN restart. (Contributed by Xiaobing Zhou) 2015-12-04 14:47:01 -08:00
Yongjun Zhang 560d49da8f HDFS-9474. TestPipelinesFailover should not fail when printing debug message. (John Zhuge via Yongjun Zhang) 
(cherry picked from commit 59dbe8b3e9)
 2015-12-04 14:02:28 -08:00
Tsz-Wo Nicholas Sze afc76eb218 HDFS-9294. DFSClient deadlock when close file and failed to renew lease. Contributed by Brahma Reddy Battula 2015-12-03 11:35:29 -08:00
Colin Patrick Mccabe 228ad84e9c HDFS-9429. Tests in TestDFSAdminWithHA intermittently fail with EOFException (Xiao Chen via Colin P. McCabe) 
(cherry picked from commit 53e3bf7e70)
(cherry picked from commit 9b516a2a05)
 2015-12-02 15:40:49 -08:00
Junping Du 12fb8b4cc5 Add 2.6.4 as release entry to CHANGES.txt 2015-12-02 07:38:03 -08:00
Arpit Agarwal 05d7202b1e HDFS-6533. TestBPOfferService#testBasicFunctionalitytest fails intermittently. (Contributed by Wei-Chiu Chuang) 2015-12-01 15:29:42 -08:00
Kihwal Lee b70b380f37 HDFS-9426. Rollingupgrade finalization is not backward compatible (Contributed by Kihwal Lee) 
(cherry picked from commit c62d42cd8b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolClientSideTranslatorPB.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/DatanodeProtocolServerSideTranslatorPB.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto
(cherry picked from commit 9f256d1d71)
 2015-12-01 16:43:27 -06:00
Zhe Zhang 456426fe6b HDFS-9269. Update the documentation and wrapper for fuse-dfs. Contributed by Wei-Chiu Chuang. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

Change-Id: Idebd3b5d2ab09910c71cfde19e4b4d88f7ce1efb
 2015-12-01 14:41:57 -08:00
Jing Zhao 084ad2b420 HDFS-9485. Make BlockManager#removeFromExcessReplicateMap accept BlockInfo instead of Block. Contributed by Mingliang Liu. 
(cherry picked from commit 830eb252aa)
(cherry picked from commit 7e416aa70d)
 2015-12-01 13:10:56 -08:00
Allen Wittenauer 81a7ad45c9 HADOOP-12366. expose calculated paths (aw) 2015-12-01 08:15:57 -08:00
Akira Ajisaka 745772c975 HDFS-9336. deleteSnapshot throws NPE when snapshotname is null. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 1c05393b51)
(cherry picked from commit 402a2f2d64)
 2015-12-01 11:30:26 +08:00
Andrew Wang 8676959d13 HDFS-9470. Encryption zone on root not loaded from fsimage after NN restart. Xiao Chen via wang. 
(cherry picked from commit 9b8e50b424)
(cherry picked from commit ce1111ceea)
 2015-11-30 18:04:46 -08:00
Vinod Kumar Vavilapalli efaef45a24 Reverting previous commit which added 2.9.0 entries. Don't need that in branch-2.8. 
Revert "Adding release 2.8.0 to CHANGES.txt"

This reverts commit 767815f317.
 2015-11-25 17:49:48 -08:00
Vinod Kumar Vavilapalli 767815f317 Adding release 2.8.0 to CHANGES.txt 
(cherry picked from commit d57fd181c7)
 2015-11-25 17:37:47 -08:00
Jing Zhao 288cf8437b HDFS-9467. Fix data race accessing writeLockHeldTimeStamp in FSNamesystem. Contributed by Mingliang Liu. 
(cherry picked from commit e556c35b05)
 2015-11-25 14:23:06 -08:00
Konstantin V Shvachko 9c1ef648a9 HDFS-9407. TestFileTruncate should not use fixed NN port. Contributed by Brahma Reddy Battula. 2015-11-25 14:16:03 -08:00
Xiaoyu Yao 4f1f9f7eff HDFS-8512. WebHDFS : GETFILESTATUS should return LocatedBlock with storage type info. Contributed by Xiaoyu Yao. 
(cherry picked from commit e3d673901b)
 2015-11-25 13:54:22 -08:00
Haohui Mai 15caaa7d0a HDFS-9459. hadoop-hdfs-native-client fails test build on Windows after transition to ctest. Contributed by Chris Nauroth. 2015-11-25 10:32:13 -08:00
Yongjun Zhang 48b294c58e HDFS-9438. TestPipelinesFailover assumes Linux ifconfig. (John Zhuge via Yongjun Zhang) 
(cherry picked from commit 8176ea7dc6)
 2015-11-25 08:50:02 -08:00
Yongjun Zhang 7ac8d8f510 HDFS-6694. Addendum. Update CHANGES.txt for cherry-picking to 2.8. 
(cherry picked from commit 84d01ad7f4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-11-25 08:49:26 -08:00
arp 566ceac1ff HDFS-6694. TestPipelinesFailover.testPipelineRecoveryStress tests fail intermittently with various symptoms - debugging patch (Contributed by Yongjun Zhang) 
(cherry picked from commit c5d9a4a91e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-11-25 08:45:59 -08:00
Tom Zeng d6f7d22929 HADOOP-12415. Add io.netty dependency to hadoop-nfs and to hadoop-hdfs, needed to build Bigtop successfuly, see BIGTOP-2049 
Signed-off-by: Konstantin Boudnik <cos@boudnik.org>
(cherry picked from commit b4c6b511e7)
 2015-11-24 18:39:01 -08:00
Tsz-Wo Nicholas Sze 79e55fb47f HDFS-8807. dfs.datanode.data.dir does not handle spaces between storageType and URI correctly. Contributed by Anu Engineer 2015-11-24 16:05:21 -08:00
Haohui Mai b07c91a16b HDFS-8335. FSNamesystem should construct FSPermissionChecker only if permission is enabled. Contributed by Gabor Liptak. 2015-11-24 13:07:45 -08:00
Tsz-Wo Nicholas Sze 15ecbc95bf Move HDFS-9434 to 2.6.3 in CHANGES.txt. 2015-11-24 12:44:37 -08:00
Ming Ma 85d04dc464 HDFS-9314. Improve BlockPlacementPolicyDefault's picking of excess replicas. (Xiao Chen via mingma) 
(cherry picked from commit 0e54b164a8)
 2015-11-24 10:31:23 -08:00
cnauroth c79f017752 HDFS-6101. TestReplaceDatanodeOnFailure fails occasionally. Contributed by Wei-Chiu Chuang. 
(cherry picked from commit 1777608fa0)
 2015-11-24 09:39:37 -08:00
Uma Mahesh 52c889ac14 HDFS-9433. DFS getEZForPath API on a non-existent file should throw FileNotFoundException (Rakesh R via umamahesh) 
(cherry picked from commit 411e2b2e7c)
 2015-11-23 18:46:48 -08:00
Haohui Mai d469e9e4ca HDFS-7988. Replace usage of ExactSizeInputStream with LimitInputStream. Contributed by Walter Su. 2015-11-23 10:50:23 -08:00
Steve Loughran 331ed6998b Revert "HDFS-9423. Fix intermittent failure of TestEditLogTailer. Contributed by Masatake Iwasaki." 
This reverts commit de3b33e121.
 2015-11-23 12:28:25 +00:00
Walter Su de3b33e121 HDFS-9423. Fix intermittent failure of TestEditLogTailer. Contributed by Masatake Iwasaki. 
(cherry picked from commit 201f14e271)
 2015-11-23 18:50:29 +08:00
Walter Su 040c582b99 HDFS-9435. TestBlockRecovery#testRBWReplicas is failing intermittently. Contributed by Rakesh R. 
(cherry picked from commit 001ecf962c)
 2015-11-23 15:50:57 +08:00