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

6460 Commits

Author SHA1 Message Date
Andrew Wang 74a723852d HDFS-11660. TestFsDatasetCache#testPageRounder fails intermittently with AssertionError. 2017-04-19 18:10:04 -07:00
Andrew Wang c1549352cf HDFS-11671. TestReconstructStripedBlocks#test2RecoveryTasksForSameBlockGroup fails. 2017-04-19 13:49:56 -07:00
John Zhuge 8c81a16a1f HDFS-11531. Expose hedged read metrics via libHDFS API. Contributed by Sailesh Mukil. 2017-04-18 21:11:07 -07:00
John Zhuge ca2488c009 HDFS-11665. HttpFSServerWebServer$deprecateEnv may leak secret. Contributed by John Zhuge. 2017-04-18 09:28:52 -07:00
Konstantin V Shvachko 8dfcd95d58 HDFS-11634. Optimize BlockIterator when interating starts in the middle. Contributed by Konstantin V Shvachko. 2017-04-17 16:56:24 -07:00
Andrew Wang c0ca785dbb HDFS-11652. Improve ECSchema and ErasureCodingPolicy toString, hashCode, equals. 2017-04-17 16:30:25 -07:00
Zhe Zhang ad49098eb3 HDFS-11615. FSNamesystemLock metrics can be inaccurate due to millisecond precision. Contributed by Erik Krogen. 2017-04-17 16:22:33 -07:00
Andrew Wang a7312715a6 HDFS-10996. Ability to specify per-file EC policy at create time. Contributed by SammiChen. 2017-04-12 12:27:34 -07:00
Andrew Wang 966b1b5b44 HDFS-11565. Use compact identifiers for built-in ECPolicies in HdfsFileStatus. 2017-04-12 12:24:32 -07:00
Anu Engineer abce613356 HDFS-11645. DataXceiver thread should log the actual error when getting InvalidMagicNumberException. Contributed by Chen Liang. 2017-04-12 11:40:58 -07:00
Kihwal Lee d4c01dde49 HDFS-11648. Lazy construct the IIP pathname. Contributed by Daryn Sharp. 2017-04-12 13:29:24 -05:00
Chris Nauroth 23b1a7bdf1 HDFS-11163. Mover should move the file blocks to default storage once policy is unset. Contributed by Surendra Singh Lilhore. 2017-04-11 22:03:09 -07:00
Hanisha Koneru 62e4573efb HDFS-11630. TestThrottledAsyncCheckerTimeout fails intermittently in Jenkins builds. Contributed by Hanisha Koneru. 2017-04-11 21:36:24 -07:00
Mingliang Liu 3a91376707 HDFS-11558. BPServiceActor thread name is too long. Contributed by Xiaobing Zhou 2017-04-11 15:29:38 -07:00
Wei-Chiu Chuang f050afb578 HADOOP-13665. Erasure Coding codec should support fallback coder. Contributed by Kai Sasaki. 2017-04-11 07:32:13 -07:00
Yiqun Lin 2fd568fdd4 HDFS-11637. Fix javac warning caused by the deprecated key used in TestDFSClientRetries#testFailuresArePerOperation. Contributed by Yiqun Lin. 2017-04-11 19:40:09 +08:00
Chris Douglas a5e57df3c5 HADOOP-14225. Remove xmlenc dependency 2017-04-10 11:48:40 -07:00
Andrew Wang e8bdad7385 HDFS-11623. Move system erasure coding policies into hadoop-hdfs-client. 2017-04-07 16:46:28 -07:00
Andrew Wang 203edc026c HDFS-11633. FSImage failover disables all erasure coding policies. Contributed by Wei-Chiu Chuang. 2017-04-07 15:46:11 -07:00
Allen Wittenauer 96cbb4fce2 HADOOP-14202. fix jsvc/secure user var inconsistencies 
Signed-off-by: John Zhuge <jzhuge@apache.org>
 2017-04-07 08:59:21 -07:00
Xiaoyu Yao 0eacd4c13b HDFS-11608. HDFS write crashed with block size greater than 2 GB. Contributed by Xiaobing Zhou. 2017-04-06 16:11:55 -07:00
Xiaoyu Yao a49fac5302 HDFS-11362. StorageDirectory should initialize a non-null default StorageDirType. Contribute by Hanisha Koneru. 2017-04-06 14:33:16 -07:00
Arpit Agarwal 8c57aeb5b4 HDFS-11131. TestThrottledAsyncChecker#testCancellation is flaky. 2017-04-05 17:54:30 -07:00
Andrew Wang 539ef5aa2e HFDS-11596. hadoop-hdfs-client jar is in the wrong directory in release tarball. Contributed by Yuanbo Liu. 2017-04-05 16:04:09 -07:00
Xiaobing Zhou 3db8d68d63 HDFS-11628. Clarify the behavior of HDFS Mover in documentation. Contributed by Xiaobing Zhou. 2017-04-05 15:33:08 -07:00
Andrew Wang 9e0e430f18 HDFS-11538. Move ClientProtocol HA proxies into hadoop-hdfs-client. Contributed by Huafeng Wang. 2017-04-04 23:05:24 -07:00
Akira Ajisaka 8cb7325527
HDFS-9651. Add missing robots.txt files. 2017-04-05 12:47:45 +09:00
Akira Ajisaka 09e6caec3d
HDFS-9651. All web UIs should include a robots.txt file. Contributed by Lars Francke. 2017-04-05 12:45:28 +09:00
Andrew Wang 18432130a7 HADOOP-14104. Client should always ask namenode for kms provider path. Contributed by Rushabh S Shah. 2017-04-04 13:38:25 -07:00
Chris Douglas 6eba79232f HADOOP-14271. Correct spelling of 'occurred' and variants. Contributed by Yeliang Cang 2017-04-03 20:13:14 -07:00
Wei-Chiu Chuang bbd68478d5 HDFS-11598. Improve -setrep for Erasure Coded files. Contributed by Yiqun Lin. 2017-04-03 07:57:28 -07:00
Wei-Chiu Chuang bc7aff7cec HDFS-11515. -du throws ConcurrentModificationException. Contributed by Istvan Fajth, Wei-Chiu Chuang. 2017-04-03 07:35:09 -07:00
Hanisha Koneru 73835c73e2 HDFS-11560. Expose slow disks via NameNode JMX. Contributed by Hanisha Koneru. 2017-03-31 13:50:29 -07:00
Arpit Agarwal 5485d93bda HDFS-11603. Improve slow mirror/disk warnings in BlockReceiver. 2017-03-31 12:10:27 -07:00
Hanisha Koneru 28cdc5a8dc HDFS-11551. Handle SlowDiskReport from DataNode at the NameNode. Contributed by Hanisha Koneru. 2017-03-30 22:41:26 -07:00
Yongjun Zhang bf3fb585aa HADOOP-11794. Enable distcp to copy blocks in parallel. Contributed by Yongjun Zhang, Wei-Chiu Chuang, Xiao Chen, Rosie Li. 2017-03-30 17:38:56 -07:00
Yongjun Zhang 144f1cf765 Revert "HADOOP-11794. Enable distcp to copy blocks in parallel. Contributed by Yongjun Zhang, Wei-Chiu Chuang, Xiao Chen." 
This reverts commit 064c8b25ec.
 2017-03-30 17:38:18 -07:00
Yongjun Zhang 064c8b25ec HADOOP-11794. Enable distcp to copy blocks in parallel. Contributed by Yongjun Zhang, Wei-Chiu Chuang, Xiao Chen. 2017-03-30 17:01:15 -07:00
Mingliang Liu e5f0622a6f HDFS-11592. Closing a file has a wasteful preconditions in NameNode. Contributed by Eric Badger 2017-03-30 15:44:21 -07:00
Wei-Chiu Chuang 8c591b8d19 HDFS-10974. Document replication factor for EC files. Contributed by Yiqun Lin. 2017-03-30 11:16:05 -07:00
Chris Douglas 7297e82cb4 HADOOP-14250. Correct spelling of 'separate' and variants. Contributed by Doris Gu 2017-03-30 10:17:11 -07:00
Andrew Wang 4966a6e26e HADOOP-14223. Extend FileStatus#toString() to include details like Erasure Coding and Encryption. Contributed by Manoj Govindassamy. 2017-03-29 14:37:21 -07:00
Daniel Templeton 15e3873dc3 HDFS-11571. Typo in DataStorage exception message (Contributed by Anna Budai via Daniel Templeton) 2017-03-29 10:56:36 -07:00
Rakesh Radhakrishnan 84d787b9d5 HDFS-11541. Call RawErasureEncoder and RawErasureDecoder release() methods. Contributed by SammiChen. 2017-03-29 11:41:48 +05:30
Yiqun Lin 6b09336438 HDFS-11577. Combine the old and the new chooseRandom for better performance. Contributed by Chen Liang. 2017-03-28 23:02:07 +08:00
Masatake Iwasaki 64ea62c1cc HDFS-11486. Client close() should not fail fast if the last block is being decommissioned. Contributed by Wei-Chiu Chuang and Yiqun Lin. 2017-03-28 09:13:44 +09:00
Wei-Chiu Chuang 46d37a65cf HDFS-10506. Addendum patch to include missing changes. Contributed by Akira Ajisaka. 2017-03-27 05:23:45 -07:00
Yiqun Lin 96e2ab8144 HDFS-11555. Fix typos in class OfflineImageReconstructor. Contributed by Yiqun Lin. 2017-03-27 19:23:37 +08:00
Junping Du d174c06b01 Add HDFS jdiff for 2.8.0 release. 2017-03-25 14:05:20 -07:00
Tsuyoshi Ozawa 84ddedc0b2 HADOOP-10101. Update guava dependency to the latest version. (ozawa) 2017-03-25 10:06:52 +09:00
Hanisha Koneru 1f66524432 HDFS-11570. Unit test for NameNodeStatusMXBean. Contributed by Hanisha Koneru. 2017-03-24 14:44:25 -07:00
Xiaobing Zhou 1168ece596 HDFS-11534. Add counters for number of blocks in pending IBR. Contributed by Xiaobing Zhou. 2017-03-24 14:33:44 -07:00
Andrew Wang 332a997e10 HDFS-11170. Add builder-based create API to FileSystem. Contributed by SammiChen and Wei Zhou. 2017-03-24 12:56:46 -07:00
Andrew Wang 52b00600df HADOOP-13715. Add isErasureCoded() API to FileStatus class. Contributed by Manoj Govindassamy. 2017-03-24 11:44:46 -07:00
Ravi Prakash d4f73e7e27 HDFS-11574. Spelling mistakes in the Java source. Contributed by Hu Xiaodong. 2017-03-24 09:38:17 -07:00
Zhe Zhang 59d69257a8 HADOOP-9631. ViewFs should use underlying FileSystem's server side defaults. Contributed by Lohit Vijayarenu and Erik Krogen. 2017-03-22 22:22:22 -07:00
John Zhuge ed2d03f2a5 HDFS-11561. HttpFS doc errors. Contributed by Yuanbo Liu. 2017-03-22 22:15:24 -07:00
Yiqun Lin 3b908f71c5 HDFS-11358. DiskBalancer: Report command supports reading nodes from host file. Contributed by Yiqun Lin. 2017-03-21 17:44:17 +08:00
Arpit Agarwal e7c8da614c HDFS-11545. Propagate DataNode's slow disks info to the NameNode via Heartbeats. Contributed by Hanisha Koneru. 2017-03-20 21:54:58 -07:00
Chris Douglas b104f3a282 HDFS-6648. Order of namenodes in ConfiguredFailoverProxyProvider is undefined. Contributed by Inigo Goiri 2017-03-20 17:15:13 -07:00
Arpit Agarwal ffa160ddb8 HDFS-11547. Add logs for slow BlockReceiver while writing data to disk. Contributed by Xiaobing Zhou. 2017-03-17 19:02:24 -07:00
Hanisha Koneru 7f8e928400 HDFS-11517. Expose slow disks via DataNode JMX. Contributed by Hanisha Koneru 2017-03-17 15:42:25 -07:00
Andrew Wang 92ea6d74ec HDFS-11516. Admin command line should print message to stderr in failure case. Contributed by Kai Sasaki. 2017-03-17 11:26:02 -07:00
Xiaobing Zhou 7536815039 HDFS-10394. move declaration of okhttp version from hdfs-client to hadoop-project POM. Contributed by Xiaobing Zhou. 2017-03-16 18:13:43 -07:00
Andrew Wang 4812518b23 HDFS-10530. BlockManager reconstruction work scheduling should correctly adhere to EC block placement policy. Contributed by Manoj Govindassamy and Rui Gao. 2017-03-16 15:07:38 -07:00
Kihwal Lee ba62b50eba HDFS-10601. Improve log message to include hostname when the NameNode is in safemode. Contributed by Kuhu Shukla. 2017-03-16 10:54:59 -05:00
Hanisha Koneru d69a82c89c HDFS-11511. Support Timeout when checking single disk. Contributed by Hanisha Koneru. 2017-03-15 18:01:45 -07:00
Chen Liang 615ac09499 HDFS-11419. DFSTopologyNodeImpl#chooseRandom optimizations. Contributed by Chen Liang. 2017-03-15 12:28:22 -07:00
Yiqun Lin 4416a07c9c HDFS-11420. Edit file should not be processed by the same type processor in OfflineEditsViewer. Contributed by Yiqun Lin. 2017-03-15 18:05:03 +08:00
Andrew Wang cc1292e73a HDFS-9705. Refine the behaviour of getFileChecksum when length = 0. Contributed by Kai Zheng and SammiChen. 2017-03-14 16:41:10 -07:00
Andrew Wang 7515e75103 HDFS-11505. Do not enable any erasure coding policies by default. Contributed by Manoj Govindassamy. 2017-03-14 11:47:25 -07:00
Yiqun Lin 023b941e3b HDFS-11526. Fix confusing block recovery message. Contributed by Yiqun Lin. 2017-03-14 17:49:48 +08:00
Chen Liang 9832ae0ed8 HDFS-11482. Add storage type demand to into DFSNetworkTopology#chooseRandom. Contributed by Chen Liang. 2017-03-13 17:30:10 -07:00
Jing Zhao 55796a0946 HDFS-11395. RequestHedgingProxyProvider#RequestHedgingInvocationHandler hides the Exception thrown from NameNode. Contributed by Nandakumar. 2017-03-13 14:24:51 -07:00
Yiqun Lin 79924266f8 HDFS-11512. Increase timeout on TestShortCircuitLocalRead#testSkipWithVerifyChecksum. Contributed by Eric Badger. 2017-03-13 18:22:30 +08:00
Lei Xu 6d356b6b4d HDFS-11340. DataNode reconfigure for disks doesn't remove the failed volumes. (Manoj Govindassamy via lei) 2017-03-10 14:37:13 -08:00
Andrew Wang 819808a016 HDFS-11506. Move ErasureCodingPolicyManager#getSystemDefaultPolicy to test code. Contributed by Manoj Govindassamy. 2017-03-09 17:29:11 -08:00
Masatake Iwasaki 385d2cb777 HDFS-11499. Decommissioning stuck because of failing recovery. Contributed by Lukas Majercak and Manoj Govindassamy. 2017-03-09 21:13:50 +09:00
Andrew Wang 33a38a5341 HDFS-11314. Enforce set of enabled EC policies on the NameNode. 2017-03-08 16:41:44 -08:00
Andrew Wang 5ca6ef0c26 HDFS-10983. OIV tool should make an EC file explicit. Contributed by Manoj Govindassamy. 2017-03-08 15:36:19 -08:00
Andrew Wang 5addacb1e3 HDFS-11152. Start erasure coding policy ID number from 1 instead of 0 to void potential unexpected errors. Contributed by SammiChen. 2017-03-08 08:47:38 -08:00
Arpit Agarwal 959940b0ab HDFS-11477. Simplify file IO profiling configuration. Contributed by Hanisha Koneru. 2017-03-07 10:12:35 -08:00
Arpit Agarwal b5adc5c301 HDFS-10838. Last full block report received time for each DN should be easily discoverable. Contributed by Surendra Singh Lilhore. 2017-03-06 16:39:53 -08:00
Andrew Wang 5e74196ede HDFS-11498. Make RestCsrfPreventionHandler and WebHdfsHandler compatible with Netty 4.0. 2017-03-06 15:04:13 -08:00
Yiqun Lin 3536ce031c HDFS-8741. Proper error msg to be printed when invalid operation type is given to WebHDFS operations. Contributed by Surendra Singh Lilhore. 2017-03-06 19:04:03 +08:00
Mingliang Liu 0f336bab9c HDFS-11494. Log message when DN is not selected for block replication. Contributed by Yiqun Lin 2017-03-03 18:47:13 -08:00
Jing Zhao ac5ae0065a HDFS-11476. Fix NPE in FsDatasetImpl#checkAndUpdate. Contributed by Xiaobing Zhou. 2017-03-03 13:31:20 -08:00
Andrew Wang 3085a60430 HDFS-8112. Relax permission checking for EC related operations. 2017-03-03 13:00:22 -08:00
Rakesh Radhakrishnan 3749152b66 HDFS-11416. Refactor out system default erasure coding policy. Contributed by Andrew Wang. 2017-03-03 09:28:03 +05:30
Andrew Wang 8f4817f2c5 Revert "HDFS-11477. Simplify file IO profiling configuration. Contributed by Hanisha Koneru." 
This reverts commit e61491d476.
 2017-03-02 16:20:48 -08:00
Arpit Agarwal e61491d476 HDFS-11477. Simplify file IO profiling configuration. Contributed by Hanisha Koneru. 2017-03-02 15:38:25 -08:00
Arpit Agarwal b3ec531f40 HDFS-11461. DataNode Disk Outlier Detection. Contributed by Hanisha Koneru. 2017-03-02 12:45:48 -08:00
Arpit Agarwal eeca8b0c4e HDFS-11419. HDFS specific network topology classes with storage type info included. Contributed by Chen Liang. 2017-03-02 09:21:27 -08:00
Ming Ma 4e14eaded2 Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk 2017-03-01 20:24:49 -08:00
Ming Ma 25c84d279b HDFS-11412. Maintenance minimum replication config value allowable range should be [0, DefaultReplication]. (Manoj Govindassamy via mingma) 2017-03-01 20:23:52 -08:00
Yiqun Lin 555d0c3995 HDFS-11478. Update EC commands in HDFSCommands.md. Contributed by Yiqun Lin. 2017-03-02 12:10:24 +08:00
Rakesh Radhakrishnan 82ef9accaf HDFS-11428. Change setErasureCodingPolicy to take a required string EC policy name. Contributed by Andrew Wang. 2017-03-01 16:06:02 +05:30
Brahma Reddy Battula dcd03df9f9 HDFS-11432. Federation : Support fully qualified path for Quota/Snapshot/cacheadmin/cryptoadmin commands. Contributed by Brahma Reddy Battula. 2017-03-01 10:45:56 +05:30
Zhe Zhang d269b488a7 HDFS-11466. Change dfs.namenode.write-lock-reporting-threshold-ms default from 1000ms to 5000ms. Contributed by Andrew Wang. 2017-02-28 09:00:49 -08:00
Akira Ajisaka 258342e76c HADOOP-14118. move jets3t into a dependency on hadoop-aws JAR. 2017-02-28 13:47:44 +09:00
Andrew Wang 55c07bbed2 HDFS-11382. Persist Erasure Coding Policy ID in a new optional field in INodeFile in FSImage. Contributed by Manoj Govindassamy. 2017-02-27 17:07:45 -08:00
Wei-Chiu Chuang 05391c1845 HDFS-10506. OIV's ReverseXML processor cannot reconstruct some snapshot details. Contributed by Akira Ajisaka. 2017-02-25 14:38:50 -08:00
Arpit Agarwal 120bef7de8 HDFS-11462. Fix occasional BindException in TestNameNodeMetricsLogger. 2017-02-24 19:53:39 -08:00
Yiqun Lin 4a58870a04 HDFS-11433. Document missing usages of OfflineEditsViewer processors. Contributed by Yiqun Lin. 2017-02-25 10:00:05 +08:00
Xiao Chen e24ed47d9a HDFS-11421. Make WebHDFS' ACLs RegEx configurable. Contributed by Harsh J. 2017-02-24 16:49:46 -08:00
Arpit Agarwal d2b3ba9b8f HDFS-11295. Check storage remaining instead of node remaining in BlockPlacementPolicyDefault.chooseReplicaToDelete(). Contributed by Marton Elek. 2017-02-24 15:44:11 -08:00
Andrew Wang c1a52b04d0 HDFS-11427. Rename rs-default to rs. 2017-02-24 10:58:45 -08:00
Andrew Wang 132f758e3d HDFS-11426. Refactor EC CLI to be similar to storage policies CLI. 2017-02-23 16:00:11 -08:00
Jing Zhao 13d4bcfe35 HDFS-4025. QJM: Sychronize past log segments to JNs that missed them. Contributed by Hanisha Koneru. 2017-02-22 16:33:38 -08:00
Andrew Wang d150f061f4 HDFS-11438. Fix typo in error message of StoragePolicyAdmin tool. Contributed by Alison Yu. 2017-02-22 15:16:09 -08:00
Ming Ma cfcd527323 HDFS-11411. Avoid OutOfMemoryError in TestMaintenanceState test runs. (Manoj Govindassamy via mingma) 2017-02-22 09:41:07 -08:00
Mingliang Liu 003ae00693 HDFS-11430. Separate class InnerNode from class NetworkTopology and make it extendable. Contributed by Tsz Wo Nicholas Sze 2017-02-21 15:32:46 -08:00
Andrew Wang 8ef7ebbc71 HDFS-11406. Remove unused getStartInstance and getFinalizeInstance in FSEditLogOp. Contributed by Alison Yu. 2017-02-21 14:54:20 -08:00
Andrew Wang fc9ad3ce3a HDFS-11405. Rename "erasurecode" CLI subcommand to "ec". Contributed by Manoj Govindassamy. 2017-02-21 13:55:27 -08:00
Eric Payne a07ddef101 HDFS-11404. Increase timeout on TestShortCircuitLocalRead.testDeprecatedGetBlockLocalPathInfoRpc. Contributed by Eric Badger 2017-02-21 12:04:25 -06:00
Vinayakumar B 4804050630 HDFS-11177. 'storagepolicies -getStoragePolicy' command should accept URI based path. (Contributed by Surendra Singh Lilhore) 2017-02-21 18:13:19 +05:30
Xiao Chen 02c549484a HDFS-11410. Use the cached instance when edit logging SetAclOp, SetXAttrOp and RemoveXAttrOp. 2017-02-16 18:07:55 -08:00
Wei-Chiu Chuang 5690b51ef7 HDFS-11100. Recursively deleting file protected by sticky bit should fail. Contributed by John Zhuge. 2017-02-16 05:39:37 -08:00
Ming Ma a136936d01 HDFS-11265. Extend visualization for Maintenance Mode under Datanode tab in the NameNode UI. (Marton Elek via mingma) 2017-02-15 20:24:07 -08:00
Mingliang Liu 0741dd3b9a HDFS-11375. Display the volume storage type in datanode UI. Contributed by Surendra Singh Lilhore 2017-02-15 11:37:26 -08:00
Jing Zhao 627da6f717 HDFS-8498. Blocks can be committed with wrong size. Contributed by Jing Zhao. 2017-02-15 10:44:37 -08:00
Wei-Chiu Chuang 859bd159ae HDFS-11333. Print a user friendly error message when plugins are not found. Contributed by Wei-Chiu Chuang. 2017-02-15 02:50:35 -08:00
Akira Ajisaka 8acb376c9c HDFS-11238. Fix checkstyle warnings in NameNode#createNameNode. Contributed by Ethan Li. 2017-02-15 16:53:50 +09:00
Yongjun Zhang 8e53f2b9b0 HDFS-11391. Numeric usernames do no work with WebHDFS FS write access. (Pierre Villard via Yongjun Zhang) 2017-02-14 13:40:53 -08:00
Xiaoyu Yao aaf2713235 HDFS-11409. DatanodeInfo getNetworkLocation and setNetworkLocation shoud use volatile instead of synchronized. Contributed by Chen Liang. 2017-02-14 12:52:34 -08:00
Wei-Chiu Chuang 0cf5993712 HDFS-11084. Add a regression test for sticky bit support of OIV ReverseXML processor. Contributed by Wei-Chiu Chuang. 2017-02-14 09:11:55 -08:00
Yiqun Lin 4164a2032a HDFS-11408. The config name of balance bandwidth is out of date. Contributed by Yiqun Lin. 2017-02-14 18:57:20 +08:00
Yiqun Lin 719df99c05 HDFS-11407. Document the missing usages of OfflineImageViewer processors. Contributed by Yiqun Lin. 2017-02-14 18:48:08 +08:00
Chris Douglas 4ed33e9ca3 HDFS-11026. Convert BlockTokenIdentifier to use Protobuf. Contributed by Ewan Higgs. 2017-02-13 11:29:18 -08:00
Kihwal Lee 07a5184f74 HDFS-11379. DFSInputStream may infinite loop requesting block locations. Contributed by Daryn Sharp. 2017-02-10 12:27:08 -06:00
Xiao Chen 2007e0cf2a HDFS-11210. Enhance key rolling to guarantee new KeyVersion is returned from generateEncryptedKeys after a key is rolled. 2017-02-07 20:36:11 -08:00
Xiao Chen 69b23632c4 HDFS-10860. Switch HttpFS from Tomcat to Jetty. Contributed by John Zhuge. 2017-02-07 09:36:55 -08:00
Yiqun Lin 663e683adf HDFS-10219. Change the default value for dfs.namenode.reconstruction.pending.timeout-sec from -1 to 300. Contributed by Yiqun Lin. 2017-02-06 19:19:30 +08:00
Yiqun Lin 9cbbd1eae8 HDFS-11377. Balancer hung due to no available mover threads. Contributed by yunjiong zhao. 2017-02-06 13:15:16 +08:00
Arpit Agarwal e0235842a7 HDFS-11387. Socket reuse address option is not honored in PrivilegedNfsGatewayStarter. Contributed by Mukul Kumar Singh. 2017-02-03 12:28:05 -08:00
Xiao Chen 0914fcca31 HDFS-11363. Need more diagnosis info when seeing Slow waitForAckedSeqno. 2017-02-02 10:08:27 -08:00
Yiqun Lin 3433f572fa HDFS-11353. Improve the unit tests relevant to DataNode volume failure testing. Contributed by Yiqun Lin. 2017-02-02 19:38:17 +08:00
Arpit Agarwal 6aa09dc28a HDFS-11112. Journal Nodes should refuse to format non-empty directories. Contributed by Yiqun Lin. 2017-02-01 16:51:58 -08:00
Jing Zhao b6f290d5b6 HDFS-11370. Optimize NamenodeFsck#getReplicaInfo. Contributed Takanobu Asanuma. 2017-02-01 11:21:35 -08:00
Chris Douglas 59c5f18784 HADOOP-13895. Make FileStatus Serializable 2017-02-01 10:19:36 -08:00
Lei Xu bec9b7aa1d HDFS-11335. Remove HdfsClientConfigKeys.DFS_CLIENT_SLOW_IO_WARNING_THRESHOLD_KEY usage from DNConf. (Manoj Govindassamy via lei) 2017-02-01 14:42:51 +08:00
Ming Ma 312b36d113 HDFS-11378. Verify multiple DataNodes can be decommissioned/maintenance at the same time. (Manoj Govindassamy via mingma) 2017-01-27 16:16:42 -08:00
Arpit Agarwal 7bc333ad41 HDFS-11374. Skip FSync in CreateEditsLog to speed up edit log generation. Contributed by Hanisha Koneru. 2017-01-26 16:21:25 -08:00
Masatake Iwasaki 55c9f6d747 HDFS-9884. Use doxia macro to generate in-page TOC of HDFS site documentation. (iwasakims) 2017-01-27 08:06:39 +09:00
Xiao Chen 88da9f6b67 Revert "HDFS-8377. Support HTTP/2 in datanode. Contributed by Duo Zhang." 
This reverts commit ada233b7cd.
 2017-01-26 13:42:50 -08:00
Xiao Chen 44606aa850 HDFS-11364. Add a test to verify Audit log entries for setfacl/getfacl commands over FS shell. Contributed by Manoj Govindassamy. 2017-01-26 10:48:26 -08:00
Arpit Agarwal 7c1cc30b3c HDFS-11369. Change exception message in StorageLocationChecker. 2017-01-26 09:12:38 -08:00
Andrew Wang ff02bdfe65 Add CHANGES, RELEASENOTES, and jdiff for 3.0.0-alpha2 release. 2017-01-25 15:39:40 -08:00
Jing Zhao b782bf2156 HDFS-11124. Report blockIds of internal blocks for EC files in Fsck. Contributed by Takanobu Asanuma. 2017-01-25 11:16:17 -08:00
Zhe Zhang 18e1d68209 HDFS-10534. NameNode WebUI should display DataNode usage histogram. Contributed by Kai Sasaki. 2017-01-25 09:58:39 -08:00
Jitendra Pandey 5a5652098c HDFS-11365. Log portnumber in PrivilegedNfsGatewayStarter. Contributed by Mukul Kumar Singh. 2017-01-24 21:58:02 -08:00
Arpit Agarwal b57368b6f8 HDFS-11194. Maintain aggregated peer performance metrics on NameNode. 2017-01-24 16:58:20 -08:00
Wei-Chiu Chuang 355b907c09 HDFS-11121. Add assertions to BlockInfo#addStorage to protect from breaking reportedBlock-blockGroup mapping. Contributed by Takanobu Asanuma. 2017-01-21 05:56:22 +08:00
Ming Ma f3fb94be05 HDFS-11296. Maintenance state expiry should be an epoch time and not jvm monotonic. (Manoj Govindassamy via mingma) 2017-01-19 22:31:15 -08:00
Andrew Wang 5d8b80ea9b Preparing for 3.0.0-alpha3 development 2017-01-19 15:50:07 -08:00
Lei Xu 78ae2aed8f HDFS-11259. Update fsck to display maintenance state info. (Manoj Govindassamy via lei) 2017-01-19 16:28:31 +08:00
Andrew Wang a8f1c7f542 HDFS-110268. Correctly reconstruct erasure coding file from FSImage. Contributed by SammiChen. 2017-01-19 00:24:11 -08:00
Lei Xu 63320d1daa HDFS-11287. Storage class member storageDirs should be private to avoid unprotected access by derived classes. (Manoj Govindassamy via lei) 2017-01-19 15:38:20 +08:00
Yiqun Lin 724bb86351 HDFS-11316. TestDataNodeVolumeFailure#testUnderReplicationAfterVolFailure fails in trunk. Contributed by Yiqun Lin. 2017-01-19 12:05:13 +08:00
Allen Wittenauer 0eb4b513b7 HADOOP-13673. Update scripts to be smarter when running with privilege 
Signed-off-by: Andrew Wang <wang@apache.org>
Signed-off-by: Ravi Prakash <raviprak@apache.org>
 2017-01-18 14:39:05 -08:00
Andrew Wang a2a5d7b5bc HDFS-10759. Change fsimage bool isStriped from boolean to an enum. Contributed by Ewan Higgs. 2017-01-18 13:31:05 -08:00
Vinitha Reddy Gankidi 8a0fa0f7e8 HDFS-10733. NameNode terminated after full GC thinking QJM is unresponsive. Contributed by Vinitha Gankidi. 2017-01-18 12:46:32 -08:00
Akira Ajisaka 9130af3f74 HADOOP-13955. Replace deprecated HttpServer2 and SSLFactory constants. Contributed by John Zhuge. 2017-01-18 18:11:33 +09:00
Akira Ajisaka b1a9ec856b HDFS-11290. TestFSNameSystemMBean should wait until JMX cache is cleared. Contributed by Erik Krogen. 2017-01-18 17:54:33 +09:00
Xiaoyu Yao b1fce2b8b1 HDFS-11209. SNN can't checkpoint when rolling upgrade is not finalized. Contributed by Xiaoyu Yao. 2017-01-17 14:33:26 -08:00
Arpit Agarwal 89bb05d92b HDFS-11339. Fix import. 2017-01-16 23:05:28 -08:00
Akira Ajisaka e407449ddb HADOOP-13933. Add haadmin -getAllServiceState option to get the HA state of all the NameNodes/ResourceManagers. Contributed by Surendra Singh Lilhore. 2017-01-17 10:10:23 +09:00
Jitendra Pandey d1d0b3e1fd HDFS-11307. The rpc to portmap service for NFS has hardcoded timeout. Contributed by Mukul Kumar Singh. 2017-01-16 14:53:53 -08:00
Arpit Agarwal 79e939d0b8 HDFS-11339. Support File IO sampling for Datanode IO profiling hooks. Contributed by Hanisha Koneru. 2017-01-16 14:43:29 -08:00
Arpit Agarwal a853b4e1b5 HDFS-11342. Fix FileInputStream leak in loadLastPartialChunkChecksum. Contributed by Chen Liang. 2017-01-16 13:45:22 -08:00
Lei Xu 2f8e9b7e4b Revert "HDFS-11259. Update fsck to display maintenance state info. (Manoj Govindassamy via lei)" 
This reverts commit c18590fce2.
 2017-01-16 15:11:53 +08:00
Anu Engineer 2604e82eba HDFS-11344. The default value of the setting dfs.disk.balancer.block.tolerance.percent is different. Contributed by Yiqun Lin. 2017-01-13 22:38:46 -08:00
Wei-Chiu Chuang 1cde954a4f HDFS-11306. Print remaining edit logs from buffer if edit log can't be rolled. Contributed by Wei-Chiu Chuang. 2017-01-13 11:46:30 -08:00
Andrew Wang 5f336512d0 HADOOP-13961. Fix compilation failure from missing hadoop-kms test jar. Contributed by Sangjin Lee and John Zhuge. 2017-01-11 15:48:50 -08:00
Andrew Wang d51f8ba808 HDFS-11312. Fix incompatible tag number change for nonDfsUsed in DatanodeInfoProto. Contributed by Sean Mackrory. 2017-01-11 15:13:27 -08:00
Brahma Reddy Battula a5ec1e31a3 HDFS-9935. Remove LEASE_{SOFTLIMIT,HARDLIMIT}_PERIOD and unused import from HdfsServerConstants. Contributed Yiqun Lin. 2017-01-11 19:34:01 +05:30
Ming Ma 467f5f1735 HDFS-9391. Update webUI/JMX to display maintenance state info. (Manoj Govindassamy via mingma) 2017-01-10 20:12:42 -08:00
Andrew Wang e69231658d HDFS-11072. Add ability to unset and change directory EC policy. Contributed by Sammi Chen. 2017-01-10 11:32:48 -08:00
Arpit Agarwal 4046794a53 HDFS-11299. Support multiple Datanode File IO hooks. Contributed by Hanisha Koneru. 2017-01-10 10:43:11 -08:00
Lei Xu c18590fce2 HDFS-11259. Update fsck to display maintenance state info. (Manoj Govindassamy via lei) 2017-01-10 19:37:58 +08:00
Jing Zhao 7ec609b289 HDFS-11273. Move TransferFsImage#doGetUrl function to a Util class. Contributed by Hanisha Koneru. 2017-01-09 18:05:33 -08:00
Yongjun Zhang 603cbcd513 HDFS-11292. log lastWrittenTxId etc info in logSyncAll. Contributed by Yongjun Zhang. 2017-01-09 15:44:42 -08:00
Arpit Agarwal 91bf504440 HDFS-11301. Double wrapping over RandomAccessFile in LocalReplicaInPipeline#createStreams. Contributed by Hanisha Koneru. 2017-01-09 10:32:18 -08:00
Chris Nauroth 4c8f9e1302 HDFS-9483. Documentation does not cover use of "swebhdfs" as URL scheme for SSL-secured WebHDFS. Contributed by Surendra Singh Lilhore. 2017-01-05 15:04:47 -08:00
Haohui Mai a605ff36a5 HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao. 2017-01-04 21:01:23 -08:00
Xiaoyu Yao 87bb1c49bb HDFS-11279. Cleanup unused DataNode#checkDiskErrorAsync(). Contributed by Hanisha Koneru 2017-01-03 18:25:46 -08:00
Andrew Wang 7fcc73fc0d HDFS-11156. Add new op GETFILEBLOCKLOCATIONS to WebHDFS REST API. Contributed by Weiwei Yang. 2017-01-03 09:58:00 -08:00
Brahma Reddy Battula b31e1951e0 Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao." 
This reverts commit b811a1c14d.
 2017-01-03 19:19:29 +05:30
Haohui Mai b811a1c14d HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao. 2016-12-30 22:17:49 -08:00
Xiao Chen e769957556 HDFS-11275. Check groupEntryIndex and throw a helpful exception on failures when removing ACL. 2016-12-29 10:36:50 -08:00
Lei Xu a4f66655ec HDFS-11267. Avoid redefinition of storageDirs in NNStorage and cleanup its accessors in Storage. (Manoj Govindassamy via lei) 2016-12-29 16:57:40 +08:00
Lei Xu e9f1396834 HDFS-11251. ConcurrentModificationException during DataNode#refreshVolumes. (Manoj Govindassamy via lei) 2016-12-29 15:11:25 +08:00
Xiaoyu Yao 603f3ef138 HDFS-11274. Datanode should only check the failed volume upon IO errors. Contributed by Xiaoyu Yao. 2016-12-28 22:08:13 -08:00
Daniel Templeton ce3613c965 HDFS-11278. Add missing @Test annotation for TestSafeMode.testSafeModeUtils() (Contributed by Lukas Majercak via Daniel Templeton) 2016-12-28 20:09:00 -08:00
Brahma Reddy Battula 0ddb8defad HDFS-11252. TestFileTruncate#testTruncateWithDataNodesRestartImmediately can fail with BindException. Contributed by Yiqun Lin. 2016-12-28 10:34:33 +05:30
Daniel Templeton e216e8e233 HADOOP-13932. Fix indefinite article in comments (Contributed by LiXin Ge via Daniel Templeton) 2016-12-27 13:03:16 -08:00
Mingliang Liu c0e0ef2969 HDFS-11270. Document the missing options of NameNode bootstrap command. Contributed by Yiqun Lin 2016-12-27 11:21:10 -08:00
Akira Ajisaka ea547529cb HDFS-11272. Refine the assert messages in TestFSDirAttrOp. Contributed by Jimmy Xiang. 2016-12-26 17:15:45 +09:00
Akira Ajisaka 8f218ea284 HDFS-11250. Fix a typo in ReplicaUnderRecovery#setRecoveryID. Contributed by Yiqun Lin. 2016-12-26 16:51:29 +09:00
Akira Ajisaka 483cd06ad4 HDFS-11271. Typo in NameNode UI. Contributed by Wei-Chiu Chuang. 2016-12-26 16:36:54 +09:00
Xiaoyu Yao 4e9029653d HDFS-10917. Collect peer performance statistics on DataNode. Contributed by Xiaobing Zhou. 2016-12-22 23:46:58 -08:00
Kai Zheng 56a13a6a59 HDFS-11216. Add remoteBytesRead counter metrics for erasure coding reconstruction task. Contributed by Sammi Chen 2016-12-22 14:18:54 +08:00
Haohui Mai f6e80acd68 HDFS-11258. File mtime change could not save to editlog. Contributed by Jimmy Xiang. 2016-12-21 13:04:03 -08:00
Xiaoyu Yao f678080dbd HDFS-11182. Update DataNode to use DatasetVolumeChecker. Contributed by Arpit Agarwal. 2016-12-20 13:53:32 -08:00
Xiaoyu Yao 5daa8d8631 HDFS-10913. Introduce fault injectors to simulate slow mirrors. Contributed by Xiaobing Zhou. 2016-12-20 13:17:52 -08:00
Xiao Chen 4af66b1d66 HDFS-11247. Add a test to verify NameNodeMXBean#getDecomNodes() and Live/Dead Decom Nodes shown in NameNode WebUI. Contributed by Manoj Govindassamy. 2016-12-20 12:42:13 -08:00
Xiao Chen 5b7acdd206 HDFS-11195. Return error when appending files by webhdfs rest api fails. Contributed by Yuanbo Liu. 2016-12-20 12:24:00 -08:00
Brahma Reddy Battula 1b401f6a73 HDFS-11263. ClassCastException when we use Bzipcodec for Fsimage compression. Contributed by Brahma Reddy Battula. 2016-12-20 20:54:03 +05:30
Xiaoyu Yao fe4ff64a4a HDFS-10959. Adding per disk IO statistics and metrics in DataNode. Contributed by Xiaoyu Yao. 2016-12-19 22:42:54 -08:00
Akira Ajisaka d2026ae9e6 HDFS-11262. Remove unused variables in FSImage.java. Contributed by Jagadesh Kiran N. 2016-12-20 14:34:35 +09:00
Anu Engineer a95639068c HDFS-9911. TestDataNodeLifeline Fails intermittently. Contributed by Yiqun Lin 2016-12-16 09:46:21 -08:00
Xiao Chen cee0c468b0 HDFS-11188. Change min supported DN and NN versions back to 2.x. Contributed by Andrew Wang. 2016-12-15 16:48:50 -08:00
Wei-Chiu Chuang aebb9127ba HDFS-11160. VolumeScanner reports write-in-progress replicas as corrupt incorrectly. Contributed by Wei-Chiu Chuang and Yongjun Zhang. 2016-12-15 16:32:50 -08:00
Mingliang Liu 6fce191549 HDFS-11253. FileInputStream leak on failure path in BlockSender. Contributed by Arpit Agarwal 2016-12-15 15:39:15 -08:00
Mingliang Liu ac0d402c6a HDFS-11094. Send back HAState along with NamespaceInfo during a versionRequest as an optional parameter. Contributed by Eric Badger 2016-12-15 14:53:53 -08:00
Akira Ajisaka 36947f79ba HDFS-11249. Redundant toString() in DFSConfigKeys.java. Contributed by Jagadesh Kiran N. 2016-12-16 00:33:27 +09:00
Arpit Agarwal 6ba9587d37 HDFS-10958. Add instrumentation hooks around Datanode disk IO. 2016-12-14 11:18:58 -08:00
Akira Ajisaka 72bff192cd HDFS-11204. Document the missing options of hdfs zkfc command. Contributed by Yiqun Lin. 2016-12-14 18:50:43 +09:00
Kai Zheng 1f14f6d038 HDFS-8411. Add bytes count metrics to datanode for ECWorker. Contributed by Sammi Chen and Andrew Wang 2016-12-14 14:50:50 +08:00
Andrew Wang fbdbbd57cd HDFS-10684. WebHDFS DataNode calls fail without parameter createparent. Contributed by John Zhuge. 2016-12-13 18:01:31 -08:00
Uma Maheswara Rao G e24a923db5 HDFS-11164: Mover should avoid unnecessary retries if the block is pinned. Contributed by Rakesh R 2016-12-13 17:09:58 -08:00
Mingliang Liu 754f15bae6 HDFS-11226. cacheadmin, cryptoadmin and storagepolicyadmin should support generic options. Contributed by Brahma Reddy Battula 2016-12-12 18:21:15 -08:00
Akira Ajisaka 2d4731c067 HDFS-11233. Fix javac warnings related to the deprecated APIs after upgrading Jackson. Contributed by Yiqun Lin. 2016-12-13 11:11:15 +09:00
Wei-Chiu Chuang 2a28e8cf04 HDFS-11229. HDFS-11056 failed to close meta file. Contributed by Wei-Chiu Chuang. 2016-12-09 16:02:42 -08:00
Andrew Wang 5bd7dece92 HDFS-11217. Annotate NameNode and DataNode MXBean interfaces as Private/Stable. Contributed by Jagadesh Kiran N. 2016-12-09 12:05:42 -08:00
Vinayakumar B d1d4aba71b HDFS-11224. Lifeline message should be ignored for dead nodes (Contributed by Vinayakumar B) 2016-12-09 14:53:50 +05:30
Kihwal Lee 13d8e552d2 Revert "HDFS-5079. Cleaning up NNHAStatusHeartbeat.State from DatanodeProtocolProtos. Contributed by Tao Luo." 
This reverts commit 4c8db60092.

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
 2016-12-08 15:41:49 -06:00
Kihwal Lee 9f8344db50 Revert "HDFS-11094. Send back HAState along with NamespaceInfo during a versionRequest as an optional parameter. Contributed by Eric Badger" 
This reverts commit 8c4680852b.
 2016-12-08 15:36:08 -06:00
Xiao Chen 401c731872 HDFS-11197. Listing encryption zones fails when deleting a EZ that is on a snapshotted directory. Contributed by Wellington Chevreuil. 2016-12-08 12:40:20 -08:00
Akira Ajisaka 4c2cf5560f HDFS-11223. Fix typos in HttpFs documentations. Contributed by Yiqun Lin. 2016-12-08 20:52:24 +09:00
Akira Ajisaka 9ef89ede2f HDFS-11140. Directory Scanner should log startup message time correctly. Contributed by Yiqun Lin. 2016-12-08 13:38:02 +09:00
Akira Ajisaka deb4743b2c Revert "HDFS-11140. Directory Scanner should log startup message time correctly. Contributed by Yiqun Lin." 
This reverts commit 0857641f62.
 2016-12-08 13:37:06 +09:00
Akira Ajisaka 0857641f62 HDFS-11140. Directory Scanner should log startup message time correctly. Contributed by Yiqun Lin. 2016-12-08 13:34:45 +09:00
Andrew Wang ea2895f4ed HDFS-8630. WebHDFS : Support get/set/unset StoragePolicy. Contributed by Surendra Singh Lilhore. 2016-12-07 15:52:16 -08:00
Ming Ma c73e08a6da HDFS-10206. Datanodes not sorted properly by distance when the reader isn't a datanode. (Nandakumar via mingma) 2016-12-07 08:26:09 -08:00
Karthik Kambatla c8d0a049b0 HADOOP-13859. TestConfigurationFieldsBase fails for fields that are DEFAULT values of skipped properties. (Haibo Chen via kasha) 2016-12-06 14:10:58 -08:00
Andrew Wang f53b481ffe HDFS-11172. Support an erasure coding policy using RS 10 + 4. Contributed by Wei Zhou. 2016-12-06 12:49:38 -08:00
Xiaoyu Yao df983b524a HDFS-10930. Refactor: Wrap Datanode IO related operations. Contributed by Xiaoyu Yao. 2016-12-06 11:05:47 -08:00
Mingliang Liu 43cb1678cc HDFS-11211. Add a time unit to the DataNode client trace format. Contributed by Jagadesh Kiran N 2016-12-06 09:12:11 -08:00
Brahma Reddy Battula ed89856755 HDFS-11178. TestAddStripedBlockInFBR#testAddBlockInFullBlockReport fails frequently in trunk. Contributed By Yiqun Lin. 2016-12-06 22:30:43 +05:30
Kihwal Lee 4dd4f3a4bb HDFS-11198. NN UI should link DN web address using hostnames. Contributed by Weiwei Yang. 2016-12-06 08:06:50 -06:00
Andrew Wang 08a7253bc0 Revert "HDFS-11156. Add new op GETFILEBLOCKLOCATIONS to WebHDFS REST API. Contributed by Weiwei Yang" 
This reverts commit c7ff34f8dc.
 2016-12-05 23:09:35 -08:00
Andrew Wang 8e63fa98ea HDFS-10581. Hide redundant table on NameNode WebUI when no nodes are decomissioning. Contributed by Weiwei Yang. 2016-12-05 18:13:53 -08:00
Xiaoyu Yao dcedb72af4 Revert "HADOOP-10930. Refactor: Wrap Datanode IO related operations. Contributed by Xiaoyu Yao." 
This reverts commit aeecfa24f4.
 2016-12-05 12:44:20 -08:00
Mingliang Liu 8c4680852b HDFS-11094. Send back HAState along with NamespaceInfo during a versionRequest as an optional parameter. Contributed by Eric Badger 2016-12-05 11:48:58 -08:00
Wei-Chiu Chuang 1b5cceaffb Revert "HDFS-11201. Spelling errors in the logging, help, assertions and exception messages. Contributed by Grant Sohn." 
This reverts commit b9522e86a5.
 2016-12-05 10:54:43 -08:00
Wei-Chiu Chuang b9522e86a5 HDFS-11201. Spelling errors in the logging, help, assertions and exception messages. Contributed by Grant Sohn. 2016-12-05 10:48:25 -08:00
Wei-Chiu Chuang c51bfd29cd HDFS-11181. Fuse wrapper has a typo. Contributed by Wei-Chiu Chuang. 2016-12-05 08:44:40 -08:00
Mingliang Liu c7ff34f8dc HDFS-11156. Add new op GETFILEBLOCKLOCATIONS to WebHDFS REST API. Contributed by Weiwei Yang 2016-12-02 11:10:13 -08:00
Kihwal Lee 96c574927a HDFS-8674. Improve performance of postponed block scans. Contributed by Daryn Sharp. 2016-12-01 12:11:27 -06:00