Commit Graph

505 Commits

Author SHA1 Message Date
Steve Loughran 89121745c0 HADOOP-13139 Branch-2: S3a to use thread pool that blocks clients. Contributed by Pieter Reuse. 2016-07-11 17:21:00 +01:00
Akira Ajisaka f4b63a391b Revert "HADOOP-10465. Fix use of generics within SortedMapWritable. Contributed by Bertrand Dechoux."
This reverts commit 1d175f0f3f.
2016-07-09 21:00:13 -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
Jitendra Pandey 06b89f0d14 HADOOP-13305. Define common statistics names across schemes. Contributed by Mingliang Liu. 2016-07-01 15:35:50 -07:00
Steve Loughran 70a45e3122 HADOOP-13239 Deprecate s3:// in branch-2 2016-06-29 13:16:26 +01:00
Yongjun Zhang 8a121dc3b8 HDFS-10396. Using -diff option with DistCp may get "Comparison method violates its general contract" exception. Contributed by Yongjun Zhang.
(cherry picked from commit 8113855b3a)
2016-06-28 23:29:48 -07:00
Jing Zhao 856bc4e28b HDFS-10556. DistCpOptions should be validated automatically. Contributed by Mingliang Liu. 2016-06-22 15:15:47 -07:00
Steve Loughran fb9167fdef HADOOP-13203 S3A: Support fadvise "random" mode for high performance readPositioned() reads. Contributed by Rajesh Balamohan and stevel. 2016-06-22 15:42:30 +01:00
Chris Nauroth e6ebe9ab4e HADOOP-13287. TestS3ACredentials#testInstantiateFromURL fails if AWS secret key contains +. Contributed by Chris Nauroth.
(cherry picked from commit b2c596cdda)
2016-06-21 11:32:11 -07:00
Jitendra Pandey 8f93bbcb11 HADOOP-13291. Probing stats in DFSOpsCountStatistics/S3AStorageStatistics should be correctly implemented. Contributed by Mingliang Liu. 2016-06-20 16:28:55 -07:00
Chris Nauroth e4b63ed7b4 HADOOP-13241. document s3a better. Contributed by Steve Loughran.
(cherry picked from commit 127d2c7281)
2016-06-16 11:18:40 -07:00
Ravi Prakash b216dbfb55 HADOOP-3733. "s3x:" URLs break when Secret Key contains a slash, even if encoded. Contributed by Steve Loughran.
(cherry picked from commit 4aefe119a0)
2016-06-16 11:14:38 -07:00
Wangda Tan 863bfa4d6a YARN-1942. Deprecate toString/fromString methods from ConverterUtils and move them to records classes like ContainerId/ApplicationId, etc. (wangda) 2016-06-14 15:12:00 -07:00
Chris Nauroth 1925942294 Revert "HADOOP-12666. Support Microsoft Azure Data Lake - as a file system in Hadoop. Contributed by Vishwajeet Dusane."
This reverts commit a8f03ef7ea.
2016-06-09 15:17:18 -07:00
Chris Nauroth a8f03ef7ea HADOOP-12666. Support Microsoft Azure Data Lake - as a file system in Hadoop. Contributed by Vishwajeet Dusane.
(cherry picked from commit 9581fb715c)

Conflicts:
	hadoop-tools/hadoop-tools-dist/pom.xml
	hadoop-tools/pom.xml
2016-06-09 14:49:05 -07:00
Steve Loughran 6350e4b1fb HADOOP-12537 S3A to support Amazon STS temporary credentials. Contributed by Sean Mackrory. 2016-06-09 20:59:54 +01:00
Steve Loughran df29f77846 HADOOP-13237: s3a initialization against public bucket fails if caller lacks any credentials. Contributed by Chris Nauroth 2016-06-09 16:36:27 +01:00
Steve Loughran 0cbbc2f0db HADOOP-12807 S3AFileSystem should read AWS credentials from environment variables. Contributed by Tobin Baker. 2016-06-06 23:41:54 +02:00
Chris Nauroth 043a0c2e6c HADOOP-13171. Add StorageStatistics to S3A; instrument some more operations. Contributed by Steve Loughran. 2016-06-03 08:56:07 -07:00
Chris Nauroth e9942c5b34 HADOOP-13131. Add tests to verify that S3A supports SSE-S3 encryption. Contributed by Steve Loughran.
(cherry picked from commit 16b1cc7af9)
2016-06-01 14:49:31 -07:00
Steve Loughran b29bf5d335 HADOOP-13162. Consider reducing number of getFileStatus calls in S3AFileSystem.mkdirs. (Rajesh Balamohan via stevel) 2016-06-01 14:17:50 +01:00
Varun Vasudev 4f36c3d214 YARN-4844. Add getMemoryLong/getVirtualCoreLong to o.a.h.y.api.records.Resource. Contributed by Wangda Tan. 2016-05-29 20:55:39 +05:30
Yongjun Zhang 82a88c7e67 HADOOP-13199. Add doc for distcp -filters. (John Zhuge via Yongjun Zhang)
(cherry picked from commit cfb860dee7)
2016-05-26 23:32:46 -07:00
Steve Loughran 15f997cca6 HADOOP-13130. s3a failures can surface as RTEs, not IOEs. (Steve Loughran) 2016-05-21 14:19:56 +01:00
Steve Loughran eb160561e0 HADOOP-12723 S3A: Add ability to plug in any AWSCredentialsProvider. Contributed by Steven Wong. 2016-05-20 13:52:30 +01:00
Steve Loughran e29d7fb585 HADOOP-13145 In DistCp, prevent unnecessary getFileStatus call when not preserving metadata. Contributed by Chris Nauroth. 2016-05-20 12:21:47 +01:00
Chris Nauroth 60e5397a9b HADOOP-13183. S3A proxy tests fail after httpclient/httpcore upgrade. Contributed by Steve Loughran.
(cherry picked from commit 93258459fa)
2016-05-19 22:00:32 -07:00
Arun Suresh 1b4600abcf YARN-4412. Create ClusterMonitor to compute ordered list of preferred NMs for OPPORTUNITIC containers. (asuresh)
(cherry picked from commit 341888a0aa)
2016-05-18 22:35:55 -07:00
Jing Zhao dd7f5a3b88 HDFS-10397. Distcp should ignore -delete option if -diff option is provided instead of exiting. Contributed by Mingliang Liu.
(cherry picked from commit 03788d3015)
2016-05-17 15:53:39 -07:00
Steve Loughran dd0a8201bc HADOOP-13158 S3AFileSystem#toString might throw NullPointerException due to null cannedACL. (Chris Nauroth via stevel) 2016-05-17 13:19:08 +01:00
Steve Loughran dfc062a092 HADOOP-13163 Reuse pre-computed filestatus in Distcp-CopyMapper (Rajesh Balamohan via stevel) 2016-05-17 13:01:50 +01:00
Chris Nauroth bb41547fb4 HADOOP-13148. TestDistCpViewFs to include IOExceptions in test error reports. Contributed by Steve Loughran.
(cherry picked from commit b9685e85d5)
2016-05-16 11:53:25 -07:00
Steve Loughran f14208d362 HADOOP-13113 Enable parallel test execution for hadoop-aws. Chris Nauroth via stevel 2016-05-13 10:46:37 +01:00
Andrew Wang f6f20616c6 HADOOP-12868. Fix hadoop-openstack undeclared and unused dependencies. Contributed by Masatake Iwasaki.
(cherry picked from commit fa440a39b7)
2016-05-12 23:58:24 -07:00
Steve Loughran 1370dfc775 HADOOP-13028 add low level counter metrics for S3A; use in read performance tests. contributed by: stevel
patch includes
HADOOP-12844 Recover when S3A fails on IOException in read()
HADOOP-13058 S3A FS fails during init against a read-only FS if multipart purge
HADOOP-13047 S3a Forward seek in stream length to be configurable
2016-05-12 19:23:31 +01:00
Steve Loughran 389dd91dd4 HADOOP-13116 Jets3tNativeS3FileSystemContractTest does not run. 2016-05-12 16:36:23 +01:00
Steve Loughran 257b2f5beb HADOOP-13122 Customize User-Agent header sent in HTTP requests by S3A. Chris Nauroth via stevel. 2016-05-12 13:57:05 +01:00
Chris Nauroth ba48834431 HADOOP-12801. Suppress obsolete S3FileSystem tests. Contributed by Chris Nauroth.
(cherry picked from commit d3dbfa7feee7922ddcd0b2e97898adf4e0c37de3)
2016-05-10 15:14:36 -07:00
Steve Loughran f47ea0cc3f HADOOP-12982 Document missing S3A and S3 properties. (Wei-Chiu Chuang via stevel) 2016-05-10 21:40:13 +01:00
Jian He 007d6d1d57 YARN-4778. Support specifying resources for task containers in SLS. Contributed by Wangda Tan
(cherry picked from commit 996a210ab0)
2016-05-09 14:50:00 -07:00
Jason Lowe ee86cef2fe YARN-4311. Removing nodes from include and exclude lists will not remove them from decommissioned nodes list. Contributed by Kuhu Shukla
(cherry picked from commit d0da13229c)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNode.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockNodes.java
2016-05-05 14:33:01 +00:00
Jing Zhao d43d8a1bcd HADOOP-12469. distcp should not ignore the ignoreFailures option. Contributed by Mingliang Liu.
(cherry picked from commit af942585a1)
2016-05-04 10:24:06 -07:00
Masatake Iwasaki ff233dfca0 HADOOP-12378. Fix findbugs warnings in hadoop-tools module. Contributed by Akira AJISAKA.
(cherry picked from commit ef0870ad03)
2016-04-29 20:27:45 +09:00
Yongjun Zhang 7955b6f66e HDFS-10313. Distcp need to enforce the order of snapshot names passed to -diff. (Lin Yiqun via Yongjun Zhang)
(cherry picked from commit 959a28dd12)
2016-04-26 16:27:59 -07:00
Akira Ajisaka 58642d2244 HDFS-10298. Document the usage of distcp -diff option. Contributed by Takashi Ohnishi.
(cherry picked from commit 02c51c27d9)
2016-04-25 22:34:18 +09:00
Steve Loughran edcb2a8410 HADOOP-12891. S3AFileSystem should configure Multipart Copy threshold and chunk size. (Andrew Olson via stevel) 2016-04-22 11:24:50 +01:00
Yongjun Zhang f98f4151ac HDFS-9670. DistCp throws NPE when source is root. (John Zhuge via Yongjun Zhang)
(cherry picked from commit a749ba0cea)
2016-04-21 12:23:42 -07:00
Jing Zhao 864baf23aa HDFS-10216. Distcp -diff throws exception when handling relative path. Contributed by Takashi Ohnishi.
(cherry picked from commit 404f57f328)
2016-04-14 10:35:43 -07:00
Steve Loughran e124c3a2ae HADOOP-12963 Allow using path style addressing for accessing the s3 endpoint. (Stephen Montgomery via stevel) 2016-04-14 12:45:10 +01:00
Jason Lowe f1a370ce8b Revert "YARN-4311. Removing nodes from include and exclude lists will not remove them from decommissioned nodes list. Contributed by Kuhu Shukla"
This reverts commit 814ceeb489.
2016-04-11 15:56:29 +00:00
Steve Loughran 9acfde3a03 HADOOP-12444 Support lazy seek in S3AInputStream. Rajesh Balamohan via stevel 2016-04-09 11:24:55 +01:00
Chris Nauroth 26a23eff82 HADOOP-12994. Specify PositionedReadable, add contract tests, fix problems. Contributed by Steve Loughran.
(cherry picked from commit 843ee8d59d)
2016-04-08 13:37:46 -07:00
Steve Loughran 1533403a9a HADOOP-12753 S3A JUnit tests failing if using HTTP proxy. (Zoran Rajic via stevel) 2016-04-08 17:09:47 +01:00
Jason Lowe 814ceeb489 YARN-4311. Removing nodes from include and exclude lists will not remove them from decommissioned nodes list. Contributed by Kuhu Shukla
(cherry picked from commit 1cbcd4a491)
2016-04-05 13:41:18 +00:00
Steve Loughran caaadf9f3e HADOOP-12169 ListStatus on empty dir in S3A lists itself instead of returning an empty list. author: Pieter Reuse. - omitted new S3A subclass 2016-04-04 17:01:37 +01:00
Steve Loughran 20e808d83e HADOOP-12169 ListStatus on empty dir in S3A lists itself instead of returning an empty list. author: Pieter Reuse. 2016-04-03 16:39:51 +01:00
Harsh J 7c5b55d4e5 HADOOP-11687. Ignore x-* and response headers when copying an Amazon S3 object. Contributed by Aaron Peterson and harsh.
(cherry picked from commit 256c82fe29)
2016-04-01 14:35:58 +05:30
Akira Ajisaka 7b2cf29f4f MAPREDUCE-6543. Migrate MR client test cases part 2. Contributed by Dustin Cote.
(cherry picked from commit 0050fa5f1c)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java
2016-03-29 18:20:01 +09:00
Akira Ajisaka 2b1f066d2d Revert "MAPREDUCE-6543. Migrate MR client test cases part 2. Contributed by Dustin Cote."
This reverts commit 0dc1453626.
2016-03-28 16:05:55 +09:00
Akira Ajisaka 0dc1453626 MAPREDUCE-6543. Migrate MR client test cases part 2. Contributed by Dustin Cote.
(cherry picked from commit 2c268cc936)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java
2016-03-25 15:23:23 +09:00
Chris Nauroth 57a0e6543c HDFS-10199. Unit tests TestCopyFiles, TestDistCh, TestLogalyzer under org.apache.hadoop.tools are failing. Contributed by Tibor Kiss. 2016-03-23 12:17:27 -07:00
Chris Nauroth 2e60387401 HADOOP-12717. NPE when trying to rename a directory in Windows Azure Storage FileSystem. Contributed by Robert Yokota and Gaurav Kanade.
(cherry picked from commit c50aad0f85)
2016-03-04 22:57:56 -08:00
Masatake Iwasaki 722182fdfb HADOOP-12470. In-page TOC of documentation should be automatically generated by doxia macro (iwasakims)
(cherry picked from commit cbd31328a6)

 Conflicts:
	hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
	hadoop-common-project/hadoop-common/src/site/markdown/UnixShellGuide.md
2016-03-04 14:12:44 +09:00
Masatake Iwasaki 8095c612a3 HDFS-9048. DistCp documentation is out-of-dated (Daisuke Kobayashi via iwasakims)
(cherry picked from commit 33a412e8a4)
2016-03-03 18:57:41 +09:00
Chris Nauroth bce33b5179 HADOOP-12853. Change WASB documentation regarding page blob support. Contributed by Madhumita Chakraborty.
(cherry picked from commit f98dff329b)
2016-03-01 13:18:57 -08:00
Chris Nauroth e402371b6a HADOOP-12851. S3AFileSystem Uptake of ProviderUtils.excludeIncompatibleCredentialProviders. Contributed by Larry McCay.
(cherry picked from commit d251e55415)
2016-02-29 22:00:27 -08:00
Masatake Iwasaki 32c7791a6c HADOOP-12552. Fix undeclared/unused dependency to httpclient (iwasakims)
(cherry picked from commit 809ebc0b14)
2016-02-29 18:23:33 +09:00
Chris Nauroth 2e761dabd8 HADOOP-12846. Credential Provider Recursive Dependencies. Contributed by Larry McCay.
(cherry picked from commit 7634d404b7)
2016-02-28 11:23:02 -08:00
cnauroth 9ea19a861f HADOOP-12535. Run FileSystem contract tests with hadoop-azure. Contributed by Madhumita Chakraborty.
(cherry picked from commit 3369a4f691)
2016-02-23 21:37:56 -08:00
cnauroth a5511debdb HADOOP-12555. WASB to read credentials from a credential provider. Contributed by Larry McCay.
(cherry picked from commit 27b77751c1)
2016-02-22 17:30:32 -08:00
cnauroth 3f14eed580 HADOOP-11613. Remove commons-httpclient dependency from hadoop-azure. Contributed by Masatake Iwasaki.
(cherry picked from commit d4f5fc23b2)
2016-02-22 13:39:45 -08:00
Yongjun Zhang b144e0f15d HDFS-9764. DistCp doesn't print value for several arguments including -numListstatusThreads. (Wei-Chiu Chuang via Yongjun Zhang)
(cherry picked from commit ba1c9d484a)
2016-02-19 10:29:27 -08:00
cnauroth b4c4f30fa4 HADOOP-11031. Design Document for Credential Provider API. Contributed by Larry McCay.
(cherry picked from commit 8ab7658025)
2016-02-18 14:07:09 -08:00
cnauroth 6731bb468d HADOOP-12548. Read s3a creds from a Credential Provider. Contributed by Larry McCay.
(cherry picked from commit 76fab26c5c)

Conflicts:
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java
2016-02-17 12:20:41 -08:00
cnauroth ac5a793590 HADOOP-12780. During WASB atomic rename handle crash when one directory has been renamed but not file under it. Contributed by Madhumita Chakraborty.
(cherry picked from commit 91a96eaa53)
2016-02-12 15:50:19 -08:00
Steve Loughran 60474a769e HADOOP-12292. Make use of DeleteObjects optional. (Thomas Demoor via stevel) 2016-02-06 18:20:24 +00:00
Yongjun Zhang 2fb711bde9 HDFS-9638. Improve DistCp Help and documentation. (Wei-Chiu Chuang via Yongjun Zhang)
(cherry picked from commit eddd823cd6)
2016-01-29 12:13:03 -08:00
cnauroth bd01fdb64d MAPREDUCE-6563. Streaming documentation contains a stray % character. Contributed by Chris Nauroth.
(cherry picked from commit 41da9a0773)

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
2016-01-28 14:46:42 -08:00
Xuan 69f3fa71a2 YARN-4612. Fix rumen and scheduler load simulator handle killed tasks
properly. Contributed by Ming Ma.

(cherry picked from commit 4efdf3a979)
2016-01-26 18:18:03 -08:00
Akira Ajisaka 4edd7bd820 HADOOP-12731. Remove useless boxing/unboxing code. Contributed by Kousuke Saruta.
(cherry picked from commit 736eb17a79)
2016-01-25 13:48:28 +09:00
Akira Ajisaka 6368d102b9 HADOOP-12730. Hadoop streaming -mapper and -reducer options are wrongly documented as required. Contributed by Kengo Seki.
(cherry picked from commit 0bae506c22)
2016-01-22 21:09:09 +09:00
Akira Ajisaka 7f215ffdd5 MAPREDUCE-6605. Fix typos mapreduce.map.skip.proc.count.autoincr and mapreduce.reduce.skip.proc.count.autoincr in mapred-default.xml. Contributed by Kai Sasaki. 2016-01-22 18:37:17 +09:00
Xuan 66b030f608 YARN-4611. Fix scheduler load simulator to support multi-layer network
location. Contributed by Ming Ma.

(cherry picked from commit 1708a4cd23)
2016-01-20 15:43:02 -08:00
Ravi Prakash 2cbb8bbd72 HADOOP-12696. Add tests for S3FileSystem Contract. Contributed by Matt Paduano
(cherry picked from commit 1acc509b45)
2016-01-19 14:00:54 -08:00
Wangda Tan 23deeb4230 HADOOP-12356. Fix computing CPU usage statistics on Windows. (Inigo Goiri via wangda)
(cherry picked from commit 89d1fd5dac)
2016-01-19 21:28:51 +08:00
Wangda Tan 704b37d0e1 YARN-4502. Fix two AM containers get allocated when AM restart. (Vinod Kumar Vavilapalli via wangda)
(cherry picked from commit a44ce3f14f)
2016-01-19 09:31:13 +08:00
Wangda Tan 1625281ccb Revert "YARN-4502. Fix two AM containers get allocated when AM restart. (Vinod Kumar Vavilapalli via wangda)"
This reverts commit 3fe5728563.

Conflicts:
	hadoop-yarn-project/CHANGES.txt

(cherry picked from commit 150f5ae034)
2016-01-19 09:31:07 +08:00
cnauroth 62d6166211 HADOOP-12635. Adding Append API support for WASB. Contributed by Dushyanth.
(cherry picked from commit 8bc93db2e7)
2016-01-18 09:09:05 -08:00
Wangda Tan 6dab78c71a YARN-4502. Fix two AM containers get allocated when AM restart. (Vinod Kumar Vavilapalli via wangda)
(cherry picked from commit 805a9ed85e)
2016-01-18 11:15:59 +08:00
Yongjun Zhang ee012c1f6f HDFS-9612. DistCp worker threads are not terminated after jobs are done. (Wei-Chiu Chuang via Yongjun Zhang)
(cherry picked from commit a9c69ebeb7)
2016-01-15 10:10:28 -08:00
Colin Patrick Mccabe cea1c71087 HADOOP-8887. Use a Maven plugin to build the native code using CMake (cmccabe)
(cherry picked from commit b1ed28fa77)

Conflicts:
	hadoop-common-project/hadoop-common/pom.xml
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
2016-01-14 11:13:13 -08:00
Colin Patrick Mccabe 2baeaa20a3 HDFS-9517. Fix missing @Test annotation on TestDistCpUtils.testUnpackAttributes (Wei-Chiu Chuang via cmccabe)
(cherry picked from commit 8315582c4f)
2016-01-13 16:33:02 -08:00
Lei Xu 63b8be149a HADOOP-11262. Enable YARN to use S3A. (Pieter Reuse via lei) 2016-01-12 12:21:29 -08:00
Xiaoyu Yao 521f60c094 HDFS-8584. NPE in distcp when ssl configuration file does not exist in class path. Contributed by Surendra Singh Lilhore.
(cherry picked from commit c2e2e13455)
2016-01-11 17:12:43 -08:00
Zhe Zhang 17dfa04be6 HDFS-9630. DistCp minor refactoring and clean up. Contributed by Kai Zheng.
Change-Id: I363c4ffcac32116ddcdc0a22fac3db92f14a0db0

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2016-01-11 09:53:20 -08:00
cnauroth 813841e10b HADOOP-12551. Introduce FileNotFoundException for WASB FileSystem API. Contributed by Dushyanth.
(cherry picked from commit 0e76f1fcea)
2016-01-09 22:18:22 -08:00
cnauroth debd13387d HADOOP-12678. Handle empty rename pending metadata file during atomic rename in redo path. Contributed by Madhumita Chakraborty.
(cherry picked from commit f0fa6d869b)
2016-01-08 20:19:11 -08:00
cnauroth 4753676a34 HADOOP-12634. Change Lazy Rename Pending Operation Completion of WASB to address case of potential data loss due to partial copy. Contributed by Gaurav Kanade.
(cherry picked from commit 978bbdfeb2)
2016-01-06 11:16:18 -08:00
Ravi Prakash 6330683778 HADOOP-12689. S3 filesystem operations stopped working correctly
(cherry picked from commit 2d16f40dab)
2016-01-05 23:43:17 -08:00
Wangda Tan 6eefae1b33 YARN-4510. Fix SLS startup failure caused by NPE. (Bibin A Chundatt via wangda) 2015-12-30 15:34:39 -08:00