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

3102 Commits

Author SHA1 Message Date
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 9c1c48c0d4 HDFS-9888. Allow reseting KerberosName in unit tests. Contributed by Xiao Chen. 
(cherry picked from commit 3e8099a45a)
(cherry picked from commit 00ff3d737c)
 2016-08-11 12:42:17 -07:00
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
Wei-Chiu Chuang b0bc7681c3 HADOOP-13190. Mention LoadBalancingKMSClientProvider in KMS HA documentation. Contributed by Wei-Chiu Chuang. 
(cherry picked from commit db719ef125)
(cherry picked from commit 6d53e096b2)
 2016-08-11 12:33:15 -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
Wei-Chiu Chuang 7b042c5c72 HADOOP-13395. Enhance TestKMSAudit. Contributed by Xiao Chen. 
(cherry picked from commit 070548943a)

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

(cherry picked from commit cc20316b55)
 2016-08-08 15:18:19 -07: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
Masatake Iwasaki e1684f84e2 HADOOP-13418. Fix javadoc warnings by JDK8 in hadoop-nfs package. Contributed by Kai Sasaki. 
(cherry picked from commit 10ed06a0c9)
 2016-08-06 12:29:58 +09:00
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
Andrew Wang ae2ab601c0 HADOOP-12345. Pad hostname correctly in CredentialsSys.java. Contributed by Pradeep Nayak Udupi Kadbet. 
(cherry picked from commit 846ada2de3)
(cherry picked from commit af581c0e23)
 2016-06-29 17:32:52 -07:00
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
Akira Ajisaka 242263c56d HADOOP-12943. Add -w -r options in dfs -test command. Contributed by Weiwei Yang. 
(cherry picked from commit 09e82acaf9)
(cherry picked from commit a36aa920f4)
 2016-06-17 16:21:31 +09:00
Xiaoyu Yao e84a9c976a HADOOP-13255. KMSClientProvider should check and renew tgt when doing delegation token operations. Contributed by Xiao Chen. 
(cherry picked from commit ddf66427ff)
 2016-06-16 20:12:55 -07:00
Konstantin V Shvachko 408848d1e9 HADOOP-13189. FairCallQueue makes callQueue larger than the configured capacity. Contributed by Vinitha Gankidi. 2016-06-16 18:33:05 -07:00
Colin Patrick Mccabe 04682cc6b0 HADOOP-12975. Add jitter to CachingGetSpaceUsed's thread (Elliott Clark via Colin P. McCabe) 
(cherry picked from commit bf780406f2)
(cherry picked from commit 56c997a1a6)
 2016-06-16 17:03:52 -07:00
Colin Patrick Mccabe b07cd9c6a9 HADOOP-13284. FileSystemStorageStatistics must not attempt to read non-existent rack-aware read stats in branch-2.8 (Mingliang Liu via cmccabe) 2016-06-16 16:45:41 -07:00
Chris Nauroth eddefbd01b HADOOP-13241. document s3a better. Contributed by Steve Loughran. 
(cherry picked from commit 127d2c7281)
(cherry picked from commit e4b63ed7b4)
 2016-06-16 11:19:00 -07:00
Masatake Iwasaki 3c9d31c55a HADOOP-13244. o.a.h.ipc.Server#Server should honor handlerCount when queueSizePerHandler is specified in consturctor. Contributed by Kai Sasaki. 
(cherry picked from commit 20b13d109a)
 2016-06-14 19:52:48 +09:00
Vinayakumar B 3bf5379adb HADOOP-13179. GenericOptionsParser is not thread-safe because commons-cli OptionBuilder is not thread-safe. (Contributed by hongbin ma) 
(cherry picked from commit 5cd19e429e7aef8751599dc5f54ffe29a9dc3ea9)
(cherry picked from commit 06b76f1586)
 2016-06-14 15:59:36 +05:30
Akira Ajisaka 8295351e54 HADOOP-13270. BZip2CompressionInputStream finds the same compression marker twice in corner case, causing duplicate data blocks. Contributed by Kai Sasaki. 
(cherry picked from commit e3ba9ad3f1)
(cherry picked from commit d219550e8b)
 2016-06-14 10:24:53 +09:00
Andrew Wang 08ff8d7482 HADOOP-13079. Add -q option to Ls to print ? instead of non-printable characters. Contributed by John Zhuge. 
(cherry picked from commit 0accc3306d)
(cherry picked from commit 6a8d3233fc)
 2016-06-13 11:44:08 -07:00
Akira Ajisaka f5cdf94725 HADOOP-13213. Small Documentation bug with AuthenticatedURL in hadoop-auth. Contributed by Tom Ellis. 
This closes #97.

(cherry picked from commit 8a1dccecce)
(cherry picked from commit 035eea4d12)
 2016-06-11 03:33:40 +09:00
Wangda Tan 9436548152 YARN-3426. Add jdiff support to YARN. (vinodkv via wangda) 2016-06-10 09:56:18 -07:00
Steve Loughran faf9a9f4e0 HADOOP-12537 S3A to support Amazon STS temporary credentials. Contributed by Sean Mackrory. 2016-06-09 20:58:30 +01:00
Steve Loughran 7e09601a90 HADOOP-13237: s3a initialization against public bucket fails if caller lacks any credentials. Contributed by Chris Nauroth 2016-06-09 16:36:51 +01:00
Junping Du 333490ba45 HADOOP-10048. LocalDirAllocator should avoid holding locks while accessing the filesystem. Contributed by Jason Lowe. 
(cherry picked from commit c14c1b298e)
(cherry picked from commit 19eb997f67)
 2016-06-07 09:26:05 -07:00
Tsz-Wo Nicholas Sze 49535c0683 Revert "Revert "HADOOP-13226 Support async call retry and failover."" 
This reverts commit 886e239606.
 2016-06-06 16:54:02 +08:00
Tsz-Wo Nicholas Sze c949001eee Revert "Revert "HADOOP-13168. Support Future.get with timeout in ipc async calls."" 
This reverts commit 308d28640d.
 2016-06-06 16:53:41 +08:00
Tsz-Wo Nicholas Sze 8ccc8aeb6c Revert "Revert "HADOOP-12957. Limit the number of outstanding async calls. Contributed by Xiaobing Zhou"" 
This reverts commit 8a07026e77.
 2016-06-06 16:53:31 +08:00
Tsz-Wo Nicholas Sze 2cf663bb59 Revert "Revert "HDFS-10224. Implement asynchronous rename for DistributedFileSystem. Contributed by Xiaobing Zhou"" 
This reverts commit d740a90260.
 2016-06-06 16:53:24 +08:00
Andrew Wang d740a90260 Revert "HDFS-10224. Implement asynchronous rename for DistributedFileSystem. Contributed by Xiaobing Zhou" 
This reverts commit bdc45bef64.
 2016-06-03 18:17:33 -07:00
Andrew Wang 8a07026e77 Revert "HADOOP-12957. Limit the number of outstanding async calls. Contributed by Xiaobing Zhou" 
This reverts commit a1ba6eee38.
 2016-06-03 18:17:33 -07:00
Andrew Wang 308d28640d Revert "HADOOP-13168. Support Future.get with timeout in ipc async calls." 
This reverts commit fa7c7f2510.
 2016-06-03 18:12:31 -07:00
Andrew Wang 886e239606 Revert "HADOOP-13226 Support async call retry and failover." 
This reverts commit a8941d7790.
 2016-06-03 18:12:30 -07:00
Andrew Wang d712b2ee3b HADOOP-13155. Implement TokenRenewer to renew and cancel delegation tokens in KMS. Contributed by Xiao Chen. 
(cherry picked from commit 713cb71820)

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

(cherry picked from commit 03c4724c88)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java
 2016-06-03 17:03:40 -07:00
Chris Nauroth e54f073cfe HADOOP-13105. Support timeouts in LDAP queries in LdapGroupsMapping. Contributed by Mingliang Liu. 
(cherry picked from commit d82bc85018)
(cherry picked from commit 5e6ee5aafb)

Conflicts:
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestLdapGroupsMapping.java
 2016-06-03 16:40:48 -07:00
Jian He 3c2bd19fa5 YARN-5190. Registering/unregistering container metrics in ContainerMonitorImpl and ContainerImpl causing uncaught exception in ContainerMonitorImpl. Contributed by Junping Du 
(cherry picked from commit 99cc439e29)
 2016-06-03 11:11:49 -07:00
Chris Nauroth b8216c10d8 HADOOP-13171. Add StorageStatistics to S3A; instrument some more operations. Contributed by Steve Loughran. 2016-06-03 08:56:36 -07:00
Akira Ajisaka d0dc5aaa2d HDFS-10341. Add a metric to expose the timeout number of pending replication blocks. (aajisaka) 
(cherry picked from commit b6d5546e24)
 2016-06-03 16:04:40 +09:00
Masatake Iwasaki 5b3d9ca0cd HDFS-10367. TestDFSShell.testMoveWithTargetPortEmpty fails with Address bind exception. Contributed by Brahma Reddy Battula. 
(cherry picked from commit aadb77e412)

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

(cherry picked from commit 3740974413)
 2016-06-02 21:04:48 +09:00
Akira Ajisaka f7e1a1eaa7 HADOOP-13232. Typo in exception in ValueQueue.java. Contributed by Jiayi Zhou. 
(cherry picked from commit 99675e00df)
(cherry picked from commit 6843e55208)
 2016-06-02 19:15:57 +09:00