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

1435 Commits

Author SHA1 Message Date
Jason Lowe 38ea1419f6 YARN-2905. AggregatedLogsBlock page can infinitely loop if the aggregated log file is corrupted. Contributed by Varun Saxena 
(cherry picked from commit 0f9528b99a)
 2014-12-01 22:30:20 +00:00
Junping Du c7bd22974a YARN-2907. SchedulerNode#toString should print all resource detail instead of only memory. (Contributed by Rohith) 
(cherry picked from commit c732ed760e)
 2014-12-01 05:41:56 -08:00
Zhijie Shen a9adc1295c YARN-2165. Added the sanity check for the numeric configuration values of the timeline service. Contributed by Vasanth kumar RJ. 
(cherry picked from commit 8f1454cc6d)
 2014-11-26 12:12:42 -08:00
Karthik Kambatla 3d4536af82 YARN-2188. [YARN-1492] Client service for cache manager. (Chris Trezzo and Sangjin Lee via kasha) 
(cherry picked from commit 834b3b98e7ecc4bfe93c7dd1a9e928e9653cf138)
 2014-11-25 16:22:14 -08:00
Jian He ae35b0e14d YARN-2906. CapacitySchedulerPage shows HTML tags for a queue's Active Users. Contributed by Jason Lowe 
(cherry picked from commit 8a7ca13b13)
 2014-11-25 16:18:02 -08:00
Jian He 2863056530 YARN-2404. Removed ApplicationAttemptState and ApplicationState class in RMStateStore. Contributed by Tsuyoshi OZAWA 
(cherry picked from commit 5805a81efb)
 2014-11-25 12:51:03 -08:00
Zhijie Shen 57d62d4ded YARN-2697. Remove useless RMAuthenticationHandler. Contributed by Haosong Huang. 
(cherry picked from commit e37a4ff0c1)
 2014-11-24 15:06:44 -08:00
Jason Lowe 89ef49fb08 YARN-1984. LeveldbTimelineStore does not handle db exceptions properly. Contributed by Varun Saxena 
(cherry picked from commit 1ce4d33c2d)
 2014-11-24 22:38:09 +00:00
Sandy Ryza 3e2e8eac22 YARN-2669. FairScheduler: queue names shouldn't allow periods (Wei Yan via Sandy Ryza) 2014-11-21 16:08:22 -08:00
Karthik Kambatla e0df934ed1 Update release date for 2.5.2 
(cherry picked from commit 1e9a3f42ff)
 2014-11-21 14:34:47 -08:00
Karthik Kambatla af0b54a4ee YARN-2679. Add metric for container launch duration. (Zhihai Xu via kasha) 
(cherry picked from commit 233b61e495)
 2014-11-21 14:22:53 -08:00
Karthik Kambatla e9db0aa35c YARN-2604. Scheduler should consider max-allocation-* in conjunction with the largest node. (Robert Kanter via kasha) 
(cherry picked from commit 3114d4731d)
 2014-11-21 10:42:47 -08:00
Jonathan Eagles 6570f7fd72 YARN-2375. Allow enabling/disabling timeline server per framework. (Mit Desai via jeagles) 
(cherry picked from commit c298a9a845)
 2014-11-20 23:40:26 -06:00
Karthik Kambatla 7ba5bb0c5b YARN-2315. FairScheduler: Set current capacity in addition to capacity. (Zhihai Xu via kasha) 
(cherry picked from commit a9a0cc3679)
 2014-11-19 20:19:54 -08:00
Karthik Kambatla 564deb75a8 YARN-2802. ClusterMetrics to include AM launch and register delays. (Zhihai Xu via kasha) 
(cherry picked from commit f9f8e750edbe6db453f0a845e2ed49ede66e0e8a)
 2014-11-19 19:50:35 -08:00
Jian He db31ef7e7f YARN-2865. Fixed RM to always create a new RMContext when transtions from StandBy to Active. Contributed by Rohith Sharmaks 
(cherry picked from commit 9cb8b75ba5)
 2014-11-19 19:49:44 -08:00
Jian He c359e2a6a4 YARN-2878. Fix DockerContainerExecutor.apt.vm formatting. Contributed by Abin Shahab 
(cherry picked from commit bc4ee5e06f)
 2014-11-19 14:45:01 -08:00
Zhijie Shen 610e123772 YARN-2870. Updated the command to run the timeline server it the document. Contributed by Masatake Iwasaki. 
(cherry picked from commit ef38fb9758)
 2014-11-18 16:17:07 -08:00
Jian He 1412e712b4 YARN-2157. Added YARN metrics in the documentaion. Contributed by Akira AJISAKA 
(cherry picked from commit 90a968d675)
 2014-11-18 16:13:08 -08:00
Karthik Kambatla 8df4c04c3a YARN-2690. [YARN-2574] Make ReservationSystem and its dependent classes independent of Scheduler type. (Anubhav Dhoot via kasha) 
(cherry picked from commit 2fce6d6141)
 2014-11-17 16:46:18 -08:00
Jason Lowe 242fd0e39a YARN-2414. RM web UI: app page will crash if app is failed before any attempt has been created. Contributed by Wangda Tan 
(cherry picked from commit 81c9d17af8)
 2014-11-17 21:16:54 +00:00
Vinod Kumar Vavilapalli 41275755c7 YARN-1703. Fixed ResourceManager web-proxy to close connections correctly. Contributed by Rohith Sharma. 
(cherry picked from commit 198fb58776)
 2014-11-15 12:06:53 -08:00
Jian He 21054c5d14 YARN-2432. RMStateStore should process the pending events before close. Contributed by Varun Saxena 
(cherry picked from commit 9b860661a5)
 2014-11-14 17:25:21 -08:00
Sandy Ryza c4c77669f0 YARN-2811. In Fair Scheduler, reservation fulfillments shouldn't ignore max share (Siqi Li via Sandy Ryza) 2014-11-14 15:20:37 -08:00
Jason Lowe ad140d1fc8 YARN-2816. NM fail to start with NPE during container recovery. Contributed by Zhihai Xu 
(cherry picked from commit 49c38898b0)
 2014-11-14 21:27:16 +00:00
Jason Lowe 00d135d75a YARN-2857. ConcurrentModificationException in ContainerLogAppender. Contributed by Mohammad Kamrul Islam 
(cherry picked from commit f2fe8a800e)
 2014-11-14 20:48:51 +00:00
Jian He beb184ac58 YARN-2856. Fixed RMAppImpl to handle ATTEMPT_KILLED event at ACCEPTED state on app recovery. Contributed by Rohith Sharmaks 
(cherry picked from commit d005404ef7)
 2014-11-13 15:34:56 -08:00
Zhijie Shen 53d6c91df9 YARN-2766. Made ApplicationHistoryManager return a sorted list of apps, attempts and containers. Contributed by Robert Kanter. 
(cherry picked from commit 3648cb57c9)
 2014-11-13 13:54:30 -08:00
Vinod Kumar Vavilapalli d35bcf2074 Revert "YARN-2603. ApplicationConstants missing HADOOP_MAPRED_HOME (Ray Chiang via aw)" 
This reverts commit b0a9cd37ab.

Conflicts:
	hadoop-yarn-project/CHANGES.txt

(cherry picked from commit 4ae9780e6a)
 2014-11-13 13:21:46 -08:00
Arun C. Murthy fc324d7062 Preparing to release hadoop-2.6.0-rc1. 
(cherry picked from commit 9ff7315cbe)
 2014-11-13 13:03:13 -08:00
Arun C. Murthy d0285d1ad6 YARN-2635. Merging to branch-2.6 for hadoop-2.6.0-rc1. 
(cherry picked from commit 81dc0ac6dc)
 2014-11-13 10:28:10 -08:00
Arun C. Murthy 906e0a1862 YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1. 
(cherry picked from commit d648e60eba)
 2014-11-13 10:05:07 -08:00
Jason Lowe 6fd547da8f YARN-2846. Incorrect persist exit code for running containers in reacquireContainer() that interrupted by NodeManager restart. Contributed by Junping Du 
(cherry picked from commit 33ea5ae92b)
 2014-11-13 16:17:08 +00:00
Vinod Kumar Vavilapalli ed3e5cb164 YARN-2853. Fixed a bug in ResourceManager causing apps to hang when the user kill request races with ApplicationMaster finish. Contributed by Jian He. 
(cherry picked from commit 3651fe1b08)
 2014-11-13 08:13:57 -08:00
Allen Wittenauer a6de8f2e30 YARN-2603. ApplicationConstants missing HADOOP_MAPRED_HOME (Ray Chiang via aw) 2014-11-12 17:04:24 -08:00
Zhijie Shen 8405ec0895 YARN-2794. Fixed log messages about distributing system-credentials. Contributed by Jian He. 
(cherry picked from commit be7bf956e9)
 2014-11-12 11:09:34 -08:00
Arun C. Murthy f7f78cf934 YARN-2843. Merging to branch-2.6 for hadoop-2.6.0-rc1. 2014-11-12 10:41:44 -08:00
Arun C. Murthy cd8559e099 YARN-2841. Merging to branch-2.6 for hadoop-2.6.0-rc1. 2014-11-12 10:37:40 -08:00
Karthik Kambatla ff1b13ded5 YARN-2236. [YARN-1492] Shared Cache uploader service on the Node Manager. (Chris Trezzo and Sanjin Lee via kasha) 
(cherry picked from commit a04143039e)
 2014-11-12 09:31:30 -08:00
Jason Lowe 6984d899e3 YARN-2780. Log aggregated resource allocation in rm-appsummary.log. Contributed by Eric Payne 
(cherry picked from commit f8aefa5e9c)
 2014-11-12 17:02:30 +00:00
Ravi Prakash d863f54f57 YARN-1964. Create Docker analog of the LinuxContainerExecutor in YARN 2014-11-11 21:29:27 -08:00
Karthik Kambatla 6cbd3aa2e8 YARN-570. Time strings are formated in different timezone. (Akira Ajisaka and Peng Zhang via kasha) 
(cherry picked from commit 840b13110d63d7e062cefd4b993cc7dea44aed8d)
 2014-11-11 13:23:29 -08:00
Vinod Kumar Vavilapalli 9d6c0d7c9f YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so as to make them work correctly. Contributed by Wangda Tan. 
(cherry picked from commit 0fd97f9c19)
 2014-11-11 12:45:59 -08:00
Karthik Kambatla f030959849 YARN-2735. diskUtilizationPercentageCutoff and diskUtilizationSpaceCutoff are initialized twice in DirectoryCollection. (Zhihai Xu via kasha) 
(cherry picked from commit 061bc293c8)
 2014-11-11 10:31:56 -08:00
Xuan b390579c15 YARN-2841: Correct fix version from branch-2.6 to branch-2.7 in the 
change log.

(cherry picked from commit 58e9bf4b90)
 2014-11-10 18:35:59 -08:00
Xuan b3badf935a YARN-2841. RMProxy should retry EOFException. Contributed by Jian He 
(cherry picked from commit 5c9a51f140)
 2014-11-10 18:26:32 -08:00
Karthik Kambatla 92de44c2c5 Set the release date for 2.5.2 
(cherry picked from commit 68a0508728)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-10 15:23:43 -08:00
Vinod Kumar Vavilapalli d76fc94b21 YARN-2834. Fixed ResourceManager to ignore token-renewal failures on recovery consistent with the (somewhat incorrect) behaviour in the non-recovery case. Contributed by Jian He. 
(cherry picked from commit e76faebc95)
 2014-11-09 18:57:48 -08:00
Arun C. Murthy cff08dab5e Updated CHANGES.txt to reflect hadoop-2.6.0 release dates. 
(cherry picked from commit 770cc14442)
 2014-11-09 18:48:01 -08:00
Arun C. Murthy 175d222bfc YARN-2830. Add backwords compatible ContainerId.newInstance constructor. Contributed by Jonathan Eagles. 
(cherry picked from commit 43cd07b408)
 2014-11-09 15:03:59 -08:00
Vinod Kumar Vavilapalli 0a5d95f705 YARN-2607. Fixed issues in TestDistributedShell. Contributed by Wangda Tan. 
(cherry picked from commit 737d9284c1)
 2014-11-08 11:02:17 -08:00
Zhijie Shen 1880a5a7c3 YARN-2505. Supported get/add/remove/change labels in RM REST API. Contributed by Craig Welch. 
(cherry picked from commit 9a4e0d343e)
 2014-11-07 20:39:53 -08:00
Vinod Kumar Vavilapalli b865a95f06 YARN-2826. Fixed user-groups mappings' refresh bug caused by YARN-2826. Contributed by Wangda Tan. 
(cherry picked from commit df36edf751)
 2014-11-07 19:44:52 -08:00
Xuan 7d26cffb0c YARN-2819. NPE in ATS Timeline Domains when upgrading from 2.4 to 2.6. Contributed by Zhijie Shen 
(cherry picked from commit 4a114dd67a)
 2014-11-07 16:12:45 -08:00
Jason Lowe 9447235527 YARN-2632. Document NM Restart feature. Contributed by Junping Du and Vinod Kumar Vavilapalli 
(cherry picked from commit 1e215e8ba2)
 2014-11-07 23:41:29 +00:00
Jason Lowe a5764cb783 YARN-2825. Container leak on NM. Contributed by Jian He 
(cherry picked from commit c3d475070a)
 2014-11-07 23:17:34 +00:00
Vinod Kumar Vavilapalli a50345f654 YARN-2753. Fixed a bunch of bugs in the NodeLabelsManager classes. Contributed by Zhihai xu. 
(cherry picked from commit 4cfd5bc7c1)
 2014-11-07 14:16:54 -08:00
cnauroth c16f718293 YARN-2803. MR distributed cache not working correctly on Windows after NodeManager privileged account changes. Contributed by Craig Welch. 
(cherry picked from commit 06b797947c)
 2014-11-07 12:36:42 -08:00
Vinod Kumar Vavilapalli 7b19079657 YARN-2827. Fixed bugs in "yarn queue" CLI. Contributed by Wangda Tan. 2014-11-07 12:00:49 -08:00
Vinod Kumar Vavilapalli d5d2905262 YARN-2824. Fixed Capacity Scheduler to not crash when some node-labels are not mapped to queues by making default capacities per label to be zero. Contributed by Wangda Tan. 
(cherry picked from commit 2ac1be7dec)
 2014-11-07 10:44:25 -08:00
Xuan bf79541868 YARN-2810. TestRMProxyUsersConf fails on Windows VMs. Contributed by Varun Vasudev 
(cherry picked from commit 1e97f2f094)
 2014-11-07 09:46:04 -08:00
Vinod Kumar Vavilapalli eb01c602ed YARN-2823. Fixed ResourceManager app-attempt state machine to inform schedulers about previous finished attempts of a running appliation to avoid expectation mismatch w.r.t transferred containers. Contributed by Jian He. 
(cherry picked from commit a5657182a7)
 2014-11-07 09:30:04 -08:00
Vinod Kumar Vavilapalli b1521c7c3c YARN-2647. Added a queue CLI for getting queue information. Contributed by Sunil Govind. 
(cherry picked from commit 61effcbebc)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/bin/yarn
 2014-11-06 20:57:55 -08:00
Vinod Kumar Vavilapalli 52e57a95d9 YARN-2744. Fixed CapacityScheduler to validate node-labels correctly against queues. Contributed by Wangda Tan. 
(cherry picked from commit a3839a9fbf)
 2014-11-06 17:29:12 -08:00
Steve Loughran 5924e74d55 YARN-2768 Improved Yarn Registry service record structure (stevel) 2014-11-06 20:21:25 +00:00
Vinod Kumar Vavilapalli 0f9199fb07 YARN-2818. Removed the now unnecessary user entity injection from Timeline service given we now have domains. Contributed by Zhijie Shen. 
(cherry picked from commit f5b19bed7d)
 2014-11-06 11:49:44 -08:00
Xuan 4aa98d5991 YARN-2812. TestApplicationHistoryServer is likely to fail on less powerful machine. Contributed by Zhijie Shen 
(cherry picked from commit b0b52c4e11)
 2014-11-05 20:44:07 -08:00
Xuan e26be1d85c YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie Shen 2014-11-05 18:26:07 -08:00
Jian He f92ff24f5e YARN-2579. Fixed a deadlock issue when EmbeddedElectorService and FatalEventDispatcher try to transition RM to StandBy at the same time. Contributed by Rohith Sharmaks 
(cherry picked from commit 395275af86)
 2014-11-05 17:03:01 -08:00
Vinod Kumar Vavilapalli 3bc31e35a6 YARN-2805. Fixed ResourceManager to load HA configs correctly before kerberos login. Contributed by Wangda Tan. 
(cherry picked from commit 834e931d8e)
 2014-11-05 15:31:41 -08:00
Zhijie Shen f3ed97de3a YARN-2767. Added a test case to verify that http static user cannot kill or submit apps in the secure mode. Contributed by Varun Vasudev. 
(cherry picked from commit 7a4c92a9d55fcecef066053ac30dff0fcd4ec90c)
 2014-11-05 10:59:05 -08:00
Vinod Kumar Vavilapalli 56ab333161 YARN-2804. Fixed Timeline service to not fill the logs with JAXB bindings exceptions. Contributed by Zhijie Shen. 
(cherry picked from commit b76179895d)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-11-04 18:03:17 -08:00
Karthik Kambatla 3e4b280de7 YARN-2010. Handle app-recovery failures gracefully. (Jian He and Karthik Kambatla via kasha) 
(cherry picked from commit b2cd269802)
 2014-11-04 17:48:49 -08:00
Karthik Kambatla 6f9484221e Adding release 2.5.2 to CHANGES.txt 
(cherry picked from commit 4de56d27fb)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-11-04 16:51:54 -08:00
Zhijie Shen e06c23a6c9 YARN-2752. Made ContainerExecutor append "nice -n" arg only when priority adjustment flag is set. Contributed by Xuan Gong. 2014-11-04 15:50:10 -08:00
Vinod Kumar Vavilapalli 9c76dcadaf 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. 
(cherry picked from commit c5a46d4c8c)
 2014-11-03 16:40:37 -08:00
Vinod Kumar Vavilapalli 277141b82d YARN-2795. Fixed ResourceManager to not crash loading node-label data from HDFS in secure mode. Contributed by Wangda Tan. 
(cherry picked from commit ec6cbece8e)
 2014-11-03 13:45:31 -08:00
Vinod Kumar Vavilapalli 715c81ef6d 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. 
(cherry picked from commit 58e9f24e0f)
 2014-11-03 13:19:34 -08:00
Vinod Kumar Vavilapalli 52c58115d2 YARN-2798. Fixed YarnClient to populate the renewer correctly for Timeline delegation tokens. Contributed by Zhijie Shen. 
(cherry picked from commit 71fbb474f5)
 2014-11-03 12:50:39 -08:00
Jason Lowe 8091ea54d5 YARN-2730. DefaultContainerExecutor runs only one localizer at a time. Contributed by Siqi Li 
(cherry picked from commit 6157ace547)
 2014-11-03 20:39:14 +00:00
Zhijie Shen caae0a0a08 YARN-2785. Fixed intermittent TestContainerResourceUsage failure. Contributed by Varun Vasudev. 
(cherry picked from commit 27715ec63b)
 2014-11-02 15:22:54 -08:00
Vinod Kumar Vavilapalli 6627f67bf5 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. 
(cherry picked from commit 5c0381c96a)
 2014-11-01 16:33:35 -07:00
Zhijie Shen d9ac25454c YARN-2711. Fixed TestDefaultContainerExecutor#testContainerLaunchError failure on Windows. Contributed by Varun Vasudev. 
(cherry picked from commit 1cd088fd9d)
 2014-10-31 17:45:05 -07:00
Jason Lowe ada40aa933 YARN-2707. Potential null dereference in FSDownload. Contributed by Gera Shegalov 
(cherry picked from commit 7bc179f9f5)
 2014-10-31 22:54:49 +00:00
Vinod Kumar Vavilapalli 6d4a04a033 YARN-2789. Re-instated the NodeReport.newInstance private unstable API modified in YARN-2698 so that tests in YARN frameworks don't break. Contributed by Wangda Tan. 
(cherry picked from commit 6ce32f593b)
 2014-10-31 15:33:41 -07:00
Jian He a87f827ae4 YARN-2770. Added functionality to renew/cancel TimeLineDelegationToken. Contributed by Zhijie Shen 
(cherry picked from commit 1b4be91866)
 2014-10-31 13:17:19 -07:00
Karthik Kambatla 268af259b5 YARN-2186. [YARN-1492] Node Manager uploader service for cache manager. (Chris Trezzo and Sangjin Lee via kasha) 
(cherry picked from commit 256697acd5)
 2014-10-31 13:01:25 -07:00
Vinod Kumar Vavilapalli 9b879d713a YARN-2778. Moved node-lables' reports to the yarn nodes CLI from the admin CLI. Contributed by Wangda Tan. 
(cherry picked from commit b6c1188b85)
 2014-10-31 10:19:14 -07:00
Vinod Kumar Vavilapalli 97694e78ad YARN-2779. Fixed ResourceManager to not require delegation tokens for communicating with Timeline Service. Contributed by Zhijie Shen. 
(cherry picked from commit d1828d9443)
 2014-10-30 23:17:16 -07:00
Vinod Kumar Vavilapalli 0ba8d8c19c YARN-2698. Moved some node label APIs to be correctly placed in client protocol. Contributed by Wangda Tan. 
(cherry picked from commit e0233c16eb)
 2014-10-30 23:02:06 -07:00
Steve Loughran cd24075343 YARN-2677 registry punycoding of usernames doesn't fix all usernames to be DNS-valid (stevel) 2014-10-30 22:32:20 +00:00
Jason Lowe 3e8544c5f2 YARN-2755. NM fails to clean up usercache_DEL_<timestamp> dirs after YARN-661. Contributed by Siqi Li 
(cherry picked from commit 73e626ad91)
 2014-10-30 15:11:57 +00:00
Karthik Kambatla d2ba115f06 YARN-2712. TestWorkPreservingRMRestart: Augment FS tests with queue and headroom checks. (Tsuyoshi Ozawa via kasha) 
(cherry picked from commit 179cab81e0)
 2014-10-30 00:39:34 -07:00
Zhijie Shen d2a5c386c1 YARN-2769. Fixed the problem that timeline domain is not set in distributed shell AM when using shell_command on Windows. Contributed by Varun Vasudev. 
(cherry picked from commit 72496311def320987c31822776e8fbb73dfcc726)
 2014-10-29 12:14:48 -07:00
Karthik Kambatla e88832dfb3 YARN-2742. FairSchedulerConfiguration should allow extra spaces between value and unit. (Wei Yan via kasha) 
(cherry picked from commit 782971ae7a)
 2014-10-29 10:25:29 -07:00
Zhijie Shen 734cbe7de2 YARN-2747. Fixed the test failure of TestAggregatedLogFormat when native I/O is enabled. Contributed by Xuan Gong. 
(cherry picked from commit ec63a3ffbd)
 2014-10-28 22:45:20 -07:00
Jian He 720de7eb4c YARN-2503. Added node lablels in web UI. Contributed by Wangda Tan 
(cherry picked from commit d5e0a09721)
 2014-10-28 18:00:59 -07:00
Zhijie Shen f40389ae08 YARN-2741. Made NM web UI serve logs on the drive other than C: on Windows. Contributed by Craig Welch. 
(cherry picked from commit 8984e9b177)
 2014-10-28 14:12:09 -07:00
Xuan 43b1878f86 YARN-2758. Update TestApplicationHistoryClientService to use the new generic history store. Contributed by Zhijie Shen 2014-10-28 13:30:55 -07:00
Xuan 43a53f2b65 YARN-2279. Add UTs to cover timeline server authentication. Contributed by Zhijie Shen 2014-10-28 11:18:35 -07:00