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

4166 Commits

Author SHA1 Message Date
Sunil G 6d814ae068 YARN-7383. Node resource is not parsed correctly for resource names containing dot. Contributed by Gergely Novák. 
(cherry picked from commit 10fc8d2a7d)
 2017-12-13 22:01:28 +05:30
Weiwei Yang 415c69b36f YARN-7647. NM print inappropriate error log when node-labels is enabled. Contributed by Yang Wang. 2017-12-13 13:18:54 +08:00
Jason Lowe 472c7edc62 YARN-7595. Container launching code suppresses close exceptions after writes. Contributed by Jim Brennan 
(cherry picked from commit 2abab1d7c5)
 2017-12-12 16:07:47 -06:00
Weiwei Yang 3dc1ea6050 YARN-7608. Incorrect sTarget column causing DataTable warning on RM application and scheduler web page. Contributed by Gergely Novák. 2017-12-11 10:33:46 +08:00
Wangda Tan 41796ea60a YARN-7591. NPE in async-scheduling mode of CapacityScheduler. (Tao Yang via wangda) 
Change-Id: I67e086d6d35c3166ec0f6305490ea6527bd6d799
 2017-12-08 21:43:28 -08:00
Weiwei Yang 27c7a1f221 YARN-7607. Remove the trailing duplicated timestamp in container diagnostics message. Contributed by Weiwei Yang. 2017-12-07 17:36:31 +08:00
Robert Kanter cdf305c337 YARN-6483. addendum to skip failing test (asuresh via rkanter) 2017-12-06 12:10:59 -08:00
Weiwei Yang 8bfd30b921 YARN-7610. Extend Distributed Shell to support launching job with opportunistic containers. Contributed by Weiwei Yang. 
(cherry picked from commit 40b0045ebe)
 2017-12-06 19:10:34 +08:00
Weiwei Yang 48af34571f YARN-7611. Node manager web UI should display container type in containers page. Contributed by Weiwei Yang. 
(cherry picked from commit 05c347fe51)
 2017-12-06 12:24:00 +08:00
Wangda Tan 5cb1b97905 YARN-7381. Enable the configuration: yarn.nodemanager.log-container-debug-info.enabled by default in yarn-default.xml. (Xuan Gong via wangda) 
Change-Id: I1ed58dafad5cc276eea5c0b0813cf04f57d73a87
(cherry picked from commit 0311cf0535)
 2017-12-05 13:10:15 -08:00
Sunil G f034668b91 YARN-6907. Node information page in the old web UI should report resource types. Contributed by Gergely Novák. 
(cherry picked from commit 81f6e46b2f)
 2017-12-04 12:19:27 +05:30
Arun Suresh 6f123aae41 YARN-7587. Skip dispatching opportunistic containers to nodes whose queue is already full. (Weiwei Yang via asuresh) 
(cherry picked from commit 37ca416950)
 2017-12-03 22:23:46 -08:00
Jason Lowe 5db3ca39dc YARN-7455. quote_and_append_arg can overflow buffer. Contributed by Jim Brennan 
(cherry picked from commit 60f95fb719)
 2017-12-01 15:48:33 -06:00
Jason Lowe f222b9d362 YARN-7589. TestPBImplRecords fails with NullPointerException. Contributed by Daniel Templeton 
(cherry picked from commit 25df505421)
 2017-12-01 15:38:57 -06:00
Junping Du 58d849b858 YARN-7558. yarn logs command fails to get logs for running containers if UI authentication is enabled. Contributed by Xuan Gong. 
(cherry picked from commit a409425986)
 2017-11-30 13:49:00 -08:00
Jason Lowe f072caa0bc YARN-7495. Improve robustness of the AggregatedLogDeletionService. Contributed by Jonathan Eagles 
(cherry picked from commit 5cfaee2e6d)
 2017-11-30 12:40:45 -06:00
Daniel Templeton 40372be7bb YARN-7541. Node updates don't update the maximum cluster capability for resources other than CPU and memory 
(cherry picked from commit 8498d287cd)
 2017-11-30 09:26:25 -08:00
Jason Lowe a4f1e3036d YARN-6647. RM can crash during transitionToStandby due to InterruptedException. Contributed by Bibin A Chundatt 
(cherry picked from commit a2c7a73e33)
 2017-11-28 11:19:43 -06:00
Yufei Gu c0ab3c8407 YARN-7363. ContainerLocalizer don't have a valid log4j config in case of Linux container executor. (Contributed by Yufei Gu) 
(cherry picked from commit d8923cdbf1)
 2017-11-27 14:33:13 -08:00
Yufei Gu f335d509d3 YARN-7290. Method canContainerBePreempted can return true when it shouldn't. (Contributed by Steven Rand) 
(cherry picked from commit 2bde3aedf1)
 2017-11-24 23:39:03 -08:00
Wangda Tan 6e038165a6 YARN-7509. AsyncScheduleThread and ResourceCommitterService are still running after RM is transitioned to standby. (Tao Yang via wangda) 
Change-Id: I7477fe355419fd4a0a6e2bdda7319abad4c4c748
(cherry picked from commit 834e91ee91)
 2017-11-23 20:02:34 -08:00
Arun Suresh 5884b8a80a YARN-6483. Add nodes transitioning to DECOMMISSIONING state to the list of updated nodes returned to the AM. (Juan Rodriguez Hortala via asuresh) 
(cherry picked from commit b46ca7e73b)
 2017-11-22 19:19:52 -08:00
Yufei Gu b85eb9bb53 YARN-7524. Remove unused FairSchedulerEventLog. (Contributed by Wilfred Spiegelenburg) 
(cherry picked from commit 4cc9479dae)
 2017-11-22 14:19:36 -08:00
yufei 717634e45c YARN-7513. Remove the scheduler lock in FSAppAttempt.getWeight() (Contributed by Wilfred Spiegelenburg) 
(cherry picked from commit 03c311eae3)
 2017-11-21 10:35:06 -08:00
Haibo Chen b419e8aa25 YARN-7531. ResourceRequest.equal does not check ExecutionTypeRequest.enforceExecutionType(). 2017-11-21 09:12:27 -08:00
Wangda Tan adc5157a3c YARN-7527. Over-allocate node resource in async-scheduling mode of CapacityScheduler. (Tao Yang via wangda) 
Change-Id: I51ae6c2ab7a3d1febdd7d8d0519b63a13295ac7d
(cherry picked from commit 0d781dd03b)
 2017-11-20 13:14:17 -08:00
bibinchundatt fbcadfe3c4 YARN-7489. ConcurrentModificationException in RMAppImpl#getRMAppMetrics. Contributed by Tao Yang. 
(cherry picked from commit b5b81a4f08)
 2017-11-18 20:01:01 +05:30
bibinchundatt ae8d1b3c34 YARN-7525. Incorrect query parameters in cluster nodes REST API document. Contributed by Tao Yang. 
(cherry picked from commit 96e6a99360)
 2017-11-18 19:11:40 +05:30
Varun Vasudev 6681e7238b YARN-7430. Enable user re-mapping for Docker containers by default. Contributed by Eric Yang. 
(cherry picked from commit 5f0b238a11)
 2017-11-17 12:05:19 +05:30
Haibo Chen 9bbe7eb226 YARN-7390. All reservation related test cases failed when TestYarnClient runs against Fair Scheduler. (Yufei Gu via Haibo Chen) 
(cherry picked from commit 28d0fcbef4)
 2017-11-16 10:49:40 -08:00
Sunil G c3fb49667a YARN-7469. Capacity Scheduler Intra-queue preemption: User can starve if newest app is exactly at user limit. Contributed by Eric Payne. 
(cherry picked from commit 61ace174cd)
 2017-11-16 22:35:22 +05:30
Jason Lowe 9780d58a63 YARN-7361. Improve the docker container runtime documentation. Contributed by Shane Kumpf 
(cherry picked from commit fac72eef23)
 2017-11-15 12:32:56 -06:00
Daniel Templeton 570bc80901 YARN-7414. FairScheduler#getAppWeight() should be moved into FSAppAttempt#getWeight() 
(Contributed by Soumabrata Chakraborty via Daniel Templeton)

(cherry picked from commit b246c54749)
 2017-11-15 10:06:17 -08:00
Daniel Templeton 5536fa1e37 YARN-6953. Clean up ResourceUtils.setMinimumAllocationForMandatoryResources() and setMaximumAllocationForMandatoryResources() 
(Contributed by Manikandan R via Daniel Templeton)

(cherry picked from commit e094eb74b9)
 2017-11-15 10:06:11 -08:00
Andrew Wang 1c8d334287 Preparing for 3.0.1 development 2017-11-14 11:17:18 -08:00
Junping Du ef212b8550 YARN-6078. Containers stuck in Localizing state. Contributed by Billie Rinaldi. 
(cherry picked from commit e14f03dfbf)
 2017-11-13 15:28:21 -08:00
Wangda Tan 7b3cd10131 YARN-6909. Use LightWeightedResource when number of resource types more than two. (Sunil G via wangda) 
Change-Id: I90e021c5dea7abd9ec6bd73b2287c8adebe14595
 2017-11-13 14:45:40 -08:00
Daniel Templeton c2f479c248 YARN-7369. Improve the resource types docs 2017-11-13 11:08:58 -08:00
Daniel Templeton 5b55a74bad YARN-7442. [YARN-7069] Limit format of resource type name (Contributed by Wangda Tan via Daniel Templeton) 
(cherry picked from commit 2c6213a44280f5b3950167131293ff83f48ff56f)
 2017-11-13 11:03:56 -08:00
Subru Krishnan 37ae818660 YARN-7475. Fix Container log link in new YARN UI. (Sunil G via Subru). 
(cherry picked from commit 3c5b46c2ed)
(cherry picked from commit 3e26077848)
 2017-11-12 09:54:55 -08:00
bibinchundatt bfbf94197f YARN-7406. Moving logging APIs over to slf4j in hadoop-yarn-api. Contributed by Yeliang Cang. 
(cherry picked from commit 2c2b7a3672)
 2017-11-11 10:38:47 +05:30
Sean Mackrory abaf90792e YARN-7465. start-yarn.sh fails to start ResourceManagers unless running as root. 
(cherry picked from commit 1883a00249)
 2017-11-09 14:49:54 -07:00
Konstantinos Karanasos e55dc1700d YARN-7437. Rename PlacementSet and SchedulingPlacementSet. (Wangda Tan via kkaranasos) 
(cherry picked from commit ac4d2b1081)
 2017-11-09 13:07:10 -08:00
Robert Kanter 82abc7224f YARN-7386. Duplicate Strings in various places in Yarn memory (misha@cloudera.com via rkanter) 
(cherry picked from commit a2c150a736)
 2017-11-09 12:13:09 -08:00
Daniel Templeton 933a09e886 YARN-7143. FileNotFound handling in ResourceUtils is inconsistent 
Change-Id: Ib1bb487e14a15edd2b5a42cf5078c5a2b295f069
(cherry picked from commit db82a41d94872cea4d0c1bb1336916cebc2faeec)
 2017-11-09 11:59:16 -08:00
Wangda Tan 51d3693a9c YARN-7205. Log improvements for the ResourceUtils. (Sunil G via wangda) 
Change-Id: I0f5b7a7f68ec5d3e1d52211f83fdd089bc0bfd37
(cherry picked from commit 8bcc49e677)
 2017-11-09 11:59:16 -08:00
Haibo Chen 91a7f8d246 YARN-7388. TestAMRestart should be scheduler agnostic. 
(cherry picked from commit a1382a18df)
 2017-11-09 10:50:49 -08:00
bibinchundatt 4370b70e63 YARN-7454. RMAppAttemptMetrics#getAggregateResourceUsage can NPE due to double lookup. Contributed by Jason Lowe. 
(cherry picked from commit 0a72c2f56c)
 2017-11-09 21:08:47 +05:30
Daniel Templeton 9bcc9e3f4d YARN-7458. TestContainerManagerSecurity is still flakey 
(Contributed by Robert Kanter via Daniel Templeton)

Change-Id: Ibb1975ad086c3a33f8af0b4f8b9a13c3cdca3f7d
(cherry picked from commit 49b4c0b334)
 2017-11-08 17:32:34 -08:00
Daniel Templeton d2b16e3e83 YARN-7166. Container REST endpoints should report resource types 
Change-Id: If9c2fe58d4cf758bb6b6cf363dc01f35f8720987
(cherry picked from commit 0de10680b7)
 2017-11-08 16:51:20 -08:00
Arun Suresh 91e726c07f YARN-7453. Fix issue where RM fails to switch to active after first successful start. (Rohith Sharma K S via asuresh) 
(cherry picked from commit a9c70b0e84)
 2017-11-08 08:01:54 -08:00
Daniel Templeton 4e7b5824b4 YARN-7401. Reduce lock contention in ClusterNodeTracker#getClusterCapacity() 
(cherry picked from commit 8db9d61ac2)
 2017-11-07 14:58:56 -08:00
Haibo Chen 91e95dc484 YARN-7360. TestRM.testNMTokenSentForNormalContainer() should be scheduler agnostic. 
(cherry picked from commit 8f214dc4f8)
 2017-11-06 15:54:14 -08:00
Wangda Tan df27824b80 YARN-7410. Cleanup FixedValueResource to avoid dependency to ResourceUtils. (wangda) 2017-11-06 15:26:49 -08:00
Wangda Tan 170b6a48c4 YARN-7307. Allow client/AM update supported resource types via YARN APIs. (Sunil G via wangda) 2017-11-06 10:01:10 -08:00
bibinchundatt e49509f024 Add containerId to Localizer failed logs. Contributed by Prabhu Joseph 
(cherry picked from commit dcd99c4b9a)
 2017-11-06 23:07:16 +05:30
Inigo Goiri 3e70fd9af0 YARN-7434. Router getApps REST invocation fails with multiple RMs. Contributed by Inigo Goiri. 
(cherry picked from commit 6e2259264ad9525eeec2a14055d53236711659d7)
 2017-11-02 21:30:20 -07:00
Subru Krishnan 1b6de3fac5 YARN-7432. Fix DominantResourceFairnessPolicy serializable findbugs issues. (Daniel Templeton via Subru). 
(cherry picked from commit ad0fff2b41)
 2017-11-02 17:40:03 -07:00
Eric Payne 3d923d66e8 YARN-7370: Preemption properties should be refreshable. Contrubted by Gergely Novák. 
(cherry picked from commit e6ec02001f)
 2017-11-02 12:48:07 -05:00
Wangda Tan fb442e9a7c YARN-7364. Queue dash board in new YARN UI has incorrect values. (Sunil G via wangda) 
Change-Id: Ia5336f407147d2985a61b5f9f1e69b5b35f398a4
(cherry picked from commit 752f000e0f)
 2017-11-02 09:50:57 -07:00
Jason Lowe b7dee1f060 YARN-7286. Add support for docker to have no capabilities. Contributed by Eric Badger 
(cherry picked from commit d00b6f7c1f)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java
 2017-11-02 09:47:26 -05:00
Rohith Sharma K S 9efe9bd3d8 addendum patch for YARN-7289. 
(cherry picked from commit 940ffe3f9c)
 2017-11-02 14:02:48 +05:30
Eric Yang be7cfe57fc YARN-7412. Fix unit test for docker mount check on ubuntu. (Contributed by Eric Badger) 2017-11-01 18:45:24 -04:00
Junping Du 552f74e6b7 YARN-7400. Incorrect log preview displayed in jobhistory server ui. Contributed by Xuan Gong. 
(cherry picked from commit d57dba9942)
 2017-11-01 15:02:50 -07:00
Inigo Goiri 08c3efa4a0 YARN-7276. Federation Router Web Service fixes. Contributed by Inigo Goiri. 
(cherry picked from commit 8be5707067)
 2017-11-01 13:42:12 -07:00
Inigo Goiri 8d41875219 YARN-7276 addendum to add timeline service depencies. Contributed by Inigo Goiri. 
(cherry picked from commit 70f1a9470c)
 2017-11-01 13:28:50 -07:00
Daniel Templeton c025c9ac62 YARN-7336. Unsafe cast from long to int Resource.hashCode() method 
(Contributed by Miklos Szegedi via Daniel Templeton)

(cherry picked from commit d64736d589)
 2017-10-31 15:06:18 -07:00
Daniel Templeton 7689d4781a YARN-6927. Add support for individual resource types requests in MapReduce 
(Contributed by Gergo Repas via Daniel Templeton)

(cherry picked from commit 9a7e810838)
 2017-10-31 15:06:18 -07:00
Daniel Templeton 77401022a7 YARN-7374. Improve performance of DRF comparisons for resource types in fair scheduler 
(cherry picked from commit 9711b78998)
 2017-10-31 15:06:18 -07:00
Daniel Templeton ab93bf5b00 YARN-7397. Reduce lock contention in FairScheduler#getAppWeight() 
(cherry picked from commit e62bbbca7a)
 2017-10-31 15:06:18 -07:00
Daniel Templeton c818c85238 YARN-6984. DominantResourceCalculator.isAnyMajorResourceZero() should test all resources 
(Contributed by Sunil G via Daniel Templeton)

(cherry picked from commit 679f99b145)
 2017-10-31 15:06:18 -07:00
Daniel Templeton 68585156dc YARN-7270 addendum: Reapplied changes after YARN-3926 backports 2017-10-31 15:06:18 -07:00
Wangda Tan 6f41843906 YARN-7172. ResourceCalculator.fitsIn() should not take a cluster resource parameter. (Sen Zhao via wangda) 
Change-Id: Icc3670c9381ce7591ca69ec12da5aa52d3612d34
(cherry picked from commit e81596d06d)
 2017-10-31 15:06:18 -07:00
Yufei Gu f30f78a736 YARN-6612. Update fair scheduler policies to be aware of resource types. (Contributed by Daniel Templeton via Yufei Gu) 
(cherry picked from commit 09b476e6da)
 2017-10-31 15:06:18 -07:00
Sunil G 74030d808c YARN-7137. [YARN-3926] Move newly added APIs to unstable in YARN-3926 branch. Contributed by Wangda Tan. 
(cherry picked from commit da0b6a354b)
 2017-10-31 15:06:17 -07:00
Daniel Templeton 0db9ddb728 YARN-7136. Additional Performance Improvement for Resource Profile Feature 
(Contributed by Wangda Tan via Daniel Templeton)

(cherry picked from commit bf2b687412)
 2017-10-31 15:06:17 -07:00
Wangda Tan 335e3a6334 YARN-7056. [Partial backport] Document Resource Profiles feature. (Sunil G via wangda) 
Change-Id: I5f5d52cdf7aba4ac09684aab573e6916dbad183e
(cherry picked from commit 6b88cd1901)
 2017-10-31 15:06:17 -07:00
Sunil G 4bf29910a8 YARN-6933. [YARN-3926] ResourceUtils.DISALLOWED_NAMES check is duplicated. Contributed by Manikandan R. 
(cherry picked from commit 805095496d)
 2017-10-31 15:06:17 -07:00
Wangda Tan 00fcc8593b YARN-7093. Improve log message in ResourceUtils. (Sunil G via wangda) 
Change-Id: I88928a747ee3eec17bc76fb71e9aaa632d091f0f
(cherry picked from commit 53df3eac50)
 2017-10-31 15:06:17 -07:00
Wangda Tan 57bbdbeb80 YARN-7039. Fix javac and javadoc errors in YARN-3926 branch. (Sunil G via wangda) 
Change-Id: I442bf6d838b3aba83f1f6779cf9dcf8596a2102d
(cherry picked from commit e490602e9b)
 2017-10-31 15:06:17 -07:00
Sunil G 5dd008ca2e YARN-7067. [YARN-3926] Optimize ResourceType information display in UI. Contributed by Wangda Tan. 
(cherry picked from commit a333ba54e3)
 2017-10-31 15:06:17 -07:00
Wangda Tan 605fcde012 YARN-7043. [Partial backport] Cleanup ResourceProfileManager. (wangda) 
Change-Id: I463356f37bf1f6a3f1fc3c594c79916e8c0ab913
(cherry picked from commit 39240b61a1)
 2017-10-31 15:06:17 -07:00
Sunil G f2b881a505 YARN-6781. [YARN-3926] ResourceUtils#initializeResourcesMap takes an unnecessary Map parameter. Contributed by Yu-Tang Lin. 
(cherry picked from commit 758b771943)
 2017-10-31 15:06:17 -07:00
Wangda Tan 4af3deaeb0 YARN-6789. Add Client API to get all supported resource types from RM. (Sunil G via wangda) 
Change-Id: I366d8db6f6700acd087db5acb7a1be7e41b2b68d
(cherry picked from commit df3855541a)
 2017-10-31 15:06:17 -07:00
Wangda Tan 255668a2a6 YARN-7042. Clean up unit tests after YARN-6610. (Daniel Templeton via wangda) 
Change-Id: I8e40f704b6fcdd5b14faa9548a27986501044fa1
(cherry picked from commit b1fe3a222e)
 2017-10-31 15:06:17 -07:00
Sunil G 8827d93ca1 YARN-7030. [YARN-3926] Performance optimizations in Resource and ResourceUtils class. Contributed by Wangda Tan. 
(cherry picked from commit a6989af1d9)
 2017-10-31 15:06:17 -07:00
Sunil G 1ba85a9305 YARN-6610. [YARN-3926] DominantResourceCalculator#getResourceAsValue dominant param is updated to handle multiple resources. Contributed by Daniel Templeton. 
(cherry picked from commit a0030c8c6f)
 2017-10-31 15:06:17 -07:00
Sunil G 5231c43bdb YARN-6892. [YARN-3926] Improve API implementation in Resources and DominantResourceCalculator class. Contributed by Sunil G. 
(cherry picked from commit 2b51b262ab)
 2017-10-31 15:06:16 -07:00
Yufei Gu 9c4505f3fa YARN-6994. [YARN-3926] Remove last uses of Long from resource types code. (Daniel Templeton via Yufei Gu) 
(cherry picked from commit d5e9939ebb)
 2017-10-31 15:06:16 -07:00
Daniel Templeton 99c292403d YARN-6788. [YARN-3926] Improve performance of resource profile branch 
(Contributed by Sunil Govindan via Daniel Templeton)

(cherry picked from commit 3aeaafecb8)
 2017-10-31 15:06:16 -07:00
Sunil G 58f2c07028 YARN-6786. [YARN-3926] ResourcePBImpl imports cleanup. Contributed by Yeliang Cang. 
(cherry picked from commit 4e5632d28e)
 2017-10-31 15:06:16 -07:00
Sunil G 5fa0dc35c3 YARN-6761. Fix build for YARN-3926 branch. Contributed by Varun Vasudev. 
(cherry picked from commit ca2808d8bb)
 2017-10-31 15:06:16 -07:00
Sunil G 48ddb8f5b4 YARN-6445. [YARN-3926] Performance improvements in resource profile branch with respect to SLS. Contributed by Varun Vasudev. 
(cherry picked from commit 58da54640e)
 2017-10-31 15:06:16 -07:00
Sunil G bda5486dad YARN-6232. Update resource usage and preempted resource calculations to take into account all resource types. Contributed by Varun Vasudev. 
(cherry picked from commit dae65f3bef)
 2017-10-31 15:06:16 -07:00
Sunil G 4045ef047d YARN-5588. [Partial backport] [YARN-3926] Add support for resource profiles in distributed shell. Contributed by Varun Vasudev. 
(cherry picked from commit 7805deed48)
 2017-10-31 15:06:16 -07:00
Arun Suresh a9fa0349a0 YARN-5587. [Partial backport] Add support for resource profiles. (vvasudev via asuresh) 
(cherry picked from commit 6708ac3301)
 2017-10-31 15:06:16 -07:00
Rohith Sharma K S 3d1b59e04a YARN-5586. Update the Resources class to consider all resource types. Contributed by Varun Vasudev. 
(cherry picked from commit 239c1824a0)
 2017-10-31 15:06:16 -07:00
Rohith Sharma K S feb6d00e2a YARN-5242. Update DominantResourceCalculator to consider all resource types in calculations. Contributed by Varun Vasudev. 
(cherry picked from commit 9e4ba6aff5)
 2017-10-31 15:06:16 -07:00
Varun Vasudev 16beac12ad YARN-4830. Add support for resource types in the nodemanager. Contributed by Varun Vasudev. 
(cherry picked from commit 759114b006)
 2017-10-31 15:06:16 -07:00
Arun Suresh 92ca475fdc YARN-4829. Add support for binary units in Resource class.(vvasudev via asuresh) 
(cherry picked from commit 7ba698997b)
 2017-10-31 15:06:16 -07:00