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

3984 Commits

Author SHA1 Message Date
Jonathan Hung 7abffe4529 YARN-8559. Expose mutable-conf scheduler's configuration in RM /scheduler-conf endpoint. Contributed by Weiwei Yang. 2018-08-10 15:34:21 -07:00
Jason Lowe 2024260af6 YARN-8331. Race condition in NM container launched after done. Contributed by Pradeep Ambati 
(cherry picked from commit cd04e954d2)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java
 2018-08-09 10:35:07 -05:00
Haibo Chen 1991a1d760 YARN-6966. NodeManager metrics may return wrong negative values when NM restart. (Szilard Nemeth via Haibo Chen) 2018-08-02 10:06:16 -07:00
Arun Suresh e2b82b82e2 YARN-7542. Fix issue that causes some Running Opportunistic Containers to be recovered as PAUSED. (Sampada Dehankar via asuresh) 
(cherry picked from commit a55884c68e)
(cherry picked from commit bd4dcc7772)
 2018-08-02 09:59:04 -07:00
Rohith Sharma K S 21e416ad27 YARN-8155. Improve ATSv2 client logging in RM and NM publisher. Contributed by Abhishek Modi. 2018-08-01 22:25:53 +05:30
Eric E Payne 3aa17bd737 YARN-4606. CapacityScheduler: applications could get starved because computation of #activeUsers considers pending apps. Contributed by Manikandan R 
(cherry picked from commit 9485c9aee6)
 2018-07-25 17:06:47 +00:00
Robert Kanter edb9d8b554 YARN-8518. test-container-executor test_is_empty() is broken (Jim_Brennan via rkanter) 
(cherry picked from commit 1bc106a738)
(cherry picked from commit 6e0db6fe1a)
 2018-07-22 05:28:21 +00:00
Robert Kanter 92f02f97fd Only mount non-empty directories for cgroups (miklos.szegedi@cloudera.com via rkanter) 
(cherry picked from commit 0838fe8337)
(cherry picked from commit c1dc4ca2c6)
 2018-07-22 05:28:20 +00:00
Robert Kanter f5fd5aa025 Disable mounting cgroups by default (miklos.szegedi@cloudera.com via rkanter) 
(cherry picked from commit 351cf87c92)
(cherry picked from commit d61d84279f)
 2018-07-22 05:28:20 +00:00
Eric E Payne 8ee439d791 YARN-8421: when moving app, activeUsers is increased, even though app does not have outstanding request. Contributed by Kyungwan Nam 
(cherry picked from commit 937ef39b3f)
 2018-07-16 17:01:38 +00:00
Jason Lowe 0e6efe06ea YARN-8515. container-executor can crash with SIGPIPE after nodemanager restart. Contributed by Jim Brennan 
(cherry picked from commit 17118f446c)
 2018-07-13 10:11:57 -05:00
Sunil G 6cc5d49fa3 YARN-8473. Containers being launched as app tears down can leave containers in NEW state. Contributed by Jason Lowe. 
(cherry picked from commit 705e2c1f7c)
 2018-07-10 20:13:56 +05:30
Giovanni Matteo Fumarola aab9bfc13c YARN-7899. [AMRMProxy] Stateful FederationInterceptor for pending requests. Contributed by Botong Huang. 2018-07-09 16:47:44 -07:00
Giovanni Matteo Fumarola 64baa9ec89 YARN-8481. AMRMProxyPolicies should accept heartbeat response from new/unknown subclusters. Contributed by Botong Huang. 2018-06-29 11:51:50 -07:00
Jason Lowe 14c7dc3c1e YARN-8451. Multiple NM heartbeat thread created when a slow NM resync with RM. Contributed by Botong Huang 
(cherry picked from commit 100470140d)
 2018-06-29 13:17:14 -05:00
Sunil G 33e6eec7b8 YARN-8401. [UI2] new ui is not accessible with out internet connection. Contributed by Bibin A Chundatt. 
(cherry picked from commit fbaff369e9)
 2018-06-27 10:36:31 -07:00
Rohith Sharma K S f359b7e5e9 YARN-8457. Compilation is broken with -Pyarn-ui. 
(cherry picked from commit 4ffe68a6f7)
 2018-06-25 10:40:40 -07:00
Inigo Goiri 82874e7895 YARN-8412. Move ResourceRequest.clone logic everywhere into a proper API. Contributed by Botong Huang. 2018-06-21 18:25:30 -07:00
Sunil G 96a6798c1d YARN-8404. Timeline event publish need to be async to avoid Dispatcher thread leak in case ATS is down. Contributed by Rohith Sharma K S 
(cherry picked from commit 6307962b93)
 2018-06-13 16:10:57 +05:30
Inigo Goiri 85f3105e61 HADOOP-15529. ContainerLaunch#testInvalidEnvVariableSubstitutionType is not supported in Windows. Contributed by Giovanni Matteo Fumarola. 
(cherry picked from commit 6e756e8a62)
 2018-06-12 10:26:01 -07:00
Rohith Sharma K S 0af3bea05d YARN-8405. RM zk-state-store.parent-path ACLs has been changed since HADOOP-14773. Contributed by Íñigo Goiri. 
(cherry picked from commit 2df73dace0)
 2018-06-12 17:30:02 +05:30
Inigo Goiri 8be1640bf6 YARN-8370. Some Node Manager tests fail on Windows due to improper path/file separator. Contributed by Anbang Hu. 
(cherry picked from commit 2b2f672022)
 2018-06-11 19:27:34 -07:00
Inigo Goiri b991b38f51 YARN-8359. Exclude containermanager.linux test classes on Windows. Contributed by Jason Lowe. 
(cherry picked from commit 3492a1db2c0654ce5375360caa74a34f928f23be)
 2018-06-07 17:11:12 -07:00
Robert Kanter f97bd6bb7f YARN-4677. RMNodeResourceUpdateEvent update from scheduler can lead to race condition (wilfreds and gphillips via rkanter) 2018-06-04 15:59:27 -07:00
Sunil G d47a525163 YARN-4781. Support intra-queue preemption for fairness ordering policy. Contributed by Eric Payne. 2018-06-02 08:30:39 +05:30
Miklos Szegedi 81ee9938c5 YARN-8310. Handle old NMTokenIdentifier, AMRMTokenIdentifier, and ContainerTokenIdentifier formats. Contributed by Robert Kanter. 2018-05-24 15:50:17 -07:00
Wangda Tan 911852e932 YARN-8068. Application Priority field causes NPE in app timeline publish when Hadoop 2.7 based clients to 2.8+ (Sunil G via wangda) 
Change-Id: I7910bd1064a1b4dbbe2084080c060822ea6f3b48
(cherry picked from commit 9eef19b2ad)
 2018-05-24 13:05:23 -05:00
Rohith Sharma K S b0b32988d9 YARN-8346. Upgrading to 3.1 kills running containers with error 'Opportunistic container queue is full'. Contributed by Jason Lowe. 
(cherry picked from commit 4cc0c9b0ba)
 2018-05-24 12:27:18 +05:30
Inigo Goiri aa3b20b762 YARN-8327. Fix TestAggregatedLogFormat#testReadAcontainerLogs1 on Windows. Contributed by Giovanni Matteo Fumarola. 
(cherry picked from commit f09dc73001)
 2018-05-23 16:01:37 -07:00
Inigo Goiri 8f43ade46a YARN-8344. Missing nm.stop() in TestNodeManagerResync to fix testKillContainersOnResync. Contributed by Giovanni Matteo Fumarola. 
(cherry picked from commit e99e5bf104)
 2018-05-23 14:17:20 -07:00
Wangda Tan 777743beb6 YARN-8232. RMContainer lost queue name when RM HA happens. (Hu Ziqian via wangda) 
Change-Id: Ia21e1da6871570c993bbedde76ce32929e95970f
(cherry picked from commit 6b96a73bb0)
 2018-05-22 10:34:43 -05:00
Arun Suresh 113e2d6801 YARN-7900. [AMRMProxy] AMRMClientRelayer for stateful FederationInterceptor. (Botong Huang via asuresh) 2018-05-21 11:26:32 -07:00
Sunil G 19cf706711 YARN-8249. Few REST api's in RMWebServices are missing static user check. Contributed by Sunil G. 2018-05-16 12:18:25 +05:30
Haibo Chen e28af8b0eb YARN-8130 Race condition when container events are published for KILLED applications. (Rohith Sharma K S via Haibo Chen) 
(cherry picked from commit 2d00a0c71b)
 2018-05-15 11:58:56 +05:30
Vrushali C c2b05339cf YARN-8247 Incorrect HTTP status code returned by ATSv2 for non-whitelisted users. Contributed by Rohith Sharma K S 
(cherry picked from commit 3c95ca4f21)
 2018-05-14 11:30:00 +05:30
Jason Lowe 5e3369ccd2 YARN-8244. TestContainerSchedulerQueuing.testStartMultipleContainers failed. Contributed by Jim Brennan 
(cherry picked from commit dc912994a1)
 2018-05-11 14:20:53 -05:00
Rohith Sharma K S 3cb9888d56 YARN-8253. HTTPS Ats v2 api call fails with 'bad HTTP parsed'. Contributed by Charan Hebri. 
(cherry picked from commit 7450583721)
 2018-05-08 12:33:23 +05:30
Robert Kanter 312462532e HADOOP-15390. Yarn RM logs flooded by DelegationTokenRenewer trying to renew KMS tokens (xiaochen via rkanter) 
(cherry picked from commit 7ab08a9c37)
(cherry picked from commit 74e5b4b437)
 2018-05-07 12:39:57 -07:00
Rohith Sharma K S 250ea47985 YARN-8221. RMWebServices also need to honor yarn.resourcemanager.display.per-user-apps. Contributed by Sunil G. 
(cherry picked from commit ef3ecc308d)
 2018-04-27 23:00:19 +05:30
Sunil G a91d5c7e2c YARN-8215. ATS v2 returns invalid YARN_CONTAINER_ALLOCATED_HOST_HTTP_ADDRESS from NM. Contributed by Rohith Sharma K S. 
(cherry picked from commit 7fc09c4f72)
 2018-04-27 11:19:12 +05:30
Sunil G ab2b4290a0 YARN-8205. Application State is not updated to ATS if AM launching is delayed. Contributed by Rohith Sharma K S. 
(cherry picked from commit 1634de0fc1)
 2018-04-27 11:08:27 +05:30
Junping Du af70c69fb2 YARN-7598. Document how to use classpath isolation for aux-services in YARN. Contributed by Xuan Gong. 
(cherry picked from commit 56788d759f)
 2018-04-24 18:31:29 +08:00
Jason Lowe 06f3f453c2 YARN-7786. NullPointerException while launching ApplicationMaster. Contributed by lujie 2018-04-20 13:31:19 -05:00
Sunil G 733248cec7 YARN-6827. [ATS1/1.5] NPE exception while publishing recovering applications into ATS during RM restart. Contributed by Rohith Sharma K S. 
(cherry picked from commit 7d06806dfd)
 2018-04-20 12:12:26 +05:30
Jason Lowe 5ec195edbc YARN-7189. Container-executor doesn't remove Docker containers that error out early. Contributed by Eric Badger 
(cherry picked from commit 391ac5cdd2)
 2018-04-17 09:53:19 -05:00
Inigo Goiri 93fc813329 YARN-8164. Fix a potential NPE in AbstractSchedulerPlanFollower. Contributed by lujie. 
(cherry picked from commit f1461b2487)
 2018-04-16 17:32:50 -07:00
Inigo Goiri f37f680a4e YARN-8165. Incorrect queue name logging in AbstractContainerAllocator. Contributed by Weiwei Yan. 
(cherry picked from commit dd5e18c4ae)
 2018-04-16 17:07:38 -07:00
Eric Yang 0731756293 YARN-7810. Update TestDockerContainerRuntime to test with current user credential. 
(contributed by Shane Kumpf)
 2018-04-16 13:39:21 -04:00
Rohith Sharma K S 900e6b435a YARN-8156. Increase the default value of yarn.timeline-service.app-collector.linger-period.ms. Contributed by Charan Hebri. 
(cherry picked from commit 669eb7bdea)
 2018-04-14 11:15:30 +05:30
Wei-Chiu Chuang cc2a2a8e06 Revert "YARN-7810. Update TestDockerContainerRuntime to test with current user credential." 
This reverts commit 724bffdb89.
 2018-04-13 10:13:59 -07:00
Eric E Payne 7393020cb3 YARN-8147. TestClientRMService#testGetApplications sporadically fails. Contributed by Jason Lowe 
(cherry picked from commit 18844599ae)
 2018-04-12 18:19:12 +00:00
Eric E Payne b0dfb18daa YARN-8120. JVM can crash with SIGSEGV when exiting due to custom leveldb logger. Contributed by Jason Lowe. 
(cherry picked from commit 6bb128dfb8)
 2018-04-12 16:38:50 +00:00
Weiwei Yang a48deb1552 YARN-7527. Over-allocate node resource in async-scheduling mode of CapacityScheduler. Contributed by Tao Yang. 2018-04-12 10:12:46 +08:00
Eric Yang 724bffdb89 YARN-7810. Update TestDockerContainerRuntime to test with current user credential. 
(contributed by Shane Kumpf)

            Cherry-picked from: 59828be197
 2018-04-11 20:06:33 -04:00
Weiwei Yang 2b2e2ac5f4 YARN-6629. NPE occurred when container allocation proposal is applied but its resource requests are removed before. Contributed by Tao Yang. 2018-04-11 20:21:05 +08:00
Vrushali C fe4c7ee94c YARN-8073 TimelineClientImpl doesn't honor yarn.timeline-service.versions configuration. Contributed by Rohith Sharma K S 
(cherry picked from commit 345e7624d5)
 2018-04-11 09:51:42 +05:30
Subru Krishnan 05246b7585 YARN-8110. AMRMProxy recover should catch for all throwable to avoid premature exit. (Botong Huang via Subru). 
(cherry picked from commit 00905efab2)
 2018-04-06 16:38:28 -07:00
Haibo Chen b19267259b YARN-8107. Give an informative message when incorrect format is used in ATSv2 filter attributes. (Rohith Sharma K S via Haibo Chen) 
(cherry picked from commit 024d7c0870)
(cherry picked from commit b232dcab33)
(cherry picked from commit ca105d1c8e)
 2018-04-06 09:47:25 -07:00
Haibo Chen a7d8b4d775 YARN-6936. [Atsv2] Retrospect storing entities into sub application table from client perspective. (Rohith Sharma K S via Haibo Chen) 
(cherry picked from commit f8b8bd53c4)
(cherry picked from commit 6658018410)
(cherry picked from commit 9cb378f5c7)
 2018-04-05 11:45:01 -07:00
Subru Krishnan 304ce18714 YARN-8010. Add config in FederationRMFailoverProxy to not bypass facade cache when failing over. (Botong Huang via Subru). 
(cherry picked from commit 09999d7e01)
 2018-03-28 11:51:59 -07:00
Subru Krishnan b36b438043 Revert "YARN-8010. Add config in FederationRMFailoverProxy to not bypass facade cache when failing over. (Botong Huang via Subru)." 
This reverts commit 0ab1d2f25b.
 2018-03-28 11:51:59 -07:00
Zhe Zhang c93ab3e623 YARN-7623. Fix the CapacityScheduler Queue configuration documentation. Contributed by Jonathan Hung. 
(cherry picked from commit 0b1c2b5fe1)
(cherry picked from commit 0db6b8c93c)
(cherry picked from commit f3b41bb1ad)
 2018-03-28 11:44:44 -07:00
Subru Krishnan 0ab1d2f25b YARN-8010. Add config in FederationRMFailoverProxy to not bypass facade cache when failing over. (Botong Huang via Subru). 
(cherry picked from commit 2a2ef15caf)
 2018-03-27 17:47:37 -07:00
Rohith Sharma K S c2f26facd1 YARN-7986. ATSv2 REST API queries do not return results for uppercase application tags. Contributed by Charan Hebri. 
(cherry picked from commit 75fc05f369)
 2018-03-23 12:25:03 +05:30
Rohith Sharma K S 5fba8c67de YARN-7581. HBase filters are not constructed correctly in ATSv2. Contributed by Habio Chen. 2018-03-23 12:05:11 +05:30
Sunil G b39245d2a5 YARN-8063. DistributedShellTimelinePlugin wrongly check for entityId instead of entityType. Contributed by Rohith Sharma K S. 
(cherry picked from commit 22c5ddb7c4)
 2018-03-23 10:58:13 +05:30
Jason Lowe 13f74a3601 YARN-8054. Improve robustness of the LocalDirsHandlerService MonitoringTimerTask thread. Contributed by Jonathan Eagles 
(cherry picked from commit 5aa7052e31)
 2018-03-21 17:40:05 -05:00
Jason Lowe a253925862 Revert "YARN-7581. HBase filters are not constructed correctly in ATSv2. Contributed by Habio Chen." 
This reverts commit a01091e90c.
 2018-03-21 17:36:24 -05:00
Rohith Sharma K S a01091e90c YARN-7581. HBase filters are not constructed correctly in ATSv2. Contributed by Habio Chen. 
(cherry picked from commit 29acea5000)
 2018-03-21 08:30:03 +05:30
Yufei Gu 204674f414 YARN-8039. Clean up log dir configuration in TestLinuxContainerExecutorWithMocks.testStartLocalizer. Contributed by Miklos Szegedi. 
(cherry picked from commit 49c747ab18)
 2018-03-16 16:34:14 -07:00
Rohith Sharma K S 207daabbcc YARN-8003. Backport the code structure changes in YARN-7346 to branch-2. Contributed by Haibo Chen. 2018-03-07 13:25:28 +05:30
Sen Zhao bda2a9c2a0
YARN-7736. Fix itemization in YARN federation document 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 245751ffdc)
 2018-03-05 11:55:16 -08:00
Jason Lowe 0a3a878428 YARN-7511. NPE in ContainerLocalizer when localization failed for running container. Contributed by Tao Yang 
(cherry picked from commit 83798f15f8)
 2018-03-02 10:08:32 -06:00
Haibo Chen 45d012f208 YARN-7835. Race condition in NM while publishing events if second attempt is launched on the same node. (Rohith Sharma K S via Haibo Chen) 
(cherry picked from commit d1274c3b71)
 2018-02-28 21:24:17 -08:00
Gabor Bota 696e8e0299
HADOOP-15236. Fix typo in RequestHedgingProxyProvider and RequestHedgingRMFailoverProxyProvider 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit c36b4aa31c)
(cherry picked from commit b8942cb3bf)
 2018-02-23 13:58:08 +09:00
Jason Lowe 7a6aa7bf99 YARN-7945. Java Doc error in UnmanagedAMPoolManager for branch-2. Contributed by Botong Huang 2018-02-22 10:45:16 -06:00
Sunil G f7e5e45b72 YARN-7947. Capacity Scheduler intra-queue preemption can NPE for non-schedulable apps. Contributed by Eric Payne. 
(cherry picked from commit bdd2a184d7)
 2018-02-21 15:26:20 +05:30
Jason Lowe 51ad923f51 YARN-7813. Capacity Scheduler Intra-queue Preemption should be configurable for each queue. Contributed by Eric Payne 
(cherry picked from commit 85c611ad7d)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
 2018-02-19 15:44:56 -06:00
Rohith Sharma K S e35dfc85de YARN-7937. Fix http method name in Cluster Application Timeout Update API example request. Contributed by Charan Hebri. 
(cherry picked from commit 87bdde6943)
 2018-02-18 14:08:50 +05:30
Rohith Sharma K S da0660ec84 YARN-7919. Refactor timelineservice-hbase module into submodules. Contributed by Haibo Chen. 2018-02-18 13:26:10 +05:30
Billie Rinaldi aa64a50746 Revert "YARN-6078. Containers stuck in Localizing state. Contributed by Billie Rinaldi." 
This reverts commit a72dcb9cad.
 2018-02-07 08:58:28 -08:00
Billie Rinaldi 93128c1904 YARN-7890. NPE during container relaunch. Contributed by Jason Lowe 
(cherry picked from commit a196ee9362)
 2018-02-06 12:04:52 -08:00
Jason Lowe 260f30f063 YARN-7849. TestMiniYarnClusterNodeUtilization#testUpdateNodeUtilization fails due to heartbeat sync error. Contributed by Botong Huang 
(cherry picked from commit 60656bceca)
 2018-02-05 17:22:42 -06:00
Haibo Chen c25c082961 YARN-6868. Add test scope to certain entries in hadoop-yarn-server-resourcemanager pom.xml. (Ray Chiang via Haibo Chen) 
(cherry picked from commit a20e7105ea)
 2018-02-05 10:51:03 -08:00
Jinjiang Ling 987a8972ac
YARN-7698. A misleading variable's name in ApplicationAttemptEventDispatcher 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 3400d0c535)
 2018-01-30 00:13:04 +09:00
Jian He 0497e09339 YARN-7765. Fixed an issue that kerberos tgt not found when NM posting timeline events. Contributed by Rohith Sharma K S 2018-01-28 13:24:49 -08:00
Jason Lowe 4d7bbee0a1 YARN-7102. NM heartbeat stuck when responseId overflows MAX_INT. Contributed by Botong Huang 2018-01-25 17:56:36 -06:00
Sunil G bed683d300 YARN-7728. Expose container preemptions related information in Capacity Scheduler queue metrics. Contributed by Eric Payne. 
(cherry picked from commit 82cc6f6968)
 2018-01-25 14:34:31 +05:30
Zhe Zhang e9a338ff64 YARN-7737. prelaunch.err file not found exception on container failure. Contributed by Keqiu Hu. 
(cherry picked from commit fa8cf4d1b4)
(cherry picked from commit 83a4f92a3f)
 2018-01-24 13:10:35 -08:00
Jian He c611707e28 YARN-7801. AmFilterInitializer should addFilter after fill all parameters. Contributed by Wangda Tan 2018-01-24 11:19:46 -08:00
Sunil G ce43e93f92 YARN-7806. Distributed Shell should use timeline async api's. Contributed by Rohith Sharma K S 
(cherry picked from commit 97607617ce)
 2018-01-24 16:57:29 +05:30
Rohith Sharma K S f036609cea Revert "YARN-7537 [Atsv2] load hbase configuration from filesystem rather than URL. Contributed by Rohith Sharma" 
This reverts commit 41e10161b6.
 2018-01-24 15:05:53 +05:30
Jian He a80c2dbab5 YARN-7782. Enable user re-mapping for Docker containers in yarn-default.xml. Contributed by Eric Yang 2018-01-23 14:12:00 -08:00
Vrushali C 41e10161b6 YARN-7537 [Atsv2] load hbase configuration from filesystem rather than URL. Contributed by Rohith Sharma 2018-01-19 15:59:47 -08:00
Haibo Chen 895a0391fe YARN-5094. some YARN container events have timestamp of -1. 
(cherry picked from commit 4aca4ff759)
(cherry picked from commit 8793e45f53)
 2018-01-19 10:35:40 -08:00
Miklos Szegedi 86a2ac94b1 YARN-7758. Add an additional check to the validity of container and application ids passed to container-executor. Contributed by Yufei Gu. 2018-01-17 12:56:10 -08:00
Rohith Sharma K S 8985fccbbc YARN-6736. Consider writing to both ats v1 & v2 from RM for smoother upgrades. Contributed by Aaron Gresch. 
(cherry picked from commit d09058b2fd)
 2018-01-16 09:01:02 +05:30
Miklos Szegedi 09428b137f YARN-7705. Create the container log directory with correct sticky bit in C code. Contributed by Yufei Gu. 
(cherry picked from commit 2dcfc18)
 2018-01-12 17:44:31 -08:00
Sunil G e7a8d6bd1e YARN-7727. Incorrect log levels in few logs with QueuePriorityContainerCandidateSelector. Contributed by Prabhu Joseph. 
(cherry picked from commit 128d773a23)
 2018-01-12 15:56:08 +05:30
Miklos Szegedi 35527db157 YARN-7590. Improve container-executor validation check. Contributed by Eric Yang. 
(cherry picked from commit bc285da)
 2018-01-11 10:30:15 -08:00