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

3063 Commits

Author SHA1 Message Date
Mingliang Liu c7bd564b79 HADOOP-13601. Fix a log message typo in AbstractDelegationTokenSecretManager. Contributed by Mehran Hassani. 
(cherry picked from commit e80386d69d)
 2016-09-20 13:24:02 -07:00
Xiao Chen 900dc70a01 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

(cherry picked from commit 20585ade1d9d7fbd8b9df8b1e3db5a74fd4441a6)
 2016-09-19 16:38:00 -07:00
Xiao Chen a7f1dc8aa8 HADOOP-13558. UserGroupInformation created from a Subject incorrectly tries to renew the Kerberos ticket. Contributed by Xiao Chen. 
(cherry picked from commit 680be58aac)
(cherry picked from commit d157733082)

Conflicts:
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
 2016-09-19 12:52:58 -07:00
Akira Ajisaka 06d82ffb76 HADOOP-13616. Broken code snippet area in Hadoop Benchmarking. Contributed by Kai Sasaki. 
(cherry picked from commit 7cad7b7046)
(cherry picked from commit e485ace0dd)
 2016-09-15 23:43:57 +09:00
Steve Loughran 6a7ce4ee52 HADOOP-13606 swift FS to add a service load metadata file. Contributed by Steve Loughran 2016-09-14 15:44:20 +01:00
Jing Zhao 26597aa59b HADOOP-13546. Override equals and hashCode of the default retry policy to avoid connection leakage. Contributed by Xiaobing Zhou. 
(cherry picked from commit 08d8e0ba25)
(cherry picked from commit 55600b38a8)
 2016-09-13 11:15:51 -07:00
Yongjun Zhang b96e2cbd20 HDFS-10657. testAclCLI.xml setfacl test should expect mask r-x. (John Zhuge via Yongjun Zhang) 
(cherry picked from commit d2466ec3e0)
 2016-09-12 22:13:17 -07:00
Arpit Agarwal ed35f99045 HDFS-10830. FsDatasetImpl#removeVolumes crashes with IllegalMonitorStateException when vol being removed is in use. (Arpit Agarwal and Manoj Govindassamy) 2016-09-10 18:34:28 -07:00
Arpit Agarwal 04f620c4d0 HDFS-10742. Measure lock time in FsDatasetImpl. Contributed by Chen Liang. 2016-09-10 18:01:37 -07:00
Kihwal Lee 4b9845bc53 HADOOP-10940. RPC client does no bounds checking of responses. Contributed by Daryn Sharp. 
(cherry picked from commit d4d076876a)
(cherry picked from commit d234990208)
 2016-09-09 10:48:05 -05:00
Kihwal Lee 56340ac029 HADOOP-13549. Eliminate intermediate buffer for server-side PB encoding. Contributed by Daryn Sharp. 
(cherry picked from commit 39d1b1d747)
 2016-09-06 10:19:34 -05:00
Kihwal Lee 20eb5386d9 HADOOP-13547. Optimize IPC client protobuf decoding. Contributed by Daryn Sharp. 
(cherry picked from commit 28ea4122f0)
 2016-09-02 11:14:39 -05:00
Ray Chiang 2dd809eada Revert "YARN-5567. Fix script exit code checking in NodeHealthScriptRunner#reportHealthStatus. (Yufei Gu via rchiang)" 
This reverts commit 9ad3a7a43b.
 2016-09-01 15:10:37 -07:00
Kihwal Lee af26fba62e HADOOP-13473. Tracing in IPC Server is broken. Contributed by Daryn Sharp. 
(cherry picked from commit caf800d529)
 2016-09-01 16:19:10 -05:00
Kihwal Lee 2ff6b13e69 HADOOP-13465. Design Server.Call to be extensible for unified call queue. Contributed by Daryn Sharp. 
(cherry picked from commit 76cd81f4b6)
 2016-09-01 16:11:45 -05:00
Kihwal Lee a4292fe618 HADOOP-13483. Optimize IPC server protobuf decoding. Contributed by Daryn Sharp. 
(cherry picked from commit 580a833496)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
 2016-09-01 16:00:55 -05:00
Kihwal Lee 983d47ecb3 HADOOP-13429. Dispose of unnecessary SASL servers. Contributed by Daryn Sharp. 
(cherry picked from commit b3018e73cc)
 2016-09-01 15:59:53 -05:00
Kihwal Lee afc8da0d86 HADOOP-13426. More efficiently build IPC responses. Contributed by Daryn Sharp. 
(cherry picked from commit 2d8227605f)
 2016-09-01 15:59:40 -05:00
Mingliang Liu 22e182f295 HADOOP-13375. o.a.h.security.TestGroupsCaching.testBackgroundRefreshCounters seems flaky. (Contributed by Weiwei Yang) 
(cherry picked from commit dcd21d083a)
(cherry picked from commit 4d709be8c9)
 2016-09-01 11:14:57 -07:00
Ray Chiang 9ad3a7a43b YARN-5567. Fix script exit code checking in NodeHealthScriptRunner#reportHealthStatus. (Yufei Gu via rchiang) 
(cherry picked from commit 05ede00386)
(cherry picked from commit 3b19bcb8f0)
 2016-08-29 16:15:39 -07:00
Mingliang Liu 250ddf155f HADOOP-13559. Remove close() within try-with-resources in ChecksumFileSystem/ChecksumFs classes. (Contributed by Aaron Fabbri) 
(cherry picked from commit 6fcb04c178)
 2016-08-29 13:05:34 -07:00
Jason Lowe b1979bec51 HADOOP-13552. RetryInvocationHandler logs all remote exceptions. Contributed by Jason Lowe 
(cherry picked from commit 92d8f37155)
 2016-08-29 15:58:34 +00:00
Wei-Chiu Chuang bd729af8a8 HDFS-8986. Add option to -du to calculate directory space usage excluding snapshots. Contributed by Xiao Chen. 2016-08-24 08:53:43 -07:00
Akira Ajisaka f871aed87e HADOOP-13538. Deprecate getInstance and initialize methods with Path in TrashPolicy. Contributed by Yiqun Lin. 
(cherry picked from commit 092b4d5bfd)
(cherry picked from commit 2321b73037)
 2016-08-24 16:50:28 +09:00
Zhe Zhang 8bc33bf343 HADOOP-12765. HttpServer2 should switch to using the non-blocking SslSelectChannelConnector to prevent performance degradation when handling SSL connections. Contributed by Min Shen. Branch-2 patch contributed by Wei-Chiu Chuang. 
(cherry picked from commit dfcbc12026)
 2016-08-23 14:46:47 -07:00
Masatake Iwasaki 80d8e79e26 HADOOP-13497. fix wrong command in CredentialProviderAPI.md. Contributed by Yuanbo Liu. 
(cherry picked from commit 8aae8d6bf0)
 2016-08-24 00:10:37 +09:00
Xiao Chen 0f9bed050d HADOOP-13487. Hadoop KMS should load old delegation tokens from Zookeeper on startup. Contributed by Xiao Chen. 
(cherry picked from commit 2f21d53e3aaf97f425f954f52b50f36dddb6b886)
 2016-08-22 14:42:20 -07:00
Mingliang Liu 9d304822f6 HADOOP-13527. Add Spark to CallerContext LimitedPrivate scope. (Contributed by Weiqing Yang) 
(cherry picked from commit 115ecb52a8)
 2016-08-21 09:42:06 -07:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) b2efb2040c HADOOP-13428. Fixed hadoop-common build files to generate jdiff by working around a jdiff-bug. Contributed by Wangda Tan. 
(cherry picked from commit 99603e9022)
 2016-08-19 19:11:04 -07:00
Kihwal Lee 4f3df8e22a HDFS-7959. WebHdfs logging is missing on Datanode (Kihwal Lee via sjlee) 
(cherry picked from commit ae90d4dd90)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/webhdfs/WebHdfsHandler.java
 2016-08-19 15:32:11 -05:00
Chris Nauroth dd6c149c4a HADOOP-13252. Tune S3A provider plugin mechanism. Contributed by Steve Loughran. 
(cherry picked from commit 763f0497bb)
(cherry picked from commit 6dba38f08b)
 2016-08-19 12:55:57 -07:00
Jing Zhao 5d91f9fe35 HADOOP-13503. Improve SaslRpcClient failure logging. Contributed by Xiaobing Zhou. 
(cherry picked from commit 9fdd1ea724)
 2016-08-18 15:00:17 -07:00
Mingliang Liu ef38aa64c6 HADOOP-13512. ReloadingX509TrustManager should keep reloading in case of exception. (Contributed by Mingliang Liu) 
(cherry picked from commit 0f51eae0c0)
 2016-08-18 14:22:58 -07:00
Steve Loughran c09797ce9f HADOOP-13405 doc for fs.s3a.acl.default indicates incorrect values. Contributed by Shen Yinjie 2016-08-18 14:35:26 +01:00
Mingliang Liu 00eb790622 HADOOP-13470. GenericTestUtils$LogCapturer is flaky. (Contributed by Mingliang Liu) 2016-08-16 17:41:51 -07:00
Mingliang Liu b6d92c61fe Revert "HADOOP-13470. GenericTestUtils$LogCapturer is flaky. (Contributed by Mingliang Liu)" 
This reverts commit 657064e593.
 2016-08-16 16:27:36 -07:00
Andrew Wang 8b6eeb2595 HADOOP-13494. ReconfigurableBase can log sensitive information. Contributed by Sean Mackrory. 
(cherry picked from commit 4b689e7a75)
(cherry picked from commit c91e6f2828)

 Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java
 2016-08-16 15:14:06 -07:00
Mingliang Liu 657064e593 HADOOP-13470. GenericTestUtils$LogCapturer is flaky. (Contributed by Mingliang Liu) 2016-08-15 20:46:40 -07:00
Mingliang Liu 0b934c375e HDFS-10678. Documenting NNThroughputBenchmark tool. (Contributed by Mingliang Liu) 2016-08-15 20:46:28 -07:00
Mingliang Liu 6471ec31bc HDFS-10724. Document caller context config keys. (Contributed by Mingliang Liu) 
(cherry picked from commit 4bcbef39f7)
 2016-08-15 20:46:03 -07:00
Varun Saxena 6fed7b9c45 HADOOP-13333. testConf.xml ls comparators in wrong order (Vrushali C via Varun Saxena) 2016-08-16 03:14:24 +05:30
Zhe Zhang b8b4ea67d8 HDFS-9804. Allow long-running Balancer to login with keytab. Contributed by Xiao Chen. 
(cherry picked from commit ccff6035f5)
(cherry picked from commit 7d402692b4)
 2016-08-11 12:42:17 -07:00
Xiaoyu Yao cc49133281 HADOOP-13285. DecayRpcScheduler MXBean should only report decayed CallVolumeSummary. Contributed by Xiaoyu Yao. 
(cherry picked from commit 0761379fe4)
 2016-08-10 15:19:04 -07:00
Wei-Chiu Chuang 753edc4931 HDFS-8224. Schedule a block for scanning if its metadata file is corrupt. Contributed by Rushabh S Shah. 
(cherry picked from commit 8efd4959f3)
 2016-08-10 11:39:12 -07:00
Karthik Kambatla 5ea35b2af2 HADOOP-13299. JMXJsonServlet is vulnerable to TRACE. (Haibo Chen via kasha) 
(cherry picked from commit 85422bb7c5)
(cherry picked from commit 2df34ab6e2)
 2016-08-09 13:47:42 -07:00
Masatake Iwasaki a9d957d77d HADOOP-13439. Fix race between TestMetricsSystemImpl and TestGangliaMetrics. Contributed by Chen Liang. 
(cherry picked from commit 8f9b61852b)
 2016-08-09 10:06:14 +09:00
Arpit Agarwal 5006083806 HADOOP-13457. Remove hardcoded absolute path for shell executable. (Chen Liang) 2016-08-08 12:31:19 -07:00
Jitendra Pandey f4bf3e22de HADOOP-10823. TestReloadingX509TrustManager is flaky. Contributed by Mingliang Liu. 
Conflicts:
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/TestReloadingX509TrustManager.java
 2016-08-08 11:06:05 -07:00
Naganarasimha 8055ff1c3c HADOOP-13353. LdapGroupsMapping getPassward shouldn't return null when IOException throws. Contributed by Wei-Chiu Chuang 2016-08-06 23:18:53 +05:30
Wei-Chiu Chuang e7863da095 Revert "HADOOP-13353. LdapGroupsMapping getPassward shouldn't return null when IOException throws. Contributed by Zhaohao Liang and Wei-Chiu Chuang." 
This reverts commit 7dbfe2f099.
 2016-08-05 19:05:52 -07:00
Wei-Chiu Chuang 7dbfe2f099 HADOOP-13353. LdapGroupsMapping getPassward shouldn't return null when IOException throws. Contributed by Zhaohao Liang and Wei-Chiu Chuang. 
(cherry picked from commit 49ba09a922)
(cherry picked from commit d875dfef3d)
 2016-08-05 16:37:23 -07:00
Arpit Agarwal 46c07bd021 HADOOP-13466. Add an AutoCloseableLock class. (Chen Liang) 2016-08-04 12:32:39 -07:00
Arpit Agarwal ad29c96075 HADOOP-13467. Shell#getSignalKillCommand should use the bash builtin on Linux. (Arpit Agarwal) 2016-08-04 10:28:55 -07:00
Kihwal Lee 1b97519987 HADOOP-13442. Optimize UGI group lookups. Contributed by Daryn Sharp. 
(cherry picked from commit 9422515239)
 2016-08-04 10:49:19 -05:00
Jason Lowe 6fc68a379b HADOOP-10980. TestActiveStandbyElector fails occasionally in trunk. Contributed by Eric Badger 
(cherry picked from commit c82745432a)
 2016-08-03 20:20:24 +00:00
Arpit Agarwal ad653de2d7 HDFS-9353. Code and comment mismatch in JavaKeyStoreProvider. (Andras Bokor) 2016-08-02 15:18:24 -07:00
Arpit Agarwal 745ba1160b HADOOP-13434. Add bash quoting to Shell class. (Owen O'Malley) 2016-08-02 13:43:50 -07:00
Chris Nauroth 06df0cd87f HADOOP-13081. add the ability to create multiple UGIs/subjects from one kerberos login. Contributed by Sergey Shelukhin. 
(cherry picked from commit 0458a2af6e)
(cherry picked from commit ec522a1907)
 2016-08-02 12:43:58 -07:00
Akira Ajisaka f39ed9ea8e HADOOP-13444. Replace org.apache.commons.io.Charsets with java.nio.charset.StandardCharsets. Contributed by Vincent Poon. 
(cherry picked from commit 5469e128d3)
 2016-08-02 10:18:52 +09:00
Chris Nauroth 244285488d HADOOP-13422. ZKDelegationTokenSecretManager JaasConfig does not work well with other ZK users in process. Contributed by Sergey Shelukhin. 
(cherry picked from commit 255ea45e50)
(cherry picked from commit df2ed6b2c4)
 2016-07-26 15:33:42 -07:00
Jing Zhao 54be36a6d6 HDFS-9894. Add unsetStoragePolicy API to FileContext/AbstractFileSystem and derivatives. Contributed by Xiaobing Zhou. 
(cherry picked from commit 7149cdb3c2d9dd390cd8668883cbe5db94090e0a)
 2016-07-25 09:51:59 -07:00
Arpit Agarwal bbf711c030 HDFS-9534. Add CLI command to clear storage policy from a path. (Contributed by Xiaobing Zhou) 2016-07-25 09:51:59 -07:00
Chris Nauroth 0456069aca HADOOP-13207. Specify FileSystem listStatus, listFiles and RemoteIterator. Contributed by Steve Loughran. 
(cherry picked from commit 5fda66e4a3)
(cherry picked from commit e6ba69b4db)
 2016-07-22 15:39:12 -07:00
Chris Nauroth af3c860bb1 HADOOP-13240. TestAclCommands.testSetfaclValidations fail. Contributed by John Zhuge. 
(cherry picked from commit 43cf6b101d)
(cherry picked from commit 382bcf21e7)
 2016-07-21 14:12:47 -07:00
Jakob Homan 9442e1d48e HADOOP-12009. Clarify FileSystem.listStatus() sorting order & fix FileSystemContractBaseTest:testListStatus. backport to 2.8 2016-07-21 21:50:25 +01:00
Allen Wittenauer 35885e9540 HDFS-9852. hdfs dfs -setfacl error message is misleading (Wei-Chiu Chuang via aw) 
(cherry picked from commit b3649adf6a)
(cherry picked from commit 84c785036f)
 2016-07-20 11:30:52 -07:00
Steve Loughran 0f1e02a298 HADOOP-13212 Provide an option to set the socket buffers in S3AFileSystem (Rajesh Balamohan) 2016-07-20 13:42:19 +01:00
Akira Ajisaka f2508d78b2 HADOOP-12991. Conflicting default ports in DelegateToFileSystem. Contributed by Kai Sasaki. 
(cherry picked from commit dc065dd64c)
(cherry picked from commit 8fe2c450b3)
 2016-07-19 16:06:35 -07:00
Akira Ajisaka cf79ac5fa9 HADOOP-13202. Avoid possible overflow in org.apache.hadoop.util.bloom.BloomFilter#getNBytes. Contributed by Kai Sasaki. 
(cherry picked from commit c2bcffb34e)
(cherry picked from commit 09375baad1)
 2016-07-18 11:50:53 -07:00
Akira Ajisaka bc21763da4 HADOOP-13289. Remove unused variables in TestFairCallQueue. Contributed by Ye Zhou. 
(cherry picked from commit 1381483233)
(cherry picked from commit 2231ef22f5)
 2016-07-14 23:15:53 -07:00
Zhe Zhang cbd885b6fa HADOOP-13290. Appropriate use of generics in FairCallQueue. Contributed by Jonathan Hung. 
(cherry picked from commit 728bf7f698)
(cherry picked from commit b95f1af8a9)
 2016-07-13 16:47:01 -07:00
Akira Ajisaka 213b7f40de HADOOP-13366. Fix dead link in o.a.h.fs.CommonConfigurationKeysPublic javadoc. Contributed by Rakesh R. 
(cherry picked from commit 505ce88437)
(cherry picked from commit ee1e45e4b2)
 2016-07-13 13:10:27 -07:00
Tsuyoshi Ozawa fa9ff4997e HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache. Contributed by Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula. (ozawa) 
(cherry picked from commit 77ffe76212)
 2016-07-13 21:41:11 +09:00
Lei Xu d1d280fcfa HADOOP-13315. FileContext#umask is not initialized properly. (John Zhuge via lei) 
(cherry picked from commit a290a98b6a)
 2016-07-12 16:51:55 -07:00
Jitendra Pandey 324923e1bc HADOOP-13352. Make X-FRAME-OPTIONS configurable in HttpServer2. Contributed by Anu Engineer. 2016-07-12 14:38:20 -07:00
Robert Kanter 2e2caeb50e HADOOP-12964. Http server vulnerable to clickjacking (haibochen via rkanter) 
(cherry picked from commit 042a3ae960)
 2016-07-12 14:37:57 -07:00
Steve Loughran 310c08454f HADOOP-13139 Branch-2: S3a to use thread pool that blocks clients. Contributed by Pieter Reuse. 2016-07-11 17:21:14 +01:00
Akira Ajisaka a8cfcce542 Revert "HADOOP-10465. Fix use of generics within SortedMapWritable. Contributed by Bertrand Dechoux." 
This reverts commit 1d175f0f3f.
 2016-07-09 21:01:07 -07:00
Jitendra Pandey 9c7ce389c7 HADOOP-13283. Support reset operation for new global storage statistics and per FS storage stats. Contributed by Mingliang Liu. 2016-07-07 15:04:47 -07:00
Jitendra Pandey bc7fd76a1f HADOOP-13305. Define common statistics names across schemes. Contributed by Mingliang Liu. 2016-07-01 15:37:32 -07:00
Vinayakumar B 2c6e7f221e HADOOP-13314. Remove 'package-info.java' from 'test\java\org\apache\hadoop\fs\shell\' to remove eclipse compile error (Contributed by Vinayakumar B) 
(cherry picked from commit c25021fb71)
(cherry picked from commit 1458e66593)
 2016-07-01 12:23:23 +05:30
Masatake Iwasaki b5dbd3b5ed HADOOP-12242. Add in-page TOC to filesystem specification pages. (iwasakims) 
(cherry picked from commit 5c07c573db)
 2016-06-30 07:30:37 +09:00
Steve Loughran 52dbafecc5 HADOOP-12229 Fix inconsistent subsection titles in filesystem.md. Contributed by Masatake Iwasaki 2016-06-29 14:31:13 +01:00
Andrew Wang 47c13c4f7d HADOOP-13316. Enforce Kerberos authentication for required ops in DelegationTokenAuthenticator. Contributed by Xiao Chen. 
(cherry picked from commit 7d2070493e)
(cherry picked from commit 22eb53eb71)
 2016-06-27 18:46:59 -07:00
Andrew Wang 59a70977c3 HADOOP-13251. Authenticate with Kerberos credentials when renewing KMS delegation token. Contributed by Xiao Chen. 
(cherry picked from commit 771f798edf)

 Conflicts:
	hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java

(cherry picked from commit d8a69c8737)
 2016-06-27 18:29:58 -07:00
Akira Ajisaka a0f6109907 MAPREDUCE-6542. HistoryViewer uses SimpleDateFormat, but SimpleDateFormat is not threadsafe. Contributed by zhangyubiao. 2016-06-27 15:19:21 -07:00
Arpit Agarwal f7bd302550 HADOOP-13263. Reload cached groups in background after expiry. (Contributed bt Stephen O'Donnell) 2016-06-27 09:51:16 -07:00
Tsz-Wo Nicholas Sze ce788c207f HADOOP-13227. AsyncCallHandler should use an event driven architecture to handle async calls. 2016-06-25 15:51:45 +08:00
Jing Zhao e251654ee4 HADOOP-13249. RetryInvocationHandler need wrap InterruptedException in IOException when call Thread.sleep. Contributed by Zhihai Xu. 
(cherry picked from commit 0bbb4ddd79)
 2016-06-25 15:51:35 +08:00
Colin Patrick Mccabe 2d681a9246 Fix accidental revert of HADOOP-13072: WindowsGetSpaceUsed constructor should be public (Vinayakumar B via cmccabe) 
(cherry picked from commit 975786492c)
(cherry picked from commit e751bb4497)
 2016-06-24 09:47:41 -07:00
Andrew Wang f28c270c96 Revert "HADOOP-13228. Add delegation token to the connection in DelegationTokenAuthenticator. Contributed by Xiao Chen." 
This reverts commit 4ad9ca85fb.
 2016-06-23 11:09:06 -07:00
Allen Wittenauer d4474d7d09 HADOOP-13245. Fix up some misc create-release issues (aw) 
(cherry picked from commit e2f640942b)
(cherry picked from commit 2a956baaab)
 2016-06-23 15:16:33 +09:00
Masatake Iwasaki 9c46f99cc6 HADOOP-12588. addendum patch to fix intermittent failure of TestGangliaMetrics. (iwasakims) 
(cherry picked from commit 67089875f0)
 2016-06-22 23:49:04 +09:00
Steve Loughran 1eb45180a6 HADOOP-13203 S3A: Support fadvise "random" mode for high performance readPositioned() reads. Contributed by Rajesh Balamohan and stevel. 2016-06-22 15:41:52 +01:00
Akira Ajisaka 6fefb8f4a4 HADOOP-13296. Cleanup javadoc for Path. Contributed by Daniel Templeton. 
(cherry picked from commit e15cd43369)
(cherry picked from commit 65b4f2682e)
 2016-06-21 20:17:42 +09:00
Colin Patrick Mccabe c5dafb4ad7 HADOOP-13288. Guard null stats key in FileSystemStorageStatistics (Mingliang Liu via Colin P. McCabe) 
(cherry picked from commit 8c1f81d4bf)
(cherry picked from commit 14df17383c)
 2016-06-20 14:30:51 -07:00
Colin Patrick Mccabe c610b60331 HADOOP-13280. FileSystemStorageStatistics#getLong(“readOps“) should return readOps + largeReadOps (Mingliang Liu via cmccabe) 
(cherry picked from commit 5370a6ffae)
(cherry picked from commit 7db1e57cc1)

Conflicts:
    hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemStorageStatistics.java
 2016-06-20 10:53:14 -07:00
Akira Ajisaka 615a023be3 HADOOP-13192. org.apache.hadoop.util.LineReader cannot handle multibyte delimiters correctly. Contributed by binde. 
(cherry picked from commit fc6b50cc57)
(cherry picked from commit 39ea0891d2)
 2016-06-20 17:08:19 +09: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
Chris Nauroth 55658dcaa3 Revert "HADOOP-12718. Incorrect error message by fs -put local dir without permission. (John Zhuge via Yongjun Zhang)" 
This reverts commit 62206dd2ed.

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2016-06-17 23:51:27 -07:00