Commit Graph

4294 Commits

Author SHA1 Message Date
Kihwal Lee 2551ff80b7 HDFS-10851. FSDirStatAndListingOp: stop passing path as string. Contributed by Daryn Sharp. 2016-09-30 15:59:40 -05:00
Zhe Zhang dfca0f4abb HDFS-10896. Move lock logging logic from FSNamesystem into FSNamesystemLock. Contributed by Erik Krogen.
(cherry-picked from commit 434c5ea75d)
2016-09-30 13:30:31 -07:00
Kihwal Lee 10222cd54e HDFS-10850. getEZForPath should NOT throw FNF. Contributed by Andrew Wang.
(cherry picked from commit 0670149c88)
2016-09-30 08:58:38 -05:00
Mingliang Liu a7c1636296 HDFS-10892. Add unit tests for HDFS command 'dfs -tail' and 'dfs -stat'. Contributed by Mingliang Liu
(cherry picked from commit 84c6264079)
2016-09-28 16:09:09 -07:00
Andrew Wang b12f004474 HDFS-10914. Move remnants of oah.hdfs.client to hadoop-hdfs-client.
(cherry picked from commit 92e5e91598)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/HdfsAdmin.java
2016-09-28 16:03:16 -07:00
Kihwal Lee 087c61192d HDFS-10779. Rename does not need to re-solve destination. Contributed by Daryn Sharp.
(cherry picked from commit 5f34402ada)
2016-09-28 17:58:53 -05:00
Arpit Agarwal 50888471d9 HDFS-10824. MiniDFSCluster#storageCapacities has no effects on real capacity. Contributed by Xiaobing Zhou. 2016-09-28 15:56:08 -07:00
Brahma Reddy Battula e9a34ae29c HDFS-9444. Add utility to find set of available ephemeral ports to ServerSocketUtil. Contributed by Masatake Iwasaki 2016-09-28 10:50:50 +05:30
Mingliang Liu 54ca505c41 HDFS-10915. Fix time measurement bug in TestDatanodeRestart. Contributed by Xiaobing Zhou
(cherry picked from commit 6437ba18c5)
2016-09-27 20:42:47 -07:00
Wangda Tan 269401dc83 HADOOP-13544. JDiff reports unncessarily show unannotated APIs and cause confusion while our javadocs only show annotated and public APIs. (vinodkv via wangda)
(cherry picked from commit 875062b5bc)
2016-09-27 11:27:25 -07:00
Arpit Agarwal 80628ee2c3 HDFS-10828. Fix usage of FsDatasetImpl object lock in ReplicaMap. (Arpit Agarwal) 2016-09-27 10:02:22 -07:00
Masatake Iwasaki d17f03b625 HDFS-10426. TestPendingInvalidateBlock failed in trunk. Contributed by Yiqun Lin.
(cherry picked from commit f55eb981dd)
2016-09-28 01:40:55 +09:00
Arpit Agarwal b3c0656e90 HDFS-10713. Throttle FsNameSystem lock warnings. Contributed by Hanisha Koneru. 2016-09-27 09:00:39 -07:00
Brahma Reddy Battula 61368c8039 HDFS-10889. Remove outdated Fault Injection Framework documentaion. Contributed by Brahma Reddy Battula
(cherry picked from commit df1d0f5d56)
2016-09-27 19:34:38 +05:30
Arpit Agarwal 809a45a60c HDFS-9895. Remove unnecessary conf cache from DataNode. Contributed by Xiaobing Zhou. 2016-09-26 19:24:16 -07:00
Wei-Chiu Chuang bde787db23 HDFS-10609. Uncaught InvalidEncryptionKeyException during pipeline recovery may abort downstream applications. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 3ae652f821)
2016-09-26 14:44:48 -07:00
Brahma Reddy Battula 74962e3451 HDFS-10869. Remove the unused method InodeId#checkId(). Contributed by Jagadesh Kiran N
(cherry picked from commit 3e37e243ee)
2016-09-25 11:04:30 +05:30
Wei-Chiu Chuang 6c98455728 HDFS-10876. Dispatcher#dispatch should log IOException stacktrace. Contributed by Manoj Govindassamy.
(cherry picked from commit 74b3dd514c)
2016-09-23 13:28:18 -07:00
Konstantin V Shvachko c872ecaab4 HDFS-10843. Update space quota when a UC block is completed rather than committed. Contributed by Erik Krogen.
(cherry picked from commit a5bb88c8e0)
2016-09-23 10:40:09 -07:00
Brahma Reddy Battula 347131fe8d HDFS-10886. Replace fs.default.name with fs.defaultFS in viewfs document.
(cherry picked from commit bbdf350ff9)
2016-09-23 19:32:37 +05:30
Masatake Iwasaki 1b91ebb714 HDFS-9333. Some tests using MiniDFSCluster errored complaining port in use. (iwasakims)
(cherry picked from commit 964e546ab1)

 Conflicts:
  hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFSStriped.java
2016-09-21 10:40:56 +09:00
Xiao Chen 81df2be017 HDFS-10879. TestEncryptionZonesWithKMS#testReadWrite fails intermittently. Contributed by Xiao Chen.
(cherry picked from commit d31bef575478fe78c0600fb602e117e4b81c9887)
2016-09-20 16:57:34 -07:00
Xiao Chen 4e376f162f HDFS-10875. Optimize du -x to cache intermediate result. Contributed by Xiao Chen.
(cherry picked from commit e52d6e7a46)
2016-09-19 21:45:05 -07:00
Xiao Chen b6a60d715d HDFS-10489. Deprecate dfs.encryption.key.provider.uri for HDFS encryption zones. Contributed by Xiao Chen.
(cherry picked from commit ea839bd48e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
2016-09-19 16:38:18 -07:00
Akira Ajisaka 214b6d16d5 HDFS-10862. Typos in 4 log messages. Contributed by Mehran Hassani.
(cherry picked from commit b09a03cd7d)
2016-09-16 16:12:19 +09:00
Arpit Agarwal 853e1e6946 HDFS-10805. Reduce runtime for append test. Contributed by Gergely Novak. 2016-09-14 09:31:24 -07:00
Andrew Wang abaad976cd HDFS-10837. Standardize serializiation of WebHDFS DirectoryListing.
(cherry picked from commit db6d243cf8)
2016-09-13 11:02:43 -07:00
Akira Ajisaka 764cf431ca HDFS-10856. Update the comment of BPServiceActor$Scheduler#scheduleNextBlockReport. Contributed by Yiqun Lin.
(cherry picked from commit f0876b8b60)
2016-09-13 14:51:04 +09:00
Yongjun Zhang 223ce108a1 HDFS-10657. testAclCLI.xml setfacl test should expect mask r-x. (John Zhuge via Yongjun Zhang)
(cherry picked from commit d2466ec3e0)
2016-09-12 21:46:09 -07:00
Arpit Agarwal 6948691ad1 HDFS-10830. FsDatasetImpl#removeVolumes crashes with IllegalMonitorStateException when vol being removed is in use. (Arpit Agarwal and Manoj Govindassamy) 2016-09-10 18:22:15 -07:00
Arpit Agarwal 012b266e5e HDFS-10742. Measure lock time in FsDatasetImpl. Contributed by Chen Liang. 2016-09-10 18:04:00 -07:00
Arpit Agarwal ad0ac6cced HDFS-10682. Replace FsDatasetImpl object lock with a separate lock object. (Contributed by Chen Liang) 2016-09-10 17:48:27 -07:00
Xiao Chen bb6d866207 HDFS-9781. FsDatasetImpl#getBlockReports can occasionally throw NullPointerException. Contributed by Manoj Govindassamy. 2016-09-09 18:25:35 -07:00
Akira Ajisaka c0756dfef6 HDFS-10847. Complete the document for FileDistribution processor in OfflineImageViewer. Contributed by Yiqun Lin.
(cherry picked from commit 20a20c2f6e)
2016-09-09 01:35:36 +09:00
Akira Ajisaka fe6dd66174 HDFS-10778. Add -format option to make the output of FileDistribution processor human-readable in OfflineImageViewer.
(cherry picked from commit 63f594892e)
2016-09-08 15:18:25 +09:00
Arpit Agarwal f9415b7a7e HDFS-9038. DFS reserved space is erroneously counted towards non-DFS used. (Brahma Reddy Battula) 2016-09-06 13:44:22 -07:00
Xiao Chen 3025992bd3 HDFS-10841. Remove duplicate or unused variable in appendFile(). Contributed by Kihwal Lee.
(cherry picked from commit f6c0b7543f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAppendOp.java
2016-09-06 11:52:30 -07:00
Andrew Wang 40eab77562 HDFS-10833. Fix JSON errors in WebHDFS.md examples.
(cherry picked from commit cbd909ce2a)
2016-09-02 14:50:41 -07:00
Allen Wittenauer b1466b8124 HDFS-9877. HDFS Namenode UI: Fix browsing directories that need to be encoded (Ravi Prakash via aw)
(cherry picked from commit 15f018434c)
2016-09-01 14:24:13 -07:00
Allen Wittenauer b9eedc24a6 HDFS-7987. Allow files / directories to be moved (Ravi Prakash via aw)
(cherry picked from commit d44f4745b4)
2016-09-01 14:23:42 -07:00
Allen Wittenauer 743c0ebd67 HDFS-7767. Use the noredirect flag in WebHDFS to allow web browsers to upload files via the NN UI (Ravi Prakash via aw)
(cherry picked from commit 99a771cd7a)
2016-09-01 14:22:23 -07:00
Zhe Zhang 776eccd873 Addendum fix for HDFS-10817 to fix failure of the added testFSReadLockLongHoldingReport in branch-2.
(cherry picked from commit 6c600360ca)
2016-08-31 23:44:54 -07:00
Zhe Zhang f87e2f5d05 HDFS-10817. Add Logging for Long-held NN Read Locks. Contributed by Erik Krogen.
(cherry picked from commit 6f4b0d33ca)
2016-08-31 15:54:03 -07:00
Andrew Wang 72d90cbe32 HDFS-10784. Implement WebHdfsFileSystem#listStatusIterator.
(cherry picked from commit 85bab5fb57)
2016-08-31 14:33:14 -07:00
Allen Wittenauer 72334a4be3 HDFS-7766. Add a flag to WebHDFS op=CREATE to not respond with a 307 redirect (Ravi Prakash via aw)
(cherry picked from commit 4b0f55b6ea)
2016-08-31 14:33:10 -07:00
Kihwal Lee 34042ccbb9 HDFS-10729. Improve log message for edit loading failures caused by FS limit checks. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 01721dd88e)
2016-08-31 14:09:23 -05:00
Ming Ma 56c9a96a76 HDFS-9392. Admins support for maintenance state. Contributed by Ming Ma.
(cherry picked from commit 9dcbdbdb5a)
2016-08-30 14:09:18 -07:00
Wei-Chiu Chuang abbd95b790 HDFS-10760. DataXceiver#run() should not log InvalidToken exception as an error. Contributed by Pan Yuxuan.
(cherry picked from commit c4ee6915a1)
2016-08-30 10:44:27 -07:00
Zhe Zhang 320be1b3c6 HDFS-10814. Add assertion for getNumEncryptionZones when no EZ is created. Contributed by Vinitha Reddy Gankidi.
(cherry picked from commit 4bd45f54ee)
2016-08-29 23:42:46 -07:00
Xiao Chen 72863f0049 HDFS-4210. Throw helpful exception when DNS entry for JournalNode cannot be resolved. Contributed by Charles Lamb and John Zhuge.
(cherry picked from commit 046f6bf0f944311fc70de3a96fc6ab8211cbbbd8)
2016-08-29 17:48:49 -07:00
Yongjun Zhang 4bed2a4b9c HDFS-10625. VolumeScanner to report why a block is found bad. Contributed by Rushabh S Shah and Yiqun Lin.
(cherry picked from commit 5d1609ddf2)
2016-08-29 14:08:36 -07:00
Mingliang Liu 875c14004d HDFS-10807. Doc about upgrading to a version of HDFS with snapshots may be confusing. (Contributed by Mingliang Liu)
(cherry picked from commit 6742fb6e68)
2016-08-29 10:19:33 -07:00
Yongjun Zhang e813a3ea4a HDFS-10652. Add a unit test for HDFS-4660. Contributed by Vinayakumar B., Wei-Chiu Chuang, Yongjun Zhang.
(cherry picked from commit c25817159a)
2016-08-27 22:59:19 -07:00
Andrew Wang 1c47a356d8 HDFS-10793. Fix HdfsAuditLogger binary incompatibility introduced by HDFS-9184. Contributed by Manoj Govindassamy.
(cherry picked from commit a445b82baa)
2016-08-26 15:40:05 -07:00
Zhe Zhang f3a4cbcc60 HDFS-10798. Make the threshold of reporting FSNamesystem lock contention configurable. Contributed by Erik Krogen.
(cherry picked from commit 407b519fb1)
2016-08-26 14:20:48 -07:00
Kihwal Lee 442dfd1bbe HDFS-10768. Optimize mkdir ops. Contributed by Daryn Sharp.
(cherry picked from commit 8b7adf4ddf)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
2016-08-26 15:49:56 -05:00
Kihwal Lee 2a6497cc7c HDFS-8915. TestFSNamesystem.testFSLockGetWaiterCount fails intermittently. Contributed by Masatake Iwasaki.
(cherry picked from commit 13fb1b50e6)
2016-08-26 10:00:36 -05:00
Xiaoyu Yao fc67501393 HDFS-10748. TestFileTruncate#testTruncateWithDataNodesRestart runs sometimes timeout. Contributed by Yiqun Lin.
(cherry picked from commit 4da5000dd3)
2016-08-25 09:22:02 -07:00
Kihwal Lee ba3257baf5 HDFS-10772. Reduce byte/string conversions for get listing. Contributed by Daryn Sharp.
(cherry picked from commit a1f3293762)
2016-08-24 15:25:33 -05:00
Wei-Chiu Chuang d19e29bd68 HDFS-8986. Add option to -du to calculate directory space usage excluding snapshots. Contributed by Xiao Chen. 2016-08-24 08:49:54 -07:00
Daryn Sharp a30f6a68fa HDFS-10762. Pass IIP for file status related methods
(cherry picked from commit ec252ce0fc)
2016-08-24 08:51:05 -05:00
Jason Lowe 8cd3996246 HDFS-9745. TestSecureNNWithQJM#testSecureMode sometimes fails with timeouts. Contributed by Xiao Chen
(cherry picked from commit 126d165efd)
2016-08-23 14:48:35 +00:00
Akira Ajisaka 94a844b4f6 HDFS-10783. The option '-maxSize' and '-step' fail in OfflineImageViewer. Contributed by Yiqun Lin.
(cherry picked from commit e90f3359de)
2016-08-23 19:58:13 +09:00
Eric Yang 9faacbec2c HDFS-8312. Added permission check for moving file to Trash. (Weiwei Yang via Eric Yang) 2016-08-22 18:32:06 -07:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 8a6a7c82f2 HDFS-10692. Update JDiff report's base version for HDFS from 2.6.0 to 2.7.2. Contributed by Wangda Tan.
(cherry picked from commit dc7a1c54f4)
2016-08-22 11:36:38 -07:00
Akira Ajisaka 62c7d09efa HDFS-10645. Make block report size as a metric and add this metric to datanode web ui. Contributed by Yuanbo Liu. 2016-08-22 14:22:37 +09:00
Jing Zhao fff0418458 HDFS-10764. Fix INodeFile#getBlocks to not return null. Contributed by Arpit Agarwal.
(cherry picked from commit 0faee62a0c)
2016-08-19 22:23:55 -07:00
Kihwal Lee 43d1279df0 HDFS-10711. Optimize FSPermissionChecker group membership check. Contributed by Daryn Sharp.
(cherry picked from commit 2550371f66)
2016-08-19 09:46:30 -05:00
Kihwal Lee 922d045e11 HDFS-10745. Directly resolve paths into INodesInPath. Contributed by Daryn Sharp. 2016-08-18 12:37:57 -05:00
Xiao Chen a20b943cf9 HDFS-10549. Correctly revoke file leases when closing files. Contributed by Yiqun Lin.
(cherry picked from commit 85aacaadb5a3f8c78b191867c0bde09b3c4b3c3c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
2016-08-17 15:50:13 -07:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 2486c4c63a Revert "HDFS-9395. Make HDFS audit logging consistant. Contributed by Kuhu Shukla."
Reverting this on branch-2.* as it's an incompatible change.

This reverts commit 83f7f62be3.
2016-08-17 13:33:09 -07:00
Kihwal Lee 65a41696b2 HDFS-10342. BlockManager#createLocatedBlocks should not check corrupt replicas if none are corrupt. Contributed by Kuhu Shukla.
(cherry picked from commit b10c936020)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
2016-08-16 09:29:42 -05:00
Mingliang Liu 2f4660ce98 HDFS-10641. TestBlockManager#testBlockReportQueueing fails intermittently. (Contributed by Daryn Sharp) 2016-08-15 20:39:12 -07:00
Mingliang Liu 82623ea9c9 HDFS-10747. o.a.h.hdfs.tools.DebugAdmin usage message is misleading. (Contributed by Mingliang Liu) 2016-08-15 20:38:17 -07:00
Mingliang Liu f9a7e59066 HDFS-10678. Documenting NNThroughputBenchmark tool. (Contributed by Mingliang Liu) 2016-08-15 20:37:55 -07:00
Kihwal Lee e78db7d2a4 HDFS-10763. Open files can leak permanently due to inconsistent lease update. Contributed by Kihwal Lee.
(cherry picked from commit 864f878d59)
2016-08-15 17:33:16 -05:00
Kihwal Lee 1ef8d7a638 HDFS-10744. Internally optimize path component resolution. Contributed by Daryn Sharp.
(cherry picked from commit 03dea65e0b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
2016-08-15 17:01:40 -05:00
Kihwal Lee 4766a3153d HDFS-9696. Garbage snapshot records linger forever. Contributed by Kihwal Lee
(cherry picked from commit 83e57e083f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSaveNamespace.java
2016-08-15 13:09:50 -05:00
Wei-Chiu Chuang 20a8ff0a8d HDFS-10731. FSDirectory#verifyMaxDirItems does not log path name. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 9019606b69)
2016-08-12 06:02:47 -07:00
Zhe Zhang 00ff3d737c HDFS-9888. Allow reseting KerberosName in unit tests. Contributed by Xiao Chen.
(cherry picked from commit 3e8099a45a)
2016-08-11 11:32:54 -07:00
Akira Ajisaka 0529da7239 HDFS-10336. TestBalancer failing intermittently because of not reseting UserGroupInformation completely. Contributed by Yiqun Lin.
(cherry picked from commit 932aed64d7)
2016-08-11 10:55:53 -07:00
Zhe Zhang 7d402692b4 HDFS-9804. Allow long-running Balancer to login with keytab. Contributed by Xiao Chen.
(cherry picked from commit ccff6035f5)
2016-08-11 10:53:16 -07:00
Wei-Chiu Chuang f1d5a95cf3 HDFS-8897. Balancer should handle fs.defaultFS trailing slash in HA. Contributed by John Zhuge. 2016-08-10 22:24:21 -07:00
Xiaoyu Yao de6eafc696 HDFS-10643. Namenode should use loginUser(hdfs) to generateEncryptedKey. Contributed by Xiaoyu Yao.
(cherry picked from commit ec289bbece)
2016-08-10 15:55:12 -07:00
Xiaoyu Yao c341280129 Revert "Namenode should use loginUser(hdfs) to generateEncryptedKey. Contributed by Xiaoyu Yao."
This reverts commit 9f816d7ca7.

(cherry picked from commit fdafd0cb4f)
2016-08-10 15:54:59 -07:00
Xiaoyu Yao d583a357f9 Namenode should use loginUser(hdfs) to generateEncryptedKey. Contributed by Xiaoyu Yao.
(cherry picked from commit 9f816d7ca7)
2016-08-10 15:15:51 -07:00
Wei-Chiu Chuang 8efd4959f3 HDFS-8224. Schedule a block for scanning if its metadata file is corrupt. Contributed by Rushabh S Shah. 2016-08-10 11:34:59 -07:00
Yuanbo Liu 44162e555a HDFS-10694. processReport() should print blockReportId in each log message. Contributed by Yuanbo Liu.
(cherry picked from commit 10e84c6a6e)
2016-08-10 11:10:00 -07:00
Kihwal Lee 7f1879abe6 HDFS-10738. Fix TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration test failure. Contributed by Rakesh R.
(cherry picked from commit 0f701f433d)
2016-08-09 14:55:46 -05:00
Lei Xu e7c701586d HDFS-4176. EditLogTailer should call rollEdits with a timeout. (lei) 2016-08-08 16:32:01 -07:00
Lei Xu 9cb6d291ea HDFS-10457. DataNode should not auto-format block pool directory if VERSION is missing. (Wei-Chiu Chuang via lei)
(cherry picked from commit bb3bcb9397593fc8a2fa63a48eba126609f72c42)
2016-08-08 16:19:58 -07:00
Konstantin V Shvachko ab130f97ca HDFS-10693. metaSave should print blocks, not LightWeightHashSet. Contributed by Yuanbo Liu.
(cherry picked from commit 4d3af47f27)
2016-08-07 14:35:35 -07:00
Akira Ajisaka 6863866127 HDFS-10715. NPE when applying AvailableSpaceBlockPlacementPolicy. Contributed by Guangbin Zhu.
(cherry picked from commit ef432579a7)
2016-08-05 17:32:23 +09:00
Kihwal Lee 09b06a6e9e HDFS-10673. Optimize FSPermissionChecker's internal path usage. Contributed by Daryn Sharp.
(cherry picked from commit 438a9f047e)
2016-08-04 16:17:41 -05:00
Kihwal Lee 690ec789f0 HDFS-10343. BlockManager#createLocatedBlocks may return blocks on failed storages. Contributed by Kuhu Shukla.
(cherry picked from commit 57369a678c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
2016-08-04 15:12:21 -05:00
Kihwal Lee 3b2554f3b0 HDFS-10722. Fix race condition in TestEditLog#testBatchedSyncWithClosedLogs. Contributed by Daryn Sharp.
(cherry picked from commit 4a8e6dc02f)
2016-08-04 11:55:52 -05:00
Tsz-Wo Nicholas Sze 5004b0571e In Balancer, the target task should be removed when its size < 0. Contributed by Yiqun Lin 2016-08-04 09:53:15 -07:00
Kihwal Lee 77b61d1f4e HDFS-10662. Optimize UTF8 string/byte conversions. Contributed by Daryn Sharp.
(cherry picked from commit 6ae39199da)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
2016-08-04 09:43:56 -05:00
Kihwal Lee c0166b0743 HDFS-10707. Replace org.apache.commons.io.Charsets with java.nio.charset.StandardCharsets. Contributed by Vincent Poon. 2016-08-04 09:28:30 -05:00
Kihwal Lee 1ca2ab4013 HDFS-10569. A bug causes OutOfIndex error in BlockListAsLongs. Contributed by Weiwei Yang.
(cherry picked from commit 6f63566694)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java
2016-08-03 15:27:03 -05:00
Jing Zhao 180a26d9fb HDFS-10710. In BlockManager#rescanPostponedMisreplicatedBlocks(), postponed misreplicated block counts should be retrieved within the NN lock protection.Contributed by GAO Rui.
(cherry picked from commit f4ba5ff1d7)
2016-08-03 12:42:44 -07:00
Kihwal Lee a5d12d9c1f HDFS-10674. Optimize creating a full path from an inode. Contributed by Daryn Sharp.
(cherry picked from commit 22ef5286bc)
2016-08-03 13:15:28 -05:00
Kihwal Lee c15959fa60 HDFS-742. A down DataNode makes Balancer to hang on repeatingly asking NameNode its partial block list. Contributed by Mit Desai.
(cherry picked from commit 58db263e93)
2016-08-03 12:18:15 -05:00
Kihwal Lee ab7072838f HDFS-10656. Optimize conversion of byte arrays back to path string. Contributed by Daryn Sharp.
(cherry picked from commit bebf10d245)
2016-08-03 11:54:51 -05:00
Kihwal Lee dc0a17e828 HDFS-5805. TestCheckpoint.testCheckpoint fails intermittently on branch-2. Contributed by Eric Badger.
(cherry picked from commit 5e5b8793fb)
2016-08-02 15:39:03 -05:00
Konstantin V Shvachko 24574f0e16 Revert "HDFS-10301. Interleaving processing of storages from repeated block reports causes false zombie storage detection, removes valid blocks. Contributed by Vinitha Gankidi."
This reverts commit 0dde4035c9.
2016-08-01 22:44:32 -07:00
Daryn Sharp 4ad2a73df6 HDFS-10655. Fix path related byte array conversion bugs. (daryn)
(cherry picked from commit 9f473cf903)
2016-08-01 10:17:24 -05:00
Yongjun Zhang f5bc6dd478 HDFS-10703. HA NameNode Web UI should show last checkpoint time. (John Zhuge via Yongjun Zhang)
(cherry picked from commit 8d32bd884d)
2016-07-29 23:39:38 -07:00
Akira Ajisaka 0cff416c35 HDFS-10691. FileDistribution fails in hdfs oiv command due to ArrayIndexOutOfBoundsException. Contributed by Yiqun Lin.
(cherry picked from commit 204a2055b1)
2016-07-29 15:40:59 +09:00
Xiao Chen 24d464a150 HDFS-9276. Failed to Update HDFS Delegation Token for long running application in HA mode. Contributed by Liangliang Gu and John Zhuge
(cherry picked from commit d9aae22fdf)
2016-07-28 16:41:31 -07:00
Xiaoyu Yao f03ad5677a HDFS-10676. Add namenode metric to measure time spent in generating EDEKs. Contributed by Hanisha Koneru. 2016-07-28 16:16:21 -07:00
Akira Ajisaka ab49c2b399 HDFS-10696. TestHDFSCLI fails. Contributed by Kai Sasaki.
(cherry picked from commit 414fbfab41)
2016-07-28 16:59:25 +09:00
Yongjun Zhang bd84cf3036 HDFS-10667. Report more accurate info about data corruption location. (Yuanbo Liu via Yongjun Zhang)
(cherry picked from commit eb7ff0c992)
2016-07-27 15:23:38 -07:00
Brahma Reddy Battula 096d3fa25c HDFS-10668. Fix intermittently failing UT TestDataNodeMXBean#testDataNodeMXBeanBlockCount. Contributed by Mingliang Liu. 2016-07-27 10:28:31 +05:30
Arpit Agarwal c08c7b7a94 HDFS-10642. TestLazyPersistReplicaRecovery#testDnRestartWithSavedReplicas fails intermittently. (Contributed by Mingliang Liu) 2016-07-26 12:44:36 -07:00
Wei-Chiu Chuang 0ee1644e39 HDFS-9937. Update dfsadmin command line help and HdfsQuotaAdminGuide. Contributed by Kai Sasaki.
(cherry picked from commit 25f0a9b3ab)
2016-07-26 08:05:14 -07:00
Steve Loughran e5a4b6cb94 Revert "HDFS-10668. Fix intermittently failing UT TestDataNodeMXBean#testDataNodeMXBeanBlockCount. Contributed by Mingliang Liu."
This reverts commit b3ce778268.
2016-07-26 14:30:31 +01:00
Masatake Iwasaki f4207d0336 HDFS-10671. Fix typo in HdfsRollingUpgrade.md. Contributed by Yiqun Lin.
(cherry picked from commit 59466b8c18)
2016-07-26 19:50:39 +09:00
Brahma Reddy Battula b3ce778268 HDFS-10668. Fix intermittently failing UT TestDataNodeMXBean#testDataNodeMXBeanBlockCount. Contributed by Mingliang Liu.
(cherry picked from commit 7cac7655fd)
2016-07-26 11:02:23 +05:30
Akira Ajisaka a04b193374 Revert "HDFS-10620. StringBuilder created and appended even if logging is disabled. Contributed by Staffan Friberg."
This reverts commit 2685e16f38.
2016-07-26 11:04:05 +09:00
Vinitha Reddy Gankidi 0dde4035c9 HDFS-10301. Interleaving processing of storages from repeated block reports causes false zombie storage detection, removes valid blocks. Contributed by Vinitha Gankidi. 2016-07-25 18:55:00 -07:00
Jing Zhao 30c772fc59 HDFS-10688. BPServiceActor may run into a tight loop for sending block report when hitting IOException. Contributed by Chen Liang.
(cherry picked from commit 0cde9e12a7)
2016-07-25 18:43:25 -07:00
Xiao Chen 1a115ea317 HDFS-10225. DataNode hot swap drives should disallow storage type changes. Contributed by Lei (Eddy) Xu.
(cherry picked from commit 132deb4cac)
2016-07-22 15:04:17 -07:00
Arpit Agarwal 2f1e352912 HDFS-10660. Expose storage policy apis via HDFSAdmin interface. (Contributed by Rakesh R) 2016-07-22 12:12:29 -07:00
Akira Ajisaka 1222889f1a HDFS-10287. MiniDFSCluster should implement AutoCloseable. Contributed by Andras Bokor.
(cherry picked from commit fcde6940e0)
2016-07-21 11:28:19 -07:00
Jing Zhao 419d6ce19c HDFS-10653. Optimize conversion from path string to components. Contributed by Daryn Sharp.
(cherry picked from commit bd3dcf46e2)
2016-07-21 11:15:30 -07:00
Akira Ajisaka 2685e16f38 HDFS-10620. StringBuilder created and appended even if logging is disabled. Contributed by Staffan Friberg.
(cherry picked from commit f7dabe3add)
2016-07-19 15:17:31 -07:00
Akira Ajisaka c92601e981 HDFS-10603. Fix flaky tests in org.apache.hadoop.hdfs.server.namenode.snapshot.TestOpenFilesWithSnapshot. Contributed by Yiqun Lin.
(cherry picked from commit fc570b55b9)
2016-07-19 13:52:06 -07:00
Akira Ajisaka 6171498375 HDFS-10628. Log HDFS Balancer exit message to its own log. Contributed by Jiayi Zhou.
(cherry picked from commit c48e9d608c)
2016-07-15 11:43:27 -07:00
Akira Ajisaka c9f5348bbf HADOOP-13351. TestDFSClientSocketSize buffer size tests are flaky. Contributed by Aaron Fabbri and Mingliang Liu.
(cherry picked from commit 5537c6b234)
2016-07-14 14:42:46 -07:00
Kihwal Lee dba8eee899 HDFS-10617. PendingReconstructionBlocks.size() should be synchronized. Contributed by Eric Badger. 2016-07-13 22:03:48 -05:00
Zhe Zhang 5b4e916b3c HDFS-10544. Balancer doesn't work with IPFailoverProxyProvider.
(cherry picked from commit 087290e6b1)
2016-07-12 23:27:16 -07:00
Jitendra Pandey be1a11c9c8 HDFS-10579. HDFS web interfaces lack configs for X-FRAME-OPTIONS protection. Contributed by Anu Engineer.
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
2016-07-11 17:54:18 -07:00
Yongjun Zhang ee23094b14 HDFS-10512. VolumeScanner may terminate due to NPE in DataNode.reportBadBlocks. Contributed by Wei-Chiu Chuang and Yiqun Lin.
(cherry picked from commit da6f1b88dd)
2016-07-08 22:01:31 -07:00
Jitendra Pandey 63b64a20c2 HADOOP-13283. Support reset operation for new global storage statistics and per FS storage stats. Contributed by Mingliang Liu. 2016-07-07 15:00:34 -07:00
Uma Maheswara Rao G 909fa138f0 HDFS-10592:Fix intermittent test failure of TestNameNodeResourceChecker#testCheckThatNameNodeResourceMonitorIsRunning. Contributed by Rakesh R
(cherry picked from commit ab092c56c2)
2016-07-07 14:00:05 -07:00
Andrew Wang 728623242f HDFS-10488. Update WebHDFS documentation regarding CREATE and MKDIR default permissions. Contributed by Wellington Chevreuil. 2016-07-07 10:37:08 -07:00
Akira Ajisaka 8a9440298d HDFS-10582. Change deprecated configuration fs.checkpoint.dir to dfs.namenode.checkpoint.dir in HDFS Commands Doc. Contributed by Pan Yuxuan.
(cherry picked from commit a3f93beaa1)
2016-07-06 17:54:20 -07:00
Akira Ajisaka 0401adcaca HDFS-10589. Javadoc for HAState#HAState and HAState#setStateInternal contains non-existent params. Contributed by shenyinjie.
(cherry picked from commit 8b4b5259d5)
2016-07-04 07:15:44 -07:00
Akira Ajisaka 5057390cad HDFS-10572. Fix TestOfflineEditsViewer#testGenerated. Contributed by Surendra Singh Lilhore.
(cherry picked from commit 2e835d986e)
2016-07-03 21:12:37 -07:00
Vinayakumar B 1e34763181 HDFS-10440. Improve DataNode web UI (Contributed by Weiwei Yang)
(cherry picked from commit 2a0082c51d)
2016-06-28 16:51:00 +05:30
Sangjin Lee ae90d4dd90 HDFS-7959. WebHdfs logging is missing on Datanode (Kihwal Lee via sjlee) 2016-06-24 14:48:36 -07:00
Kihwal Lee 742f9083f6 HDFS-10555: Unable to loadFSEdits due to a failure in readCachePoolInfo. Contributed by Uma Maheswara Rao G
(cherry picked from commit 01643020d2)
2016-06-23 09:19:49 -05:00
Akira Ajisaka ad50a64ded HDFS-7597. DelegationTokenIdentifier should cache the TokenIdentifier to UGI mapping. Contributed by Daryn Sharp, Bob Hansen, and Xiao Chen.
(cherry picked from commit d433b16ce6)
2016-06-22 11:02:31 +09:00
Brahma Reddy Battula ee0f389ecd HDFS-9530. ReservedSpace is not cleared for abandoned Blocks (Contributed by Brahma Reddy Battula)
(cherry picked from commit f2ac132d6a)
2016-06-21 15:44:45 +05:30
Colin Patrick Mccabe 4e11f33ccc HDFS-10448. CacheManager#addInternal tracks bytesNeeded incorrectly when dealing with replication factors other than 1 (Yiqun Lin via cmccabe)
(cherry picked from commit 46f1602e89)
2016-06-20 18:31:40 -07:00
Colin Patrick Mccabe 0914658eb8 HDFS-10328. Add per-cache-pool default replication num configuration (xupeng via cmccabe)
(cherry picked from commit 5f6b4157a4)
2016-06-20 18:12:41 -07:00
Jitendra Pandey f2ef1145c5 HDFS-10538. Remove AsyncDistributedFileSystem. Contributed by Xiaobing Zhou and Jitendra Pandey. 2016-06-20 18:04:05 -07:00
Brahma Reddy Battula 3f27f40503 HDFS-10474. hftp copy fails when file name with Chinese+special char in branch-2 (Contributed by Brahma Reddy Battula) 2016-06-20 12:38:18 +05:30
Arpit Agarwal bd33cc0179 HDFS-10437. ReconfigurationProtocol not covered by HDFSPolicyProvider. (Arpit Agarwal) 2016-06-18 16:17:10 -07:00
Kihwal Lee 35c6b725db 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:12:16 -05:00
Akira Ajisaka a36aa920f4 HADOOP-12943. Add -w -r options in dfs -test command. Contributed by Weiwei Yang.
(cherry picked from commit 09e82acaf9)
2016-06-17 16:21:05 +09:00
Colin Patrick Mccabe 49c0d9b325 HDFS-9466. TestShortCircuitCache#testDataXceiverCleansUpSlotsOnFailure is flaky (Wei-Chiu Chuang via cmccabe)
(cherry picked from commit c7921c9bdd)
2016-06-16 13:52:38 -07:00
Arpit Agarwal 159b249a3d HDFS-10532. Typo in RollingUpgrade docs. (Contributed by Yiqun Lin) 2016-06-16 10:10:49 -07:00
Vinayakumar B 6ab1f545fb HDFS-10256. Use GenericTestUtils.getTestDir method in tests for temporary directories (Contributed by Vinayakumar B)
(cherry picked from commit cc6c265171)
2016-06-16 16:56:27 +05:30
Colin Patrick Mccabe 8280e3bcc2 HDFS-10525. Fix NPE in CacheReplicationMonitor#rescanCachedBlockMap (Xiao Chen via cmccabe)
(cherry picked from commit 2ca73445f5)
2016-06-15 22:50:36 -07:00
Colin Patrick Mccabe 17301ab395 HDFS-10505. OIV's ReverseXML processor should support ACLs (Surendra Singh Lilhore via cmccabe)
(cherry picked from commit 2449db507d)
2016-06-15 22:42:19 -07:00
Ming Ma 32b115da1d HDFS-9922. Upgrade Domain placement policy status marks a good block in violation when there are decommissioned nodes. (Chris Trezzo via mingma)
(cherry picked from commit b48f27e794)
2016-06-15 22:03:20 -07:00
Ming Ma b7436f4468 HDFS-9016. Display upgrade domain information in fsck. (mingma) 2016-06-14 20:07:37 -07:00
Andrew Wang ff4466fe15 HDFS-10516. Fix bug when warming up EDEK cache of more than one encryption zone. Contributed by Xiao Chen.
(cherry picked from commit 709a814fe0)
2016-06-13 11:50:25 -07:00
Ravi Prakash 9c5f7f290e HDFS-10220. A large number of expired leases can make namenode unresponsive and cause failover (Nicolas Fraison via raviprak)
(cherry picked from commit ae047655f4)
2016-06-08 13:46:41 -07:00
Andrew Wang 9319665461 Remove redundant TestMiniDFSCluster.testDualClusters. Contributed by Jiayi Zhou.
(cherry picked from commit 1ee9ea0026)
2016-06-08 12:58:59 -07:00
Jing Zhao 8b34040cb9 HDFS-10468. HDFS read ends up ignoring an interrupt. Contributed by Jing Zhao
(cherry picked from commit be34e85e68)
2016-06-07 10:52:33 -07:00
Zhe Zhang 0499907466 HDFS-10458. getFileEncryptionInfo should return quickly for non-encrypted cluster.
(cherry picked from commit 6de9213df1)
(cherry picked from commit 06e38c835d)
2016-06-07 08:57:27 -07:00
Jason Lowe 5b4c80b27e 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:33:43 +00:00
Akira Ajisaka b8c1db6f63 HDFS-10485. Fix findbugs warning in FSEditLog.java. (aajisaka)
(cherry picked from commit e620530301)
2016-06-07 17:53:09 +09:00
Wangda Tan d30e194dda Revert "HDFS-10458. getFileEncryptionInfo should return quickly for non-encrypted cluster."
This reverts commit 06e38c835d.
2016-06-06 22:17:30 -07:00
Zhe Zhang 06e38c835d HDFS-10458. getFileEncryptionInfo should return quickly for non-encrypted cluster.
(cherry picked from commit 6de9213df1)
2016-06-06 15:53:12 -07:00
Tsz-Wo Nicholas Sze 074588d78b Revert "Revert "HADOOP-13226 Support async call retry and failover.""
This reverts commit 5bfadb8e6b.
2016-06-06 16:52:24 +08:00
Tsz-Wo Nicholas Sze 48323b6636 Revert "Revert "HDFS-10430. Reuse FileSystem#access in TestAsyncDFS. Contributed by Xiaobing Zhou.""
This reverts commit 6f8f40b2a5.
2016-06-06 16:52:19 +08:00
Tsz-Wo Nicholas Sze 6762855f67 Revert "Revert "HDFS-10431 Refactor and speedup TestAsyncDFSRename. Contributed by Xiaobing Zhou""
This reverts commit 8e2245d0a4.
2016-06-06 16:52:14 +08:00
Tsz-Wo Nicholas Sze 136d3b6414 Revert "Revert "HDFS-10390. Implement asynchronous setAcl/getAclStatus for DistributedFileSystem. Contributed by Xiaobing Zhou""
This reverts commit 87ea0784eb.
2016-06-06 16:52:09 +08:00
Tsz-Wo Nicholas Sze 428dc52e56 Revert "Revert "HDFS-10346. Implement asynchronous setPermission/setOwner for DistributedFileSystem. Contributed by Xiaobing Zhou""
This reverts commit 2529cabf12.
2016-06-06 16:51:54 +08:00
Tsz-Wo Nicholas Sze 7b9062f405 Revert "Revert "HADOOP-12957. Limit the number of outstanding async calls. Contributed by Xiaobing Zhou""
This reverts commit 7d4c16bae9.
2016-06-06 16:51:48 +08:00
Tsz-Wo Nicholas Sze c1947a71ff Revert "Revert "HDFS-10224. Implement asynchronous rename for DistributedFileSystem. Contributed by Xiaobing Zhou""
This reverts commit c11c2ee649.
2016-06-06 16:51:41 +08:00
Andrew Wang c11c2ee649 Revert "HDFS-10224. Implement asynchronous rename for DistributedFileSystem. Contributed by Xiaobing Zhou"
This reverts commit d316f44059.
2016-06-03 18:11:12 -07:00
Andrew Wang 7d4c16bae9 Revert "HADOOP-12957. Limit the number of outstanding async calls. Contributed by Xiaobing Zhou"
This reverts commit 7e0824faa9.
2016-06-03 18:10:49 -07:00
Andrew Wang 2529cabf12 Revert "HDFS-10346. Implement asynchronous setPermission/setOwner for DistributedFileSystem. Contributed by Xiaobing Zhou"
This reverts commit 69768bf9e0.
2016-06-03 18:10:49 -07:00
Andrew Wang 87ea0784eb Revert "HDFS-10390. Implement asynchronous setAcl/getAclStatus for DistributedFileSystem. Contributed by Xiaobing Zhou"
This reverts commit 56745a0cf4.
2016-06-03 18:10:48 -07:00
Andrew Wang 8e2245d0a4 Revert "HDFS-10431 Refactor and speedup TestAsyncDFSRename. Contributed by Xiaobing Zhou"
This reverts commit 72773f8ea8.
2016-06-03 18:10:48 -07:00
Andrew Wang 6f8f40b2a5 Revert "HDFS-10430. Reuse FileSystem#access in TestAsyncDFS. Contributed by Xiaobing Zhou."
This reverts commit 193f822b9a.
2016-06-03 18:10:48 -07:00
Andrew Wang 5bfadb8e6b Revert "HADOOP-13226 Support async call retry and failover."
This reverts commit f7189d6a1c.
2016-06-03 18:10:47 -07:00
Akira Ajisaka b6d5546e24 HDFS-10341. Add a metric to expose the timeout number of pending replication blocks. (aajisaka) 2016-06-03 16:04:11 +09:00
Akira Ajisaka cddf6b4fc7 HDFS-10471. DFSAdmin#SetQuotaCommand's help msg is not correct. Contributed by Yiqun Lin.
(cherry picked from commit 1df6f5735c)
2016-06-03 04:11:03 +09:00
Akira Ajisaka cbf6cacf64 HDFS-10449. TestRollingFileSystemSinkWithHdfs#testFailedClose() fails on branch-2. Contributed by Takanobu Asanuma. 2016-06-03 03:08:22 +09:00
Masatake Iwasaki 3740974413 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
2016-06-02 20:59:40 +09:00
Akira Ajisaka 3dd557e4b6 HDFS-9476. TestDFSUpgradeFromImage#testUpgradeFromRel1BBWImage occasionally fail. Contributed by Masatake Iwasaki.
(cherry picked from commit 69555fca06)
2016-06-02 18:53:27 +09:00
Colin Patrick Mccabe a64e1425ed HADOOP-13137. TraceAdmin should support Kerberized cluster (Wei-Chiu Chuang via cmccabe)
(cherry picked from commit 8ceb06e239)
2016-05-31 18:05:28 -07:00
Colin Patrick Mccabe 14907d9b8c HDFS-10415. TestDistributedFileSystem#MyDistributedFileSystem attempts to set up statistics before initialize() is called (Mingliang Liu via cmccabe) 2016-05-31 17:19:25 -07:00
Tsz-Wo Nicholas Sze f7189d6a1c HADOOP-13226 Support async call retry and failover. 2016-05-31 17:01:43 -07:00
Chris Nauroth 193f822b9a HDFS-10430. Reuse FileSystem#access in TestAsyncDFS. Contributed by Xiaobing Zhou.
(cherry picked from commit 21890c4239)
2016-05-27 14:20:30 -07:00
Yongjun Zhang 2dfaedeb43 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:14:30 -07:00
Karthik Kambatla b4c8729cf9 HDFS-10463. TestRollingFileSystemSinkWithHdfs needs some cleanup. (Daniel Templeton via kasha) 2016-05-26 14:39:07 -07:00
Tsz-Wo Nicholas Sze 72773f8ea8 HDFS-10431 Refactor and speedup TestAsyncDFSRename. Contributed by Xiaobing Zhou 2016-05-26 12:16:40 -07:00
Tsz-Wo Nicholas Sze e5dab68066 HDFS-8057 Move BlockReader implementation to the client implementation package. Contributed by Takanobu Asanuma 2016-05-25 12:12:27 -07:00
Vinayakumar B e28a51e988 HDFS-10217. show 'blockScheduled' tooltip in datanodes table.
(cherry picked from commit 2dab64da2f)
2016-05-25 12:35:15 +05:30
Karthik Kambatla afe603d973 HDFS-9782. RollingFileSystemSink should have configurable roll interval. (Daniel Templeton via kasha)
(cherry picked from commit 57c31a3fef)
2016-05-24 16:34:45 -07:00
Tsz-Wo Nicholas Sze 56745a0cf4 HDFS-10390. Implement asynchronous setAcl/getAclStatus for DistributedFileSystem. Contributed by Xiaobing Zhou 2016-05-24 14:52:50 -07:00
Tsz-Wo Nicholas Sze 076a73f207 HDFS-9365. Balaner does not work with the HDFS-6376 HA setup. 2016-05-24 13:08:04 -07:00
Masatake Iwasaki 094bc727c5 HDFS-10439. Update setOwner doc in HdfsPermissionsGuide. Contributed by John Zhuge.
(cherry picked from commit 12eb5a7b11)
2016-05-22 19:15:28 +09:00