big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,284 Commits 2 Branches 2 Tags 264 MiB
85e4961f60
Commit Graph

700 Commits

Author SHA1 Message Date
Ming Ma
7f3139e54d YARN-4720. Skip unnecessary NN operations in log aggregation. (Jun Gong via mingma) 2016-02-26 08:40:05 -08:00
Robert Kanter
d7fdec1e6b YARN-4579. Allow DefaultContainerExecutor container log directory permissions to be configurable (rchiang via rkanter) 2016-02-25 16:36:38 -08:00
Robert Kanter
954dd57043 YARN-4697. NM aggregation thread pool is not bound by limits (haibochen via rkanter) 2016-02-24 15:00:24 -08:00
Jason Lowe
d284e187b8 YARN-2046. Out of band heartbeats are sent only on container kill and possibly too early. Contributed by Ming Ma 2016-02-23 20:49:09 +00:00
Varun Vasudev
140cb5d745 YARN-4709. NMWebServices produces incorrect JSON for containers. Contributed by Varun Saxena. 2016-02-23 12:29:25 +05:30
Varun Vasudev
fa00d3e205 YARN-4655. Log uncaught exceptions/errors in various thread pools in YARN. Contributed by Sidharta Seethana. 2016-02-11 12:06:42 +05:30
Jason Lowe
fa328e2d39 YARN-4594. container-executor fails to remove directory tree when chmod required. Contributed by Colin Patrick McCabe 2016-02-03 17:21:12 +00:00
Varun Vasudev
1cd55e0c17 YARN-4649. Add additional logging to some NM state store operations. Contributed by Sidharta Seethana 2016-02-02 09:25:23 +05:30
Wangda Tan
9875325d5c YARN-4340. Add list API to reservation system. (Sean Po via wangda) 2016-02-02 10:17:33 +08:00
Rohith Sharma K S
ac68666803 YARN-4543. Fix random test failure in TestNodeStatusUpdater.testStopReentrant. (Akihiro Suda via rohithsharmaks) 2016-01-29 12:29:54 +05:30
Jason Lowe
61382ff8fa YARN-4643. Container recovery is broken with delegating container runtime. Contributed by Sidharta Seethana 2016-01-28 18:59:35 +00:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.)
2085e60a96 YARN-3542. Refactored existing CPU cgroups support to use the newer and integrated ResourceHandler mechanism, and also deprecated the old LCEResourceHandler inteface hierarchy. Contributed by Varun Vasudev. 2016-01-25 16:19:36 -08:00
Jian He
992dd2f783 YARN-4520. Finished app info is unnecessarily persisted in NM state-store if container is acquired but not lunched on this node. Contributed by sandflee 2016-01-25 15:36:14 -08:00
Xuan
618bfd6ac2 YARN-4496. Improve HA ResourceManager Failover detection on the client. 
Contributed by Jian He
 2016-01-22 18:20:38 -08:00
Jason Lowe
46e5ea81e0 YARN-4598. Invalid event: RESOURCE_FAILED at CONTAINER_CLEANEDUP_AFTER_KILL. Contributed by tangshangwen 2016-01-22 21:55:01 +00:00
Varun Vasudev
b41a7e89d1 YARN-4578. Directories that are mounted in docker containers need to be more restrictive/container-specific. Contributed by Sidharta Seethana. 2016-01-22 14:43:14 +05:30
Wangda Tan
89d1fd5dac HADOOP-12356. Fix computing CPU usage statistics on Windows. (Inigo Goiri via wangda) 2016-01-19 21:27:38 +08:00
Karthik Kambatla
d40859fab1 YARN-4526. Make SystemClock singleton so AppSchedulingInfo could use it. (kasha) 2016-01-18 10:58:14 +01:00
Colin Patrick Mccabe
b2c155f810 HADOOP-12712. Fix some cmake plugin and native build warnings (cmccabe) 2016-01-15 12:29:18 -08:00
Colin Patrick Mccabe
b1ed28fa77 HADOOP-8887. Use a Maven plugin to build the native code using CMake (cmccabe) 2016-01-14 11:02:34 -08:00
Varun Vasudev
3ddb92bd30 YARN-4553. Add cgroups support for docker containers. Contributed by Sidharta Seethana. 2016-01-14 14:29:29 +05:30
Jason Lowe
13de8359a1 YARN-4414. Nodemanager connection errors are retried at multiple levels. Contributed by Chang Li 2016-01-12 15:56:15 +00:00
Akira Ajisaka
52b77577c4 YARN-4544. All the log messages about rolling monitoring interval are shown with WARN level. Contributed by Takashi Ohnishi. 2016-01-08 01:12:46 +09:00
Steve Loughran
07d1cb612c YARN-4550. Some tests in TestContainerLanch fails on non-english locale environment. (Takashi Ohnishi via stevel) 2016-01-07 14:30:20 +00:00
rohithsharmaks
791c1639ae YARN-4393. Fix intermittent test failure for TestResourceLocalizationService#testFailedDirsResourceRelease (Varun Saxana via rohithsharmaks) 2016-01-07 09:38:47 +05:30
Rohith Sharma K S
f9e36dea96 YARN-4530. LocalizedResource trigger a NPE Cause the NodeManager exit. (tangshangwen via rohithsharmaks) 2016-01-04 09:58:13 +05:30
Gera Shegalov
2c17b81569 YARN-2934. Improve handling of container's stderr. (Naganarasimha G R via gera) 2015-12-24 23:48:05 -08:00
Uma Mahesh
0f82b5d878 YARN-4480. Clean up some inappropriate imports. (Kai Zheng via umamahesh) 2015-12-19 23:10:13 -08:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.)
4e7d32c0db YARN-1856. Added cgroups based memory monitoring for containers as another alternative to custom memory-monitoring. Contributed by Varun Vasudev. 2015-12-17 12:13:03 -08:00
Wangda Tan
79c41b1d83 YARN-4293. ResourceUtilization should be a part of yarn node CLI. (Sunil G via wangda) 2015-12-16 13:18:19 -08:00
Jian He
915cd6c3f4 YARN-4402. TestNodeManagerShutdown And TestNodeManagerResync fails with bind exception. Contributed by Brahma Reddy Battula 2015-12-14 14:59:01 -08:00
Wangda Tan
dfcbbddb09 YARN-4309. Add container launch related debug information to container logs when a container fails. (Varun Vasudev via wangda) 2015-12-14 11:13:22 -08:00
rohithsharmaks
15c3e7ffe3 YARN-4431. Not necessary to do unRegisterNM() if NM get stop due to failed to connect to RM. (Junpin Du via rohithsharmaks) 2015-12-09 10:50:43 +05:30
Steve Loughran
65f395226b HADOOP-12321. Make JvmPauseMonitor an AbstractService. (Sunil G via Stevel) [includes HDFS-8947 MAPREDUCE-6462 and YARN-4072] 2015-12-06 17:43:35 +00:00
Jian He
9f77ccad73 YARN-3840. Resource Manager web ui issue when sorting application by id (with application having id > 9999). Contributed by Mohammad Shahid Khan and Varun Saxena 2015-12-03 12:48:50 -08:00
Junping Du
62e9348bc1 YARN-4408. Fix issue that NodeManager still reports negative running containers. Contributed by Robert Kanter. 2015-12-03 06:36:37 -08:00
Tsuyoshi Ozawa
0656d2dc83 YARN-4380. TestResourceLocalizationService.testDownloadingResourcesOnContainerKill fails intermittently. Contributed by Varun Saxena. 2015-11-26 01:10:02 +09:00
Jason Lowe
4ac6799d4a YARN-4132. Separate configs for nodemanager to resourcemanager connection timeout and retries. Contributed by Chang Li 2015-11-24 22:35:37 +00:00
Karthik Kambatla
52948bb20b YARN-3980. Plumb resource-utilization info in node heartbeat through to the scheduler. (Inigo Goiri via kasha) 2015-11-24 13:47:17 +05:30
Jian He
fcd7888029 Revert "YARN-3840. Resource Manager web ui issue when sorting application by id (with application having id > 9999) Contributed by Mohammad Shahid Khan" 
This reverts commit 8fbea531d7.

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2015-11-16 20:18:44 -08:00
Junping Du
855d52927b YARN-4354. Public resource localization fails with NPE. Contributed by Jason Lowe. 2015-11-15 04:43:57 -08:00
Jian He
8fbea531d7 YARN-3840. Resource Manager web ui issue when sorting application by id (with application having id > 9999) Contributed by Mohammad Shahid Khan 2015-11-09 10:43:45 -08:00
Jason Lowe
e2267de207 YARN-2902. Killing a container that is localizing can orphan resources in the DOWNLOADING state. Contributed by Varun Saxena 2015-10-29 16:34:25 +00:00
Akira Ajisaka
8a68630dd1 YARN-4300. [JDK8] Fix javadoc errors caused by wrong tags. (aajisaka) 2015-10-27 10:28:01 +09:00
Wangda Tan
6f606214e7 YARN-4169. Fix racing condition of TestNodeStatusUpdaterForLabels. (Naganarasimha G R via wangda) 2015-10-26 16:36:34 -07:00
Rohith Sharma K S
5acdde4744 YARN-2729. Support script based NodeLabelsProvider Interface in Distributed Node Label Configuration Setup. (Naganarasimha G R via rohithsharmaks) 2015-10-26 15:42:42 +05:30
Tsuyoshi Ozawa
ce60b4fc8b YARN-3528. Tests with 12345 as hard-coded port break jenkins. Contributed by Brahma Reddy Battula. 2015-10-26 16:45:11 +09:00
Allen Wittenauer
1aa735c188 YARN-3724. Use POSIX nftw(3) instead of fts(3) (Alan Burlison via aw) 2015-10-25 21:43:23 -07:00
Jonathan Eagles
f8adeb712d YARN-4009. CORS support for ResourceManager REST API. ( Varun Vasudev via jeagles) 2015-10-23 10:34:08 -05:00
Varun Vasudev
151eab2a12 YARN-4267. Add additional logging to container launch implementations in container-executor. Contributed by Sidharta Seethana. 2015-10-19 20:56:01 +05:30
Varun Vasudev
e39ae0e676 YARN-4262. Allow whitelisted users to run privileged docker containers. Contributed by Sidharta Seethana. 2015-10-19 20:19:22 +05:30
Steve Loughran
e2d59e2c7b YARN-4155. TestLogAggregationService.testLogAggregationServiceWithInterval failing. (Bibin A Chundatt via stevel) 2015-10-18 12:03:57 +01:00
Varun Vasudev
63020c54c1 YARN-4258. Add support for controlling capabilities for docker containers. Contributed by Sidharta Seethana. 2015-10-15 13:41:20 +05:30
Steve Loughran
dfa7848463 HADOOP-12478. Shell.getWinUtilsPath() has been renamed Shell.getWinutilsPath(). (stevel) 2015-10-14 20:25:47 +01:00
Varun Vasudev
da1ee078f9 YARN-4255. container-executor does not clean up docker operation command files. Contributed by Sidharta Seethana. 2015-10-14 15:25:21 +05:30
Varun Vasudev
fb9c1519b3 YARN-4252. Log container-executor invocation details when exit code is non-zero. Contributed by Sidharta Seethana. 2015-10-14 15:18:08 +05:30
Varun Vasudev
8d59293089 YARN-4253. Standardize on using PrivilegedOperationExecutor for all invocations of container-executor in LinuxContainerExecutor. Contributed by Sidharta Seethana. 2015-10-14 14:58:10 +05:30
Steve Loughran
c59af2fdf8 HADOOP-10775. Shell operations to fail with meaningful errors on windows if winutils.exe not found. (stevel) 2015-10-13 21:49:28 +01:00
Varun Vasudev
5b6bae0094 YARN-4017. container-executor overuses PATH_MAX. Contributed by Sidharta Seethana 2015-10-13 12:48:30 +05:30
Jason Lowe
a0bca2b5ad YARN-261. Ability to fail AM attempts. Contributed by Andrey Klochkov and Rohith Sharma K S 2015-10-09 14:17:38 +00:00
Jason Lowe
8d226225d0 YARN-3943. Use separate threshold configurations for disk-full detection and disk-not-full detection. Contributed by Zhihai Xu 2015-10-08 22:25:34 +00:00
Wangda Tan
30ac69c6bd YARN-4176. Resync NM nodelabels with RM periodically for distributed nodelabels. (Bibin A Chundatt via wangda) 2015-10-05 15:47:21 -07:00
Vinod Kumar Vavilapalli
f1c19b9365 HADOOP-12441. Fixed shell-kill command behaviour to work correctly on some Linux distributions after HADOOP-12317. Contributed by Wangda Tan. 2015-10-05 10:56:55 -07:00
Xuan
8f08532bde YARN-1897. CLI and core support for signal container functionality. Contributed by Ming Ma 2015-10-02 18:50:47 -07:00
Jason Lowe
fdf02d1f26 YARN-3619. ContainerMetrics unregisters during getMetrics and leads to ConcurrentModificationException. Contributed by Zhihai Xu 2015-10-02 20:20:31 +00:00
Jason Lowe
854d25b0c3 YARN-3727. For better error recovery, check if the directory exists before using it for localization. Contributed by Zhihai Xu 2015-09-30 14:59:44 +00:00
Rohith Sharma K S
8ed0d4b744 YARN-4152. NodeManager crash with NPE when LogAggregationService#stopContainer called for absent container. (Bibin A Chundatt via rohithsharmaks) 2015-09-24 11:24:14 +05:30
Jian He
c57eac5dfe YARN-3868. Recovery support for container resizing. Contributed by Meng Ding 2015-09-23 13:29:38 -07:00
Jian He
c3dc1af072 YARN-1644. RM-NM protocol changes and NodeStatusUpdater implementation to support container resizing. Contributed by Meng Ding 2015-09-23 13:29:37 -07:00
Jian He
c59ae4eeb1 YARN-1643. Make ContainersMonitor support changing monitoring size of an allocated container. Contributed by Meng Ding and Wangda Tan 2015-09-23 13:29:37 -07:00
Jian He
5f5a968d65 YARN-3867. ContainerImpl changes to support container resizing. Contributed by Meng Ding 2015-09-23 13:29:37 -07:00
Jian He
ffd820c27a YARN-1645. ContainerManager implementation to support container resizing. Contributed by Meng Ding & Wangda Tan 2015-09-23 13:29:37 -07:00
Jian He
83a18add10 YARN-1449. AM-NM protocol changes to support container resizing. Contributed by Meng Ding & Wangda Tan) 2015-09-23 13:29:36 -07:00
Jason Lowe
c890c51a91 YARN-4095. Avoid sharing AllocatorPerContext object in LocalDirAllocator between ShuffleHandler and LocalDirsHandlerService. Contributed by Zhihai Xu 2015-09-23 15:42:01 +00:00
Xuan
34ef1a092b YARN-4149. yarn logs -am should provide an option to fetch all the log 
files. Contributed by Varun Vasudev
 2015-09-15 14:36:30 -07:00
Jason Lowe
8c1cdb17a0 YARN-4158. Remove duplicate close for LogWriter in AppLogAggregatorImpl#uploadLogsForContainers. Contributed by Zhihai Xu 2015-09-15 20:21:33 +00:00
Varun Vasudev
486d5cb803 YARN-4136. LinuxContainerExecutor loses info when forwarding ResourceHandlerException. Contributed by Bibin A Chundatt. 2015-09-11 14:37:48 +05:30
Wangda Tan
77666105b4 YARN-4106. NodeLabels for NM in distributed mode is not updated even after clusterNodelabel addition in RM. (Bibin A Chundatt via wangda) 2015-09-10 09:30:09 -07:00
Zhihai Xu
16b9037dc1 YARN-4096. App local logs are leaked if log aggregation fails to initialize for the app. Contributed by Jason Lowe. 2015-09-08 12:29:54 -07:00
Jian He
6f72f1e600 YARN-2884. Added a proxy service in NM to proxy the the communication between AM and RM. Contributed by Kishore Chaliparambil 2015-09-08 09:35:46 +08:00
Varun Vasudev
1dbd8e34a7 YARN-3591. Resource localization on a bad disk causes subsequent containers failure. Contributed by Lavkesh Lahngir. 2015-09-07 11:32:12 +05:30
Rohith Sharma K S
095ab9ab5f YARN-4073. Removed unused ApplicationACLsManager in ContainerManagerImpl constructor. (Naganarasimha G R via rohithsharmaks) 2015-09-02 14:13:33 +05:30
Xuan
b71c6006f5 YARN-221. Addendum patch to compilation issue which is caused by missing 
AllContainerLogAggregationPolicy. Contributed by Xuan Gong
 2015-08-23 16:46:30 -07:00
Xuan
37e1c3d82a YARN-221. NM should provide a way for AM to tell it not to aggregate 
logs. Contributed by Ming Ma
 2015-08-22 16:25:24 -07:00
Wangda Tan
fc07464d1a YARN-2923. Support configuration based NodeLabelsProvider Service in Distributed Node Label Configuration Setup. (Naganarasimha G R) 2015-08-20 11:51:03 -07:00
Zhihai Xu
14215c8ef8 YARN-4057. If ContainersMonitor is not enabled, only print related log info one time. Contributed by Jun Gong. 2015-08-18 11:36:02 -07:00
Karthik Kambatla
13604bd5f1 YARN-4055. Report node resource utilization in heartbeat. (Inigo Goiri via kasha) 2015-08-16 15:08:53 -07:00
Karthik Kambatla
def12933b3 YARN-3534. Collect memory/cpu usage on the node. (Inigo Goiri via kasha) 2015-08-16 06:24:16 -07:00
Jian He
38aed1a94e YARN-4005. Completed container whose app is finished is possibly not removed from NMStateStore. Contributed by Jun Gong 2015-08-13 14:46:08 -07:00
Junping Du
cfee02b3bd YARN-4019. Add JvmPauseMonitor to ResourceManager and NodeManager. Contributed by Robert Kanter. 2015-08-06 06:49:45 -07:00
Xuan
c3364ca8e7 YARN-4004. container-executor should print output of docker logs if the 
docker container exits with non-0 exit status. Contributed by Varun
Vasudev
 2015-08-03 18:10:11 -07:00
Jason Lowe
469cfcd695 YARN-3965. Add startup timestamp to nodemanager UI. Contributed by Hong Zhiguo 2015-08-03 15:53:32 +00:00
Xuan
f170934215 YARN-3982. container-executor parsing of container-executor.cfg broken 
in trunk and branch-2. Contributed by Varun Vasudev
 2015-07-27 23:45:58 -07:00
Varun Vasudev
3e6fce91a4 YARN-3853. Add docker container runtime support to LinuxContainterExecutor. Contributed by Sidharta Seethana. 2015-07-27 11:57:40 -07:00
Varun Vasudev
f36835ff9b YARN-3852. Add docker container support to container-executor. Contributed by Abin Shahab. 2015-07-27 10:14:51 -07:00
Jason Lowe
ff9c13e0a7 YARN-3925. ContainerLogsUtils#getContainerLogFile fails to read container log files from full disks. Contributed by zhihai xu 2015-07-24 22:14:39 +00:00
Wangda Tan
06e5dd2c84 YARN-3956. Fix TestNodeManagerHardwareUtils fails on Mac (Varun Vasudev via wangda) 2015-07-22 12:01:41 -07:00
Colin Patrick Mccabe
419c51d233 YARN-3844. Make hadoop-yarn-project Native code -Wall-clean (Alan Burlison via Colin P. McCabe) 2015-07-17 11:38:59 -07:00
Akira Ajisaka
19295b36d9 YARN-3381. Fix typo InvalidStateTransitonException. Contributed by Brahma Reddy Battula. 2015-07-13 17:52:13 +09:00
Zhijie Shen
1ea36299a4 YARN-3116. RM notifies NM whether a container is an AM container or normal task container. Contributed by Giovanni Matteo Fumarola. 2015-07-10 18:58:10 -07:00
Karthik Kambatla
527c40e4d6 YARN-1012. Report NM aggregated container resource utilization in heartbeat. (Inigo Goiri via kasha) 2015-07-09 09:35:14 -07:00
Varun Vasudev
63d0365088 YARN-2194. Addendum patch to fix failing unit test in TestPrivilegedOperationExecutor. Contributed by Sidharta Seethana. 2015-07-09 11:51:59 +05:30
Varun Vasudev
c40bdb56a7 YARN-2194. Fix bug causing CGroups functionality to fail on RHEL7. Contributed by Wei Yan. 2015-07-07 16:59:29 +05:30
Jason Lowe
b5cdf78e8e YARN-3793. Several NPEs when deleting local files on NM recovery. Contributed by Varun Saxena 2015-07-01 21:13:32 +00:00
Colin Patrick Mccabe
d0cc0380b5 YARN-3827. Migrate YARN native build to new CMake framework (Alan Burlison via Colin P. McCabe) 2015-06-30 16:24:19 -07:00
Jian He
62e583c7dc YARN-3695. ServerProxy (NMProxy, etc.) shouldn't retry forever for non network exception. Contributed by Raju Bairishetti 2015-06-29 13:37:32 -07:00
Jason Lowe
40b256949a YARN-3850. NM fails to read files from full disks which can lead to container logs being lost and other issues. Contributed by Varun Saxena 2015-06-26 15:47:07 +00:00
Jason Lowe
8d58512d6e YARN-3832. Resource Localization fails on a cluster due to existing cache directories. Contributed by Brahma Reddy Battula 2015-06-24 16:37:39 +00:00
Karthik Kambatla
5ebf2817e5 YARN-3842. NMProxy should retry on NMNotYetReadyException. (Robert Kanter via kasha) 2015-06-22 17:47:47 -07:00
Xuan
6c7a9d502a YARN-3834. Scrub debug logging of tokens during resource localization. Contributed by Chris Nauroth 2015-06-21 17:13:44 -07:00
Devaraj K
126321eded YARN-3747. TestLocalDirsHandlerService should delete the created test 
directory logDir2. Contributed by David Moore.
 2015-06-08 15:32:13 +05:30
Junping Du
d7e7f6aa03 YARN-41. The RM should handle the graceful shutdown of the NM. Contributed by Devaraj K. 2015-06-04 04:59:27 -07:00
Jason Lowe
e13b671aa5 YARN-3585. NodeManager cannot exit on SHUTDOWN event triggered and NM recovery is enabled. Contributed by Rohith Sharmaks 2015-06-03 19:44:07 +00:00
Robert Kanter
6aec13cb33 YARN-3713. Remove duplicate function call storeContainerDiagnostics in ContainerDiagnosticsUpdateTransition (zxu via rkanter) 2015-05-29 15:34:37 -07:00
Andrew Wang
7673d4f205 HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang) 2015-05-29 14:54:18 -07:00
cnauroth
4102e5882e YARN-3626. On Windows localized resources are not moved to the front of the classpath when they should be. Contributed by Craig Welch. 2015-05-27 14:31:49 -07:00
Vinod Kumar Vavilapalli
500a1d9c76 YARN-160. Enhanced NodeManager to automatically obtain cpu/memory values from underlying OS when configured to do so. Contributed by Varun Vasudev. 2015-05-26 11:38:35 -07:00
Junping Du
132d909d4a YARN-3594. WintuilsProcessStubExecutor.startStreamReader leaks streams. Contributed by Lars Francke. 2015-05-22 04:23:25 -07:00
Vinod Kumar Vavilapalli
53fafcf061 YARN-3684. Changed ContainerExecutor's primary lifecycle methods to use a more extensible mechanism of context objects. Contributed by Sidharta Seethana. 2015-05-21 15:50:23 -07:00
Jian He
6329bd00fa YARN-3654. ContainerLogsPage web UI should not have meta-refresh. Contributed by Xuan Gong 2015-05-20 17:20:21 -07:00
Wangda Tan
b37da52a1c YARN-3565. NodeHeartbeatRequest/RegisterNodeManagerRequest should use NodeLabel object instead of String. (Naganarasimha G R via wangda) 2015-05-19 16:34:17 -07:00
Colin Patrick Mccabe
470c87dbc6 HADOOP-11970. Replace uses of ThreadLocal<Random> with JDK7 ThreadLocalRandom (Sean Busbey via Colin P. McCabe) 2015-05-19 10:50:15 -07:00
Ravi Prakash
c97f32e7b9 YARN-3302. TestDockerContainerExecutor should run automatically if it can detect docker in the usual place (Ravindra Kumar Naik via raviprak) 2015-05-19 10:28:11 -07:00
Junping Du
03a293aed6 YARN-3505 addendum: fix an issue in previous patch. 2015-05-15 06:39:39 -07:00
Ravi Prakash
53fe4eff09 YARN-1519. Check in container-executor if sysconf is implemented before using it (Radim Kolar and Eric Payne via raviprak) 2015-05-14 15:55:37 -07:00
Junping Du
15ccd967ee YARN-3505. Node's Log Aggregation Report with SUCCEED should not cached in RMApps. Contributed by Xuan Gong. 2015-05-14 10:58:12 -07:00
Jason Lowe
711d77cc54 YARN-3641. NodeManager: stopRecoveryStore() shouldn't be skipped when exceptions happen in stopping NM's sub-services. Contributed by Junping Du 2015-05-13 21:06:47 +00:00
Xuan
0f95921447 YARN-3626. On Windows localized resources are not moved to the front of the classpath when they should be. Contributed by Craig Welch 2015-05-13 13:10:53 -07:00
Devaraj K
5c2f05cd9b YARN-3629. NodeID is always printed as "null" in node manager 
initialization log. Contributed by nijel.
 2015-05-12 22:20:25 +05:30
Devaraj K
8badd82ce2 YARN-3513. Remove unused variables in ContainersMonitorImpl and add debug 
log for overall resource usage by all containers.  Contributed by
Naganarasimha G R.
 2015-05-12 16:54:38 +05:30
Karthik Kambatla
70fb37cd79 YARN-1287. Consolidate MockClocks. (Sebastian Wong and Anubhav Dhoot via kasha) 2015-05-09 14:34:54 -07:00
Xuan
6471d18bc7 YARN-1912. ResourceLocalizer started without any jvm memory control. 
Contributed by Masatake Iwasaki
 2015-05-08 20:01:21 -07:00
Xuan
333f9a896d YARN-3602. TestResourceLocalizationService.testPublicResourceInitializesLocalDir fails Intermittently due to IOException from cleanup. Contributed by zhihai xu 2015-05-08 17:52:54 -07:00
Jason Lowe
25e2b02122 YARN-3476. Nodemanager can fail to delete local logs if log aggregation fails. Contributed by Rohith 2015-05-08 22:45:52 +00:00
Xuan
088156de43 YARN-2331. Distinguish shutdown during supervision vs. shutdown for 
rolling upgrade. Contributed by Jason Lowe
 2015-05-08 15:10:43 -07:00
Robert (Bobby) Evans
bcf2890502 YARN-644: Basic null check is not performed on passed in arguments before using them in ContainerManagerImpl.startContainer 2015-05-08 11:11:01 -05:00
Devaraj K
241a72af0d YARN-2784. Make POM project names consistent. Contributed by Rohith. 2015-05-08 19:23:53 +05:30
Akira Ajisaka
b167fe7605 YARN-1832. Fix wrong MockLocalizerStatus#equals implementation. Contributed by Hong Zhiguo. 2015-05-08 11:14:45 +09:00
Akira Ajisaka
918af8efff YARN-3577. Misspelling of threshold in log4j.properties for tests. Contributed by Brahma Reddy Battula. 2015-05-07 13:33:03 +09:00
Robert Kanter
b72507810a YARN-3491. PublicLocalizer#addResource is too slow. (zxu via rkanter) 2015-05-06 14:19:06 -07:00
Junping Du
3810242062 YARN-3396. Handle URISyntaxException in ResourceLocalizationService. (Contributed by Brahma Reddy Battula) 2015-05-05 10:18:23 -07:00
Wangda Tan
71f4de220c YARN-3375. NodeHealthScriptRunner.shouldRun() check is performing 3 times for starting NodeHealthScriptRunner (Devaraj K via wangda) 2015-05-04 15:49:19 -07:00
Jason Lowe
8f65c793f2 YARN-3097. Logging of resource recovery on NM restart has redundancies. Contributed by Eric Payne 2015-05-04 15:31:15 +00:00
Robert Kanter
ac7d152901 YARN-3363. add localization and container launch time to ContainerMetrics at NM to show these timing information for each active container. (zxu via rkanter) 2015-05-01 16:39:21 -07:00
Vinod Kumar Vavilapalli
1b3b9e5c31 YARN-2619. Added NodeManager support for disk io isolation through cgroups. Contributed by Varun Vasudev and Wei Yan. 2015-04-30 21:41:07 -07:00
Karthik Kambatla
47279c3228 YARN-3464. Race condition in LocalizerRunner kills localizer before localizing all resources. (Zhihai Xu via kasha) 2015-04-26 09:13:46 -07:00
Jason Lowe
5e093f0d40 YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore invoked. Contributed by Brahma Reddy Battula 2015-04-24 22:02:53 +00:00
Xuan
0b3f8957a8 YARN-3516. killing ContainerLocalizer action doesn't take effect when 
private localizer receives FETCH_FAILURE status. Contributed by zhihai
xu
 2015-04-23 16:40:40 -07:00
Vinod Kumar Vavilapalli
a100be685c YARN-3366. Enhanced NodeManager to support classifying/shaping outgoing network bandwidth traffic originating from YARN containers Contributed by Sidharta Seethana. 2015-04-22 17:26:13 -07:00
Jian He
674c7ef649 YARN-3503. Expose disk utilization percentage and bad local and log dir counts in NM metrics. Contributed by Varun Vasudev 2015-04-21 20:57:02 -07:00
Junping Du
1db355a875 YARN-1402. Update related Web UI and CLI with exposing client API to check log aggregation status. Contributed by Xuan Gong. 2015-04-17 13:18:59 -07:00
Jian He
1b89a3e173 YARN-3354. Add node label expression in ContainerTokenIdentifier to support RM recovery. Contributed by Wangda Tan 2015-04-15 13:57:06 -07:00
Junping Du
838b06ac87 YARN-3443. Create a 'ResourceHandler' subsystem to ease addition of support for new resource types on the NM. Contributed by Sidharta Seethana. 2015-04-13 18:35:56 -07:00
Junping Du
92431c9617 YARN-1376. NM need to notify the log aggregation status to RM through Node heartbeat. Contributed by Xuan Gong. 2015-04-10 08:56:18 -07:00
Karthik Kambatla
6495940eae YARN-3465. Use LinkedHashMap to preserve order of resource requests. (Zhihai Xu via kasha) 2015-04-09 00:07:49 -07:00
Tsuyoshi Ozawa
dd852f5b8c YARN-3457. NPE when NodeManager.serviceInit fails and stopRecoveryStore called. Contributed by Bibin A Chundatt. 2015-04-08 15:56:18 +09:00
Wangda Tan
bad070fe15 YARN-2901. Add errors and warning metrics page to RM, NM web UI. (Varun Vasudev via wangda) 2015-04-02 17:23:20 -07:00
Vinod Kumar Vavilapalli
b21c72777a YARN-3365. Enhanced NodeManager to support using the 'tc' tool via container-executor for outbound network traffic control. Contributed by Sidharta Seethana. 2015-04-02 16:53:59 -07:00
Tsuyoshi Ozawa
c69ba81497 YARN-3424. Change logs for ContainerMonitorImpl's resourse monitoring from info to debug. Contributed by Anubhav Dhoot. 2015-04-01 17:44:25 +09:00
Karthik Kambatla
2daa478a64 YARN-3428. Debug log resources to be localized for a container. (kasha) 2015-03-31 17:34:47 -07:00
Wangda Tan
2a945d24f7 YARN-2495. Allow admin specify labels from each NM (Distributed configuration for node label). (Naganarasimha G R via wangda) 2015-03-30 12:05:21 -07:00
Vinod Kumar Vavilapalli
c358368f51 YARN-3304. Cleaning up ResourceCalculatorProcessTree APIs for public use and removing inconsistencies in the default values. Contributed by Junping Du and Karthik Kambatla. 2015-03-30 10:09:40 -07:00
Ravi Prakash
e0ccea33c9 YARN-3288. Document and fix indentation in the DockerContainerExecutor code 2015-03-28 08:00:41 -07:00
Tsuyoshi Ozawa
82eda771e0 YARN-3384. TestLogAggregationService.verifyContainerLogs fails after YARN-2777. Contributed by Naganarasimha G R. 2015-03-24 00:25:30 +09:00
Junping Du
d81109e588 YARN-3269. Yarn.nodemanager.remote-app-log-dir could not be configured to fully qualified path. Contributed by Xuan Gong 2015-03-20 13:41:22 -07:00
Karthik Kambatla
20b49224eb YARN-3351. AppMaster tracking URL is broken in HA. (Anubhav Dhoot via kasha) 2015-03-18 16:30:33 -07:00
Ravi Prakash
56085203c4 YARN-3339. TestDockerContainerExecutor should pull a single image and not the entire centos repository. (Ravindra Kumar Naik via raviprak) 2015-03-16 16:17:58 -07:00
Tsuyoshi Ozawa
3da9a97cfb YARN-1453. [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in doc comments. Contributed by Akira AJISAKA, Andrew Purtell, and Allen Wittenauer. 2015-03-16 23:19:05 +09:00
Vinod Kumar Vavilapalli
863079bb87 YARN-3154. Added additional APIs in LogAggregationContext to avoid aggregating running logs of application when rolling is enabled. Contributed by Xuan Gong. 2015-03-12 13:32:29 -07:00
Jian He
21101c01f2 YARN-2190. Added CPU and memory limit options to the default container executor for Windows containers. Contributed by Chuan Liu 2015-03-06 14:18:11 -08:00
Karthik Kambatla
53947f37c7 YARN-3122. Metrics for container's actual CPU usage. (Anubhav Dhoot via kasha) 2015-03-04 17:33:30 -08:00
Konstantin V Shvachko
8ca0d957c4 YARN-3255. RM, NM, JobHistoryServer, and WebAppProxyServer's main() should support generic options. Contributed by Konstantin Shvachko. 2015-02-26 17:12:19 -08:00
Allen Wittenauer
d4ac6822e1 YARN-2980. Move health check script related functionality to hadoop-common (Varun Saxena via aw) 2015-02-24 11:25:26 -08:00
Xuan
f56c65bb3e YARN-3237. AppLogAggregatorImpl fails to log error cause. Contributed by 
Rushabh S Shah
 2015-02-20 14:02:40 -08:00
Junping Du
c33ae271c2 YARN-2799. Cleanup TestLogAggregationService based on the change in YARN-90. Contributed by Zhihai Xu 2015-02-20 09:43:39 -08:00
Tsuyoshi Ozawa
447bd7b5a6 YARN-3203. Correct a log message in AuxServices. Contributed by Brahma Reddy Battula. 2015-02-16 23:55:58 +09:00
Junping Du
ab0b958a52 YARN-2749. Fix some testcases from TestLogAggregationService fails in trunk. (Contributed by Xuan Gong) 2015-02-15 06:46:32 -08:00
cnauroth
6804d68901 YARN-2899. Run TestDockerContainerExecutorWithMocks on Linux only. Contributed by Ming Ma. 2015-02-13 21:58:54 -08:00
Jason Lowe
1a0f508b63 YARN-2847. Linux native container executor segfaults if default banned user detected. Contributed by Olaf Flebbe 2015-02-13 20:20:55 +00:00
Akira Ajisaka
6a49e58cb8 YARN-3191. Log object should be initialized with its own class. Contributed by Rohith. 2015-02-12 17:58:54 -08:00
Junping Du
04f5ef18f7 YARN-2079. Recover NonAggregatingLogHandler state upon nodemanager restart. (Contributed by Jason Lowe) 2015-02-12 11:46:47 -08:00
Jason Lowe
b379972ab3 YARN-3074. Nodemanager dies when localizer runner tries to write to a full disk. Contributed by Varun Saxena 2015-02-11 16:33:43 +00:00
Jason Lowe
3f5431a22f YARN-2809. Implement workaround for linux kernel panic when removing cgroup. Contributed by Nathan Roberts 2015-02-10 17:27:21 +00:00
Jason Lowe
4eb5f7fa32 YARN-3090. DeletionService can silently ignore deletion task failures. Contributed by Varun Saxena 2015-02-10 16:54:21 +00:00
Jason Lowe
4c484320b4 YARN-3089. LinuxContainerExecutor does not handle file arguments to deleteAsUser. Contributed by Eric Payne 2015-02-06 20:39:01 +00:00
Arun C. Murthy
02f154a001 YARN-1537. Fix race condition in TestLocalResourcesTrackerImpl.testLocalResourceCache. Contributed by Xuan Gong. 2015-02-05 23:58:52 -08:00
Xuan
b73e776abc YARN-3056. Add verification for containerLaunchDuration in 
TestNodeManagerMetrics. Contributed by zhihai Xu
 2015-02-03 15:12:54 -08:00
Robert Kanter
f7a77819a1 YARN-3022. Expose Container resource information from NodeManager for monitoring (adhoot via ranter) 2015-02-03 10:39:41 -08:00
Akira Ajisaka
342efa110a HADOOP-9907. Webapp http://hostname:port/metrics link is not working. (aajisaka) 2015-01-30 02:49:10 +09:00
Allen Wittenauer
9dd0b7a2ab YARN-2428. LCE default banned user list should have yarn (Varun Saxena via aw) 2015-01-29 09:30:26 -08:00
Jian He
4e15fc0841 YARN-3011. Possible IllegalArgumentException in ResourceLocalizationService might lead NM to crash. Contributed by Varun Saxena 2015-01-27 13:31:22 -08:00
Jason Lowe
902c6ea7e4 YARN-3088. LinuxContainerExecutor.deleteAsUser can throw NPE if native executor returns an error. Contributed by Eric Payne 2015-01-26 15:40:21 +00:00
Xuan
0d6bd62102 YARN-3024. LocalizerRunner should give DIE action when all resources are 
localized. Contributed by Chengbing Liu
 2015-01-25 19:37:57 -08:00
Tsuyoshi Ozawa
3aab354e66 YARN-3082. Non thread safe access to systemCredentials in NodeHeartbeatResponse processing. Contributed by Anubhav Dhoot. 2015-01-23 16:04:18 +09:00
Karthik Kambatla
84198564ba YARN-2984. Metrics for container's actual memory usage. (kasha) 2015-01-17 05:44:04 +05:30
Junping Du
5d1cca34fa YARN-3064. TestRMRestart/TestContainerResourceUsage/TestNodeManagerResync failure with allocation timeout. (Contributed by Jian He) 2015-01-16 00:08:36 -08:00
Jian He
cc2a745f7e YARN-2997. Fixed NodeStatusUpdater to not send alreay-sent completed container statuses on heartbeat. Contributed by Chengbing Liu 2015-01-08 11:12:54 -08:00
Zhijie Shen
41a548a916 YARN-2937. Fixed new findbugs warnings in hadoop-yarn-nodemanager. Contributed by Varun Saxena. 2014-12-23 20:32:36 -08:00
Jian He
808cba3821 YARN-2952. Fixed incorrect version check in StateStore. Contributed by Rohith Sharmaks 2014-12-19 16:56:30 -08:00
Karthik Kambatla
954fb8581e YARN-2675. containersKilled metrics is not updated when the container is killed during localization. (Zhihai Xu via kasha) 2014-12-19 16:02:20 -08:00
cnauroth
e996a1bfd4 HADOOP-11321. copyToLocal cannot save a file to an SMB share unless the user has Full Control permissions. Contributed by Chris Nauroth. 2014-12-16 15:29:22 -08:00
Steve Loughran
3681de2039 YARN-2912 Jersey Tests failing with port in use. (varun saxena via stevel) 2014-12-12 17:11:07 +00:00
Karthik Kambatla
db73cc9124 YARN-2931. PublicLocalizer may fail until directory is initialized by LocalizeRunner. (Anubhav Dhoot via kasha) 2014-12-08 22:26:18 -08:00
Harsh J
a31e016491 YARN-2891. Failed Container Executor does not provide a clear error message. Contributed by Dustin Cote. (harsh) 2014-12-04 03:17:15 +05:30
Jason Lowe
03ab24aa01 MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log. Contributed by Gera Shegalov 2014-12-03 17:02:14 +00:00
Junping Du
e65b7c5ff6 YARN-1156. Enhance NodeManager AllocatedGB and AvailableGB metrics for aggregation of decimal values. (Contributed by Tsuyoshi OZAWA) 2014-12-03 04:11:18 -08:00
Karthik Kambatla
233b61e495 YARN-2679. Add metric for container launch duration. (Zhihai Xu via kasha) 2014-11-21 14:22:21 -08:00
Jason Lowe
49c38898b0 YARN-2816. NM fail to start with NPE during container recovery. Contributed by Zhihai Xu 2014-11-14 21:25:59 +00:00
Jason Lowe
33ea5ae92b YARN-2846. Incorrect persist exit code for running containers in reacquireContainer() that interrupted by NodeManager restart. Contributed by Junping Du 2014-11-13 16:11:04 +00:00
Zhijie Shen
be7bf956e9 YARN-2794. Fixed log messages about distributing system-credentials. Contributed by Jian He. 2014-11-12 11:07:57 -08:00
Karthik Kambatla
a04143039e YARN-2236. [YARN-1492] Shared Cache uploader service on the Node Manager. (Chris Trezzo and Sanjin Lee via kasha) 2014-11-12 09:31:05 -08:00
Ravi Prakash
53f64ee516 YARN-1964. Create Docker analog of the LinuxContainerExecutor in YARN 2014-11-11 21:28:11 -08:00
Karthik Kambatla
061bc293c8 YARN-2735. diskUtilizationPercentageCutoff and diskUtilizationSpaceCutoff are initialized twice in DirectoryCollection. (Zhihai Xu via kasha) 2014-11-11 10:31:39 -08:00
Xuan
5c9a51f140 YARN-2841. RMProxy should retry EOFException. Contributed by Jian He 2014-11-10 18:25:01 -08:00
Arun C. Murthy
43cd07b408 YARN-2830. Add backwords compatible ContainerId.newInstance constructor. Contributed by Jonathan Eagles. 2014-11-09 14:57:37 -08:00
Jason Lowe
c3d475070a YARN-2825. Container leak on NM. Contributed by Jian He 2014-11-07 23:16:37 +00:00
cnauroth
06b797947c YARN-2803. MR distributed cache not working correctly on Windows after NodeManager privileged account changes. Contributed by Craig Welch. 2014-11-07 12:29:39 -08:00
Vinod Kumar Vavilapalli
c5a46d4c8c YARN-1922. Fixed NodeManager to kill process-trees correctly in the presence of races between the launch and the stop-container call and when root processes crash. Contributed by Billie Rinaldi. 2014-11-03 16:38:55 -08:00
Vinod Kumar Vavilapalli
58e9f24e0f YARN-2788. Fixed backwards compatiblity issues with log-aggregation feature that were caused when adding log-upload-time via YARN-2703. Contributed by Xuan Gong. 2014-11-03 13:16:29 -08:00
Jason Lowe
6157ace547 YARN-2730. DefaultContainerExecutor runs only one localizer at a time. Contributed by Siqi Li 2014-11-03 20:37:47 +00:00
Vinod Kumar Vavilapalli
5c0381c96a YARN-2790. Fixed a NodeManager bug that was causing log-aggregation to fail beyond HFDS delegation-token expiry even when RM is a proxy-user (YARN-2704). Contributed by Jian He. 2014-11-01 16:32:35 -07:00
Zhijie Shen
1cd088fd9d YARN-2711. Fixed TestDefaultContainerExecutor#testContainerLaunchError failure on Windows. Contributed by Varun Vasudev. 2014-10-31 17:43:30 -07:00
Xuan
86ff28dea0 YARN-2701. Addendum patch. Potential race condition in startLocalizer when using LinuxContainerExecutor. Contributed by Xuan Gong 2014-10-31 14:36:25 -07:00
Jason Lowe
73e626ad91 YARN-2755. NM fails to clean up usercache_DEL_<timestamp> dirs after YARN-661. Contributed by Siqi Li 2014-10-30 15:10:27 +00:00
Zhijie Shen
8984e9b177 YARN-2741. Made NM web UI serve logs on the drive other than C: on Windows. Contributed by Craig Welch. 2014-10-28 14:11:19 -07:00
Vinod Kumar Vavilapalli
a16d022ca4 YARN-2704. Changed ResourceManager to optionally obtain tokens itself for the sake of localization and log-aggregation for long-running services. Contributed by Jian He. 2014-10-27 15:49:47 -07:00
Zhijie Shen
f81dc3f995 YARN-2703. Added logUploadedTime into LogValue for better display. Contributed by Xuan Gong. 2014-10-24 14:10:46 -07:00
Jian He
3b12fd6cfb YARN-2198. Remove the need to run NodeManager as privileged account for Windows Secure Container Executor. Contributed by Remus Rusanu 2014-10-22 15:57:46 -07:00
cnauroth
6637e3cf95 YARN-2720. Windows: Wildcard classpath variables not expanded against resources contained in archives. Contributed by Craig Welch. 2014-10-21 12:33:21 -07:00
Jason Lowe
6f2028bd15 YARN-90. NodeManager should identify failed disks becoming good again. Contributed by Varun Vasudev 2014-10-21 17:31:13 +00:00
Jian He
4fa1fb3193 Missing file for YARN-2701 2014-10-20 19:57:45 -07:00
Jian He
2839365f23 YARN-2701. Potential race condition in startLocalizer when using LinuxContainerExecutor. Contributed by Xuan Gong 2014-10-20 18:45:47 -07:00
Jian He
0fd0ebae64 YARN-2682. Updated WindowsSecureContainerExecutor to not use DefaultContainerExecutor#getFirstApplicationDir and use getWorkingDir() instead. Contributed by Zhihai Xu 2014-10-16 18:14:34 -07:00
Jian He
0af1a2b5bc YARN-2312. Deprecated old ContainerId#getId API and updated MapReduce to use ContainerId#getContainerId instead. Contributed by Tsuyoshi OZAWA 2014-10-15 15:22:07 -07:00
Karthik Kambatla
cc93e7e683 YARN-2566. DefaultContainerExecutor should pick a working directory randomly. (Zhihai Xu via kasha) 2014-10-13 16:32:01 -07:00
Jason Lowe
a56ea01002 YARN-2377. Localization exception stack traces are not passed as diagnostic info. Contributed by Gera Shegalov 2014-10-13 18:31:16 +00:00
Zhijie Shen
4aed2d8e91 YARN-2651. Spun off LogRollingInterval from LogAggregationContext. Contributed by Xuan Gong. 2014-10-13 10:54:09 -07:00
Zhijie Shen
cb81bac002 YARN-2583. Modified AggregatedLogDeletionService to be able to delete rolling aggregated logs. Contributed by Xuan Gong. 2014-10-10 00:11:30 -07:00
cnauroth
d3afd730ac YARN-2662. TestCgroupsLCEResourcesHandler leaks file descriptors. Contributed by Chris Nauroth. 2014-10-09 22:44:44 -07:00
Vinod Kumar Vavilapalli
34cdcaad71 YARN-2468. Enhanced NodeManager to support log handling APIs (YARN-2569) for use by long running services. Contributed by Xuan Gong. 2014-10-03 12:15:40 -07:00
Jason Lowe
29f520052e YARN-2624. Resource Localization fails on a cluster due to existing cache directories. Contributed by Anubhav Dhoot 2014-10-02 17:39:34 +00:00
Jian He
3ef1cf187f YARN-2617. Fixed NM to not send duplicate container status whose app is not running. Contributed by Jun Gong 2014-10-02 10:04:09 -07:00
junping_du
c7cee9b455 YARN-1979. TestDirectoryCollection fails when the umask is unusual. (Contributed by Vinod Kumar Vavilapalli and Tsuyoshi OZAWA) 2014-10-02 08:02:59 -07:00
junping_du
0708827a93 YARN-2613. Support retry in NMClient for rolling-upgrades. (Contributed by Jian He) 2014-10-01 16:50:30 -07:00
Zhijie Shen
52bbe0f11b YARN-2630. Prevented previous AM container status from being acquired by the current restarted AM. Contributed by Jian He. 2014-10-01 15:38:11 -07:00
Vinod Kumar Vavilapalli
ba7f31c2ee YARN-1972. Added a secure container-executor for Windows. Contributed by Remus Rusanu. 2014-10-01 10:14:41 -07:00
Jian He
5391919b09 YARN-668. Changed NMTokenIdentifier/AMRMTokenIdentifier/ContainerTokenIdentifier to use protobuf object as the payload. Contributed by Junping Du. 2014-09-26 17:48:41 -07:00
Zhijie Shen
c86674a3a4 YARN-2581. Passed LogAggregationContext to NM via ContainerTokenIdentifier. Contributed by Xuan Gong. 2014-09-24 17:50:26 -07:00
Allen Wittenauer
034df0e2eb YARN-2161. Fix build on macosx: YARN parts (Binglin Chang via aw) 2014-09-24 08:47:55 -07:00
junping_du
a9a55db065 YARN-2584. TestContainerManagerSecurity fails on trunk. (Contributed by Jian He) 2014-09-22 22:45:06 -07:00