Commit Graph

1144 Commits

Author SHA1 Message Date
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
Xuan
b0ad644083 YARN-3526. ApplicationMaster tracking URL is incorrectly redirected on a QJM cluster. Contributed by Weiwei Yang 2015-05-15 22:39:49 -07:00
Jason Lowe
f7e051c431 YARN-2421. RM still allocates containers to an app in the FINISHING state. Contributed by Chang Li 2015-05-15 22:09:30 +00:00
Vinod Kumar Vavilapalli
9a2a9553ee Fixing HDFS state-store. Contributed by Arun Suresh. 2015-05-14 16:13:51 -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
Wangda Tan
0e85044e26 YARN-3362. Add node label usage in RM CapacityScheduler web UI. (Naganarasimha G R via wangda) 2015-05-13 17:00:36 -07:00
Wangda Tan
7f19e7a254 YARN-3521. Support return structured NodeLabel objects in REST API (Sunil G via wangda) 2015-05-13 13:43:17 -07:00
Wangda Tan
341a476812 YARN-2921. Fix MockRM/MockAM#waitForState sleep too long. (Tsuyoshi Ozawa via wangda) 2015-05-13 13:06:07 -07:00
Wangda Tan
d6f6741296 YARN-3489. RMServerUtils.validateResourceRequests should only obtain queue info once. (Varun Saxena via wangda) 2015-05-11 17:31:15 -07:00
Junping Du
7e543c27fa YARN-3587. Fix the javadoc of DelegationTokenSecretManager in yarn, etc. projects. Contributed by Gabor Liptak. 2015-05-11 05:27:07 -07:00
Karthik Kambatla
a60f78e98e YARN-3395. FairScheduler: Trim whitespaces when using username for queuename. (Zhihai Xu via kasha) 2015-05-09 15:41:20 -07:00
Karthik Kambatla
70fb37cd79 YARN-1287. Consolidate MockClocks. (Sebastian Wong and Anubhav Dhoot via kasha) 2015-05-09 14:34:54 -07:00
Karthik Kambatla
2fb44c8aaf YARN-3271. FairScheduler: Move tests related to max-runnable-apps from TestFairScheduler to TestAppRunnability. (nijel via kasha) 2015-05-08 16:39:10 -07:00
Robert Kanter
5658998845 YARN-3473. Fix RM Web UI configuration for some properties (rchiang via rkanter) 2015-05-08 16:23:10 -07:00
Jian He
d0b73287c2 YARN-3604. Fixed ZKRMStateStore#removeApplication to also disable watch. Contributed Zhihai Xu 2015-05-08 15:12:33 -07:00
Vinod Kumar Vavilapalli
f7a74d2491 YARN-3018. Unified the default value for the configuration property yarn.scheduler.capacity.node-locality-delay in code and default xml file. Contributed by Nijel SF. 2015-05-08 14:45:06 -07:00
Wangda Tan
f55d21d894 YARN-3593. Add label-type and Improve "DEFAULT_PARTITION" in Node Labels Page. (Naganarasimha G R via wangda) 2015-05-08 12:04:50 -07:00
Thomas Graves
5d708a4725 YARN-3600. AM container link is broken (Naganarasimha G R via tgraves 2015-05-08 16:35:40 +00:00
Devaraj K
241a72af0d YARN-2784. Make POM project names consistent. Contributed by Rohith. 2015-05-08 19:23:53 +05:30
Devaraj K
ef3d66d462 YARN-3358. Audit log not present while refreshing Service ACLs.
Contributed by Varun Saxena.
2015-05-08 12:14:10 +05:30
Devaraj K
a28cd02ba0 YARN-3592. Fix typos in RMNodeLabelsManager. Contributed by Sunil G. 2015-05-08 10:54:36 +05:30
Jian He
f489a4ec96 YARN-2918. RM should not fail on startup if queue's configured labels do not exist in cluster-node-labels. Contributed by Wangda Tan 2015-05-07 17:35:41 -07:00
Jian He
b88700dcd0 YARN-3584. Fixed attempt diagnostics format shown on the UI. Contributed by nijel 2015-05-07 13:54:07 -07: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
Vinod Kumar Vavilapalli
4c7b9b6abe YARN-3385. Fixed a race-condition in ResourceManager's ZooKeeper based state-store to avoid crashing on duplicate deletes. Contributed by Zhihai Xu. 2015-05-06 17:51:17 -07:00
Junping Du
31b627b2a8 YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. Contributed by Robert Kanter. 2015-05-06 16:51:05 -07:00
Jian He
0d3188fd25 YARN-3301. Fixed the format issue of the new RM attempt web page. Contributed by Xuan Gong 2015-05-06 13:45:00 -07:00
Jian He
e4c3b52c89 YARN-3343. Increased TestCapacitySchedulerNodeLabelUpdate#testNodeUpdate timeout. Contributed by Rohith Sharmaks 2015-05-05 11:33:47 -07:00
Xuan
b7dd3a4f04 YARN-2123. Progress bars in Web UI always at 100% due to non-US locale.
Contributed by Akira AJISAKA
2015-05-05 10:40:16 -07:00
Jason Lowe
9356cf8676 YARN-3552. RM Web UI shows -1 running containers for completed apps. Contributed by Rohith 2015-05-05 13:42:32 +00:00
Jian He
d701acc9c6 YARN-2725. Added test cases of retrying creating znode in ZKRMStateStore. Contributed by Tsuyoshi Ozawa 2015-05-04 16:13:29 -07:00
Gera Shegalov
f8204e241d YARN-2893. AMLaucher: sporadic job failures due to EOFException in readTokenStorageStream. (Zhihai Xu via gera) 2015-05-01 18:18:55 -07:00
Zhijie Shen
7e8639fda4 YARN-3544. Got back AM logs link on the RM web UI for a completed app. Contributed by Xuan Gong. 2015-04-30 13:05:55 -07:00
Wangda Tan
e2e8f77118 YARN-3564. Fix TestContainerAllocation.testAMContainerAllocationWhenDNSUnavailable fails randomly. (Jian He via wangda) 2015-04-30 11:03:19 -07:00
Jian He
4c1af156ae YARN-3533. Test: Fix launchAM in MockRM to wait for attempt to be scheduled. Contributed by Anubhav Dhoot 2015-04-29 14:50:01 -07:00
tgraves
2e215484bd YARN-3517. RM web ui for dumping scheduler logs should be for admins only (Varun Vasudev via tgraves) 2015-04-29 21:25:42 +00:00
Karthik Kambatla
8f82970e0c YARN-3485. FairScheduler headroom calculation doesn't consider maxResources for Fifo and FairShare policies. (kasha) 2015-04-28 21:00:35 -07:00
Wangda Tan
db1b674b50 YARN-2740. Fix NodeLabelsManager to properly handle node label modifications when distributed node label configuration enabled. (Naganarasimha G R via wangda) 2015-04-27 16:24:38 -07:00
Jian He
d497f6ea2b YARN-2498. Respect labels in preemption policy of capacity scheduler for inter-queue preemption. Contributed by Wangda Tan 2015-04-24 17:03:13 -07:00
Tsuyoshi Ozawa
4a3dabd94f YARN-3406. Display count of running containers in the RM's Web UI. Contributed by Ryu Kobayashi. 2015-04-25 07:17:11 +09:00
Jian He
d03dcb9635 YARN-3387. Previous AM's container completed status couldn't pass to current AM if AM and RM restarted during the same time. Contributed by Sandflee 2015-04-24 12:13:29 -07:00
Xuan
eee9facbba YARN-3511. Add errors and warnings page to ATS. Contributed by Varun Vasudev 2015-04-24 09:41:59 -07:00
Vinod Kumar Vavilapalli
f5fe35e297 YARN-3413. Changed Nodelabel attributes (like exclusivity) to be settable only via addToClusterNodeLabels but not changeable at runtime. (Wangda Tan via vinodkv) 2015-04-23 11:19:55 -07:00
Wangda Tan
395205444e YARN-3319. Implement a FairOrderingPolicy. (Craig Welch via wangda) 2015-04-23 10:47:15 -07:00
tgraves
189a63a719 YARN-3434. Interaction between reservations and userlimit can result in significant ULF violation 2015-04-23 14:39:25 +00:00
Steve Loughran
d9bcf99aef YARN-2605. [RM HA] Rest api endpoints doing redirect incorrectly. (Xuan Gong via stevel) 2015-04-23 09:22:48 +01:00
Junping Du
fad9d7e85b New parameter of CLI for decommissioning node gracefully in RMAdmin CLI. Contributed by Devaraj K 2015-04-22 10:07:20 -07:00
Jian He
bdd90110e6 YARN-3494. Expose AM resource limit and usage in CS QueueMetrics. Contributed by Rohith Sharmaks 2015-04-21 20:06:20 -07:00
Wangda Tan
e71d0d87d9 YARN-3410. YARN admin should be able to remove individual application records from RMStateStore. (Rohith Sharmaks via wangda) 2015-04-21 17:51:22 -07:00
Tsuyoshi Ozawa
105afd5477 YARN-3495. Confusing log generated by FairScheduler. Contributed by Brahma Reddy Battula. 2015-04-22 05:47:59 +09:00
Wangda Tan
44872b76fc YARN-3463. Integrate OrderingPolicy Framework with CapacityScheduler. (Craig Welch via wangda) 2015-04-20 17:12:32 -07:00
Jian He
497c86b485 YARN-3136. Fixed a synchronization problem of AbstractYarnScheduler#getTransferredContainers. Contributed by Sunil G 2015-04-18 12:46:37 -07:00
Wangda Tan
f47a5763ac YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when calling getQueue (Jason Lowe via wangda) 2015-04-17 17:22:27 -07:00
Wangda Tan
f65eeb412d YARN-3493. RM fails to come up with error "Failed to load/recover state" when mem settings are changed. (Jian He via wangda) 2015-04-17 17:11:22 -07:00
Jian He
6779467ab6 YARN-3451. Display attempt start time and elapsed time on the web UI. Contributed by Rohith Sharmaks 2015-04-17 15:55:34 -07:00
Jian He
d573f09fb9 YARN-2696. Queue sorting in CapacityScheduler should consider node label. Contributed by Wangda Tan 2015-04-17 13:36:59 -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
bb6dde68f1 YARN-3021. YARN's delegation-token handling disallows certain trust setups to operate properly over DistCp. Contributed by Yongjun Zhang 2015-04-16 19:43:37 -07:00
Akira Ajisaka
1fa8075794 MAPREDUCE-6300. Task list sort by task id broken. Contributed by Siqi Li. 2015-04-16 10:04:09 -05: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
Tsuyoshi Ozawa
e48cedc663 YARN-3326. Support RESTful API for getLabelsToNodes. Contributed by Naganarasimha G R. 2015-04-15 14:03:55 -05:00
Wangda Tan
5004e75332 YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy. (Craig Welch via wangda) 2015-04-15 09:56:32 -07:00
Jian He
0fefda645b YARN-3361. CapacityScheduler side changes to support non-exclusive node labels. Contributed by Wangda Tan 2015-04-14 11:45:58 -07:00
Jian He
b46ee1e7a3 YARN-3266. RMContext#inactiveNodes should have NodeId as map key. Contributed by Chengbing Liu 2015-04-14 10:54:22 -07:00
Jian He
a1afbc48b5 YARN-3472. Fixed possible leak in DelegationTokenRenewer#allTokens. Contributed by Rohith Sharmaks 2015-04-13 14:07:17 -07:00
Jian He
944a16579f YARN-3382. Some of UserMetricsInfo metrics are incorrectly set to root queue metrics. Contributed by Rohit Agarwal 2015-04-13 10:53:34 -07:00
Karthik Kambatla
e516706b89 YARN-3469. ZKRMStateStore: Avoid setting watches that are not required. (Jun Hong via kasha) 2015-04-10 11:20:34 -07:00
Jian He
577d755e4b YARN-3348. Add a 'yarn top' tool to help understand cluster usage. Contributed by Varun Vasudev 2015-04-10 09:57:17 -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
Xuan
afa5d4715a YARN-3293. Track and display capacity scheduler health metrics in web
UI. Contributed by Varun Vasudev
2015-04-09 23:38:04 -07:00
Vinod Kumar Vavilapalli
9c5911294e YARN-3055. Fixed ResourceManager's DelegationTokenRenewer to not stop token renewal of applications part of a bigger workflow. Contributed by Daryn Sharp. 2015-04-09 13:08:53 -07:00
Wangda Tan
1885141e90 YARN-3466. Fix RM nodes web page to sort by node HTTP-address, #containers and node-label column. (Jason Lowe via wangda) 2015-04-09 10:35:12 -07:00
Xuan
d27e9241e8 YARN-3294. Allow dumping of Capacity Scheduler debug logs via web UI for
a fixed time period. Contributed by Varun Vasudev
2015-04-07 09:52:36 -07:00
Robert Kanter
99b08a748e YARN-2429. TestAMRMTokens.testTokenExpiry fails Intermittently with error message:Invalid AMRMToken (zxu via rkanter) 2015-04-06 14:11:20 -07:00
Tsuyoshi Ozawa
53959e69f7 TestFairScheduler.testContinuousScheduling fails Intermittently. Contributed by Zhihai Xu. 2015-04-06 20:19:13 +09:00
Xuan
96d72118f5 YARN-3435. AM container to be allocated Appattempt AM container shown as
null. Contributed by Bibin A Chundatt
2015-04-05 00:40:57 -07: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
Sandy Ryza
6a6a59db7f YARN-3415. Non-AM containers can be counted towards amResourceUsage of a fairscheduler queue (Zhihai Xu via Sandy Ryza) 2015-04-02 13:56:08 -07:00
Zhijie Shen
8366a36ad3 YARN-3430. Made headroom data available on app attempt page of RM WebUI. Contributed by Xuan Gong. 2015-04-01 13:47:54 -07:00
Xuan
4728bdfa15 YARN-3248. Display count of nodes blacklisted by apps in the web UI.
Contributed by Varun Vasudev
2015-04-01 04:19:18 -07:00
Karthik Kambatla
79f7f2aabf YARN-3412. RM tests should use MockRM where possible. (kasha) 2015-03-31 09:14:15 -07:00
Tsuyoshi Ozawa
b5a22e9838 YARN-3258. FairScheduler: Need to add more logging to investigate allocations. Contributed by Anubhav Dhoot. 2015-03-31 17:42:44 +09: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
Wangda Tan
97a7277a2d YARN-3383. AdminService should use warn instead of info to log exception when operation fails. (Li Lu via wangda) 2015-03-24 10:38:54 -07:00
Karthik Kambatla
972f1f1ab9 YARN-2868. FairScheduler: Metric for latency to allocate first container for an application. (Ray Chiang via kasha) 2015-03-23 14:07:05 -07:00
Karthik Kambatla
2bc097cd14 YARN-3241. FairScheduler handles invalid queue names inconsistently. (Zhihai Xu via kasha) 2015-03-23 13:22:03 -07:00
cnauroth
6ca1f12024 YARN-3336. FileSystem memory leak in DelegationTokenRenewer. 2015-03-23 10:45:50 -07:00
Jian He
e1feb4ea1a YARN-3345. Add non-exclusive node label API. Contributed by Wangda Tan 2015-03-20 19:04:38 -07:00
Jian He
586348e4cb YARN-3356. Capacity Scheduler FiCaSchedulerApp should use ResourceUsage to track used-resources-by-label. Contributed by Wangda Tan 2015-03-20 13:54:01 -07:00
Wangda Tan
6bc7710ec7 YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. (Brahma Reddy Battula via wangda) 2015-03-20 10:42:05 -07:00
Jian He
4e886eb9cb YARN-3379. Fixed missing data in localityTable and ResourceRequests table in RM WebUI. Contributed by Xuan Gong 2015-03-19 22:27:21 -07:00
Devaraj K
93d0f4acc8 YARN-3357. Move TestFifoScheduler to FIFO package. Contributed by Rohith
Sharmaks.
2015-03-19 12:16:52 +05:30
Jian He
658097d6da YARN-3273. Improve scheduler UI to facilitate scheduling analysis and debugging. Contributed Rohith Sharmaks 2015-03-17 21:30:23 -07:00
Tsuyoshi Ozawa
3bc72cc16d YARN-3205. FileSystemRMStateStore should disable FileSystem Cache to avoid get a Filesystem with an old configuration. Contributed by Zhihai Xu. 2015-03-18 11:53:19 +09:00
Jian He
968425e9f7 YARN-3305. Normalize AM resource request on app submission. Contributed by Rohith Sharmaks 2015-03-17 13:49:59 -07:00
Karthik Kambatla
32b4330456 Revert "YARN-3181. FairScheduler: Fix up outdated findbugs issues. (kasha)"
This reverts commit c2b185def8.
2015-03-17 12:31:15 -07:00
Jian He
487374b7fe YARN-3243. CapacityScheduler should pass headroom from parent to children to make sure ParentQueue obey its capacity limits. Contributed by Wangda Tan. 2015-03-17 10:24:23 -07:00
Devaraj K
7179f94f9d YARN-3197. Confusing log generated by CapacityScheduler. Contributed by
Varun Saxena.
2015-03-17 15:57:57 +05:30
Tsuyoshi Ozawa
7522a643fa YARN-3349. Treat all exceptions as failure in TestFSRMStateStore#testFSRMStateStoreClientRetry. Contributed by Zhihai Xu. 2015-03-17 08:09:55 +09: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
Zhijie Shen
85f6d67fa7 YARN-1884. Added nodeHttpAddress into ContainerReport and fixed the link to NM web page. Contributed by Xuan Gong. 2015-03-11 19:35:19 -07:00
Allen Wittenauer
a5cf985bf5 YARN-2280. Resource manager web service fields are not accessible (Krisztian Horvath via aw) 2015-03-10 16:32:20 -07:00
Jian He
c3003eba6f YARN-3300. Outstanding_resource_requests table should not be shown in AHS. Contributed by Xuan Gong 2015-03-09 20:46:48 -07:00
Jason Lowe
27e8ea820f YARN-3275. CapacityScheduler: Preemption happening on non-preemptable queues. Contributed by Eric Payne 2015-03-06 22:37:26 +00:00
Jian He
95bfd087dc YARN-1809. Synchronize RM and TimeLineServer Web-UIs. Contributed by Zhijie Shen and Xuan Gong 2015-03-05 21:20:09 -08:00
Tsuyoshi Ozawa
1b67209612 YARN-3249. Add a 'kill application' button to Resource Manager's Web UI. Contributed by Ryu Kobayashi. 2015-03-05 19:55:56 +09:00
Karthik Kambatla
8d88691d16 YARN-3242. Asynchrony in ZK-close can lead to ZKRMStateStore watcher receiving events for old client. (Zhihai Xu via kasha) 2015-03-04 19:49:05 -08:00
Karthik Kambatla
22426a1c9f YARN-3231. FairScheduler: Changing queueMaxRunningApps interferes with pending jobs. (Siqi Li via kasha) 2015-03-04 18:06:58 -08:00
Jian He
b2f1ec312e YARN-3222. Fixed NPE on RMNodeImpl#ReconnectNodeTransition when a node is reconnected with a different port. Contributed by Rohith Sharmaks 2015-03-03 16:28:28 -08:00
Wangda Tan
e17e5ba9d7 YARN-3272. Surface container locality info in RM web UI (Jian He via wangda) 2015-03-03 11:49:01 -08:00
Tsuyoshi Ozawa
d1c6accb6f HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa) 2015-03-03 14:17:52 +09:00
Vinod Kumar Vavilapalli
14dd647c55 YARN-3265. Fixed a deadlock in CapacityScheduler by always passing a queue's available resource-limit from the parent queue. Contributed by Wangda Tan. 2015-03-02 17:52:47 -08:00
Jian He
5d0bae550f YARN-3281. Added RMStateStore to StateMachine visualization list. Contributed by Chengbing Liu 2015-03-02 14:39:49 -08:00
Wangda Tan
edcecedc1c YARN-3262. Surface application outstanding resource requests table in RM web UI. (Jian He via wangda) 2015-02-27 16:13:32 -08:00
Tsuyoshi Ozawa
01a1621930 YARN-2820. Retry in FileSystemRMStateStore when FS's operations fail due to IOException. Contributed by Zhihai Xu. 2015-02-28 00:56:44 +09: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
Devaraj K
0d4296f0e0 YARN-3256. TestClientToAMTokens#testClientTokenRace is not running against
all Schedulers even when using ParameterizedSchedulerTestBase. Contributed
by Anubhav Dhoot.
2015-02-26 15:45:41 +05:30
Tsuyoshi Ozawa
6cbd9f1113 YARN-3247. TestQueueMappings should use CapacityScheduler explicitly. Contributed by Zhihai Xu. 2015-02-25 10:38:11 +09:00
Tsuyoshi Ozawa
9cedad11d8 Revert "HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa)"
This reverts commit 946456c6d8.

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/QuotaByStorageTypeEntry.java
2015-02-25 00:32:04 +09:00
Xuan
fe7a302473 YARN-2797. TestWorkPreservingRMRestart should use
ParametrizedSchedulerTestBase. Contributed by Karthik Kambatla
2015-02-21 19:17:29 -08:00
Wangda Tan
ce5bf927c3 YARN-3230. Clarify application states on the web UI. (Jian He via wangda) 2015-02-20 10:39:28 -08:00
Jason Lowe
a64dd3d24b YARN-3194. RM should handle NMContainerStatuses sent by NM while registering if NM is Reconnected node. Contributed by Rohith 2015-02-20 15:10:10 +00:00
Jian He
c0d9b93953 YARN-933. Fixed InvalidStateTransitonException at FINAL_SAVING state in RMApp. Contributed by Rohith Sharmaks 2015-02-19 15:42:39 -08:00
Wangda Tan
d49ae725d5 YARN-3076. Add API/Implementation to YarnClient to retrieve label-to-node mapping (Varun Saxena via wangda) 2015-02-19 11:00:57 -08:00
Tsuyoshi Ozawa
946456c6d8 HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa) 2015-02-19 13:06:53 +09:00
Tsuyoshi Ozawa
b8a14efdf5 YARN-1615. Fix typos in delay scheduler's description. Contributed by Akira Ajisaka. 2015-02-19 10:24:07 +09:00
Jian He
1c03376300 YARN-1514. Utility to benchmark ZKRMStateStore#loadState for RM HA. Contributed by Tsuyoshi OZAWA 2015-02-18 16:06:55 -08:00
Jian He
f5da5566d9 YARN-3132. RMNodeLabelsManager should remove node from node-to-label mapping when node becomes deactivated. Contributed by Wangda Tan 2015-02-18 11:51:51 -08:00
Tsuyoshi Ozawa
556386a070 YARN-1299. Improve a log message in AppSchedulingInfo by adding application id. Contributed by Ashutosh Jindal and Devaraj K. 2015-02-17 01:53:31 +09:00
Tsuyoshi Ozawa
3f32357c36 Revert "YARN-1299. Improve a log message in AppSchedulingInfo by adding application id. Contributed by Ashutosh Jindal and devaraj."
This reverts commit 9aae81c934.
2015-02-17 01:52:22 +09:00
Tsuyoshi Ozawa
9aae81c934 YARN-1299. Improve a log message in AppSchedulingInfo by adding application id. Contributed by Ashutosh Jindal and devaraj. 2015-02-17 01:48:22 +09:00
Tsuyoshi Ozawa
110cf6b9a3 YARN-3182. Cleanup switch statement in ApplicationMasterLauncher#handle(). Contributed by Ray Chiang. 2015-02-13 14:21:21 +09:00
Xuan
99f6bd4f7a YARN-3158. Correct log messages in ResourceTrackerService. Contributed
by Varun Saxena
2015-02-12 16:42:15 -08:00
Jian He
18297e0972 YARN-3104. Fixed RM to not generate new AMRM tokens on every heartbeat between rolling and activation. Contributed by Jason Lowe 2015-02-12 16:02:45 -08:00
Jian He
18a594257e YARN-3124. Fixed CS LeafQueue/ParentQueue to use QueueCapacities to track capacities-by-label. Contributed by Wangda Tan 2015-02-12 14:58:09 -08:00
Karthik Kambatla
c2b185def8 YARN-3181. FairScheduler: Fix up outdated findbugs issues. (kasha) 2015-02-12 13:44:47 -08:00
Xuan
65c69e296e YARN-3151. On Failover tracking url wrong in application cli for KILLED
application. Contributed by Rohith
2015-02-11 21:19:48 -08:00
Junping Du
c541a374d8 YARN-3160. Fix non-atomic operation on nodeUpdateQueue in RMNodeImpl. (Contributed by Chengbing Liu) 2015-02-11 03:44:31 -08:00
Zhijie Shen
d5855c0e46 YARN-2246. Made the proxy tracking URL always be http(s)://proxy addr:port/proxy/<appId> to avoid duplicate sections. Contributed by Devaraj K. 2015-02-10 15:24:01 -08:00
Zhijie Shen
23bf6c7207 YARN-3100. Made YARN authorization pluggable. Contributed by Jian He. 2015-02-09 20:34:56 -08:00
Jian He
0af6a99a3f YARN-3094. Reset timer for liveness monitors after RM recovery. Contributed by Jun Gong 2015-02-09 13:47:08 -08:00
Karthik Kambatla
7e42088abf YARN-2990. FairScheduler's delay-scheduling always waits for node-local and rack-local delays, even for off-rack-only requests. (kasha) 2015-02-08 22:48:10 -08:00
Jason Lowe
da2fb2bc46 YARN-3143. RM Apps REST API can return NPE or entries missing id and other fields. Contributed by Jason Lowe 2015-02-06 21:47:32 +00:00
Jian He
c1957fef29 YARN-2694. Ensure only single node label specified in ResourceRequest. Contributed by Wangda Tan 2015-02-06 11:34:20 -08:00
Arun C. Murthy
18b2507eda YARN-1904. Ensure exceptions thrown in ClientRMService & ApplicationHistoryClientService are uniform when application-attempt is not found. Contributed by Zhijie Shen. 2015-02-05 23:48:55 -08:00
Jian He
4641196fe0 YARN-3145. Fixed ConcurrentModificationException on CapacityScheduler ParentQueue#getQueueUserAclInfo. Contributed by Tsuyoshi OZAWA 2015-02-05 16:12:53 -08:00
Jason Lowe
69c8a7f45b YARN-1582. Capacity Scheduler: add a maximum-allocation-mb setting per queue. Contributed by Thomas Graves 2015-02-05 19:28:49 +00:00
Sandy Ryza
b6466deac6 YARN-3101. In Fair Scheduler, fix canceling of reservations for exceeding max share (Anubhav Dhoot via Sandy Ryza) 2015-02-05 09:39:28 -08:00
Tsuyoshi Ozawa
26dee1486b YARN-3058. Fix error message of tokens' activation delay configuration. Contributed by Yi Liu. 2015-02-04 11:41:14 +09:00
Zhijie Shen
e5b56e2af6 YARN-2543. Made resource usage be published to the timeline server too. Contributed by Naganarasimha G R. 2015-02-03 17:34:22 -08:00
Wangda Tan
5bd984691b YARN-3075. NodeLabelsManager implementation to retrieve label to node mapping (Varun Saxena via wangda) 2015-02-03 12:52:42 -08:00
Jian He
21d80b3dd9 YARN-3098. Created common QueueCapacities class in Capacity Scheduler to track capacities-by-labels of queues. Contributed by Wangda Tan 2015-02-03 11:43:12 -08:00
Jason Lowe
a761bf8726 YARN-3085. Application summary should include the application type. Contributed by Rohith 2015-02-03 14:56:34 +00:00
Jian He
054a947989 YARN-3077. Fixed RM to create zk root path recursively. Contributed by Chun Chen 2015-01-30 17:34:49 -08:00
Jian He
86358221fc YARN-3099. Capacity Scheduler LeafQueue/ParentQueue should use ResourceUsage to track used-resources-by-label. Contributed by Wangda Tan 2015-01-30 15:15:20 -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
Wangda Tan
7882bc0f14 YARN-3079. Scheduler should also update maximumAllocation when updateNodeResource. (Zhihai Xu via wangda) 2015-01-28 21:54:38 -08:00
Wangda Tan
18741adf97 YARN-2932. Add entry for preemptable status (enabled/disabled) to scheduler web UI and queue initialize/refresh logging. (Eric Payne via wangda) 2015-01-27 15:36:09 -08:00
Jian He
6f9fe76918 YARN-3092. Created a common ResourceUsage class to track labeled resource usages in Capacity Scheduler. Contributed by Wangda Tan 2015-01-26 15:38:00 -08:00
Tsuyoshi Ozawa
24aa462673 YARN-2800. Remove MemoryNodeLabelsStore and add a way to enable/disable node labels feature. Contributed by Wangda Tan. 2015-01-23 20:37:05 +09:00
Wangda Tan
0a2d3e717d YARN-2933. Capacity Scheduler preemption policy should only consider capacity without labels temporarily. Contributed by Mayank Bansal 2015-01-19 16:48:50 -08:00
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
9e33116d1d YARN-2861. Fixed Timeline DT secret manager to not reuse RM's configs. Contributed by Zhijie Shen 2015-01-15 11:07:43 -08:00
Jian He
c53420f583 YARN-2637. Fixed max-am-resource-percent calculation in CapacityScheduler when activating applications. Contributed by Craig Welch 2015-01-13 17:32:07 -08:00
Robert Kanter
51881535e6 YARN-2643. Don't create a new DominantResourceCalculator on every FairScheduler.allocate call. (kasha via rkanter) 2015-01-12 17:51:00 -08:00
Robert Kanter
ae7bf31fe1 YARN-3027. Scheduler should use totalAvailable resource from node instead of availableResource for maxAllocation. (adhoot via rkanter) 2015-01-12 10:47:52 -08:00
Jian He
a260406268 YARN-3014. Replaces labels on a host should update all NM's labels on that host. Contributed by Wangda Tan 2015-01-09 17:49:53 -08:00
Zhijie Shen
dc2eaa26b2 YARN-2996. Improved synchronization and I/O operations of FS- and Mem- RMStateStore. Contributed by Yi Liu. 2015-01-08 09:47:02 -08:00
Jian He
e13a484a2b YARN-3010. Fixed findbugs warning in AbstractYarnScheduler. Contributed by Yi Liu 2015-01-07 14:12:20 -08:00
Zhijie Shen
60103fca04 YARN-2427. Added the API of moving apps between queues in RM web services. Contributed by Varun Vasudev. 2015-01-06 14:37:44 -08:00
Jian He
dd57c2047b YARN-2978. Fixed potential NPE while getting queue info. Contributed by Varun Saxena 2015-01-06 14:15:57 -08:00
Karthik Kambatla
0c4b112677 YARN-2881. [YARN-2574] Implement PlanFollower for FairScheduler. (Anubhav Dhoot via kasha) 2015-01-06 04:42:10 +05:30
Zhijie Shen
562a701945 YARN-2958. Made RMStateStore not update the last sequence number when updating the delegation token. Contributed by Varun Saxena. 2015-01-05 13:33:07 -08:00
Tsuyoshi Ozawa
ddc5be48fc YARN-2922. ConcurrentModificationException in CapacityScheduler's LeafQueue. Contributed by Rohith Sharmaks. 2015-01-05 00:08:31 +09:00
Karthik Kambatla
e7257acd8a YARN-2998. Abstract out scheduler independent PlanFollower components. (Anubhav Dhoot via kasha) 2014-12-30 19:55:24 -08:00
Jian He
e2351c7ae2 YARN-2987. Fixed ClientRMService#getQueueInfo to check against queue and app ACLs. Contributed by Varun Saxena 2014-12-30 17:15:37 -08:00
Jian He
b7442bf92e YARN-2493. Added node-labels page on RM web UI. Contributed by Wangda Tan 2014-12-30 16:49:01 -08:00
Jian He
746ad6e989 Revert "YARN-2492(wrong jira number). Added node-labels page on RM web UI. Contributed by Wangda Tan"
This reverts commit 5f57b904f5.
2014-12-30 16:48:49 -08:00
Jian He
5f57b904f5 YARN-2492. Added node-labels page on RM web UI. Contributed by Wangda Tan 2014-12-30 15:38:28 -08:00
Zhijie Shen
241d3b3a50 YARN-2938. Fixed new findbugs warnings in hadoop-yarn-resourcemanager and hadoop-yarn-applicationhistoryservice. Contributed by Varun Saxena. 2014-12-29 09:59:35 -08:00
Jian He
1454efe5d4 YARN-2992. ZKRMStateStore crashes due to session expiry. Contributed by Karthik Kambatla 2014-12-26 17:59:58 -08:00
Junping Du
40ee4bff65 YARN-2993. Several fixes (missing acl check, error log msg ...) and some refinement in AdminService. (Contributed by Yi Liu) 2014-12-26 06:59:25 -08:00
Jian He
4f18018b7a YARN-2946. Fixed potential deadlock in RMStateStore. Contributed by Rohith Sharmaks 2014-12-23 22:14:29 -08:00
Jian He
149512a837 YARN-2837. Support TimeLine server to recover delegation token when restarting. Contributed by Zhijie Shen 2014-12-23 18:25:37 -08:00
Jian He
0d89859b51 YARN-2340. Fixed NPE when queue is stopped during RM restart. Contributed by Rohith Sharmaks 2014-12-22 21:53:22 -08:00
Jian He
fdf042dfff YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan 2014-12-22 16:51:15 -08:00
Junping Du
a696fbb001 YARN-2939. Fix new findbugs warnings in hadoop-yarn-common. (Li Lu via junping_du) 2014-12-22 03:06:37 -08:00
Karthik Kambatla
24ee9e3431 YARN-2975. FSLeafQueue app lists are accessed without required locks. (kasha) 2014-12-20 12:17:50 -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
a22ffc3188 YARN-2738. [YARN-2574] Add FairReservationSystem for FairScheduler. (Anubhav Dhoot via kasha) 2014-12-19 15:37:12 -08:00
Jason Lowe
0402bada19 YARN-2964. RM prematurely cancels tokens for jobs that submit jobs (oozie). Contributed by Jian He 2014-12-18 23:28:18 +00:00
Junping Du
2b4b0e8847 YARN-2972. DelegationTokenRenewer thread pool never expands. Contributed by Jason Lowe 2014-12-17 17:40:00 -08:00
Karthik Kambatla
f2d150ea12 YARN-2964. FSLeafQueue#assignContainer - document the reason for using both write and read locks. (Tsuyoshi Ozawa via kasha) 2014-12-17 12:03:16 -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
Devaraj K
bda748ac3a YARN-2243. Order of arguments for Preconditions.checkNotNull() is wrong in
SchedulerApplicationAttempt ctor. Contributed by Devaraj K.
2014-12-12 12:34:43 +05:30
Jian He
2ed90a57fd YARN-2930. Fixed TestRMRestart#testRMRestartRecoveringNodeLabelManager intermittent failure. Contributed by Wangda Tan 2014-12-09 16:48:04 -08:00
Karthik Kambatla
a2e07a5456 YARN-2910. FSLeafQueue can throw ConcurrentModificationException. (Wilfred Spiegelenburg via kasha) 2014-12-09 14:00:31 -08:00
Jian He
e69af836f3 YARN-2869. CapacityScheduler should trim sub queue names when parse configuration. Contributed by Wangda Tan 2014-12-05 17:33:39 -08:00
Jason Lowe
4b13082199 YARN-2056. Disable preemption at Queue level. Contributed by Eric Payne 2014-12-05 21:06:48 +00:00
Jian He
258623ff8b YARN-2301. Improved yarn container command. Contributed by Naganarasimha G R 2014-12-04 12:53:18 -08:00
Jian He
73fbb3c66b YARN-2880. Added a test to make sure node labels will be recovered if RM restart is enabled. Contributed by Rohith Sharmaks 2014-12-03 17:14:52 -08:00
Karthik Kambatla
799353e2c7 YARN-2874. Dead lock in DelegationTokenRenewer which blocks RM to execute any further apps. (Naganarasimha G R via kasha) 2014-12-03 13:44:41 -08:00
Jian He
392c3aaea8 YARN-2894. Fixed a bug regarding application view acl when RM fails over. Contributed by Rohith Sharmaks 2014-12-02 17:16:35 -08:00
Jian He
52bcefca8b YARN-2136. Changed RMStateStore to ignore store opearations when fenced. Contributed by Varun Saxena 2014-12-02 10:54:48 -08:00
Jian He
a7fba0bc28 YARN-2765. Added leveldb-based implementation for RMStateStore. Contributed by Jason Lowe 2014-12-01 16:38:25 -08:00
Junping Du
c732ed760e YARN-2907. SchedulerNode#toString should print all resource detail instead of only memory. (Contributed by Rohith) 2014-12-01 05:38:22 -08:00
Jian He
8a7ca13b13 YARN-2906. CapacitySchedulerPage shows HTML tags for a queue's Active Users. Contributed by Jason Lowe 2014-11-25 16:16:56 -08:00
Jian He
5805a81efb YARN-2404. Removed ApplicationAttemptState and ApplicationState class in RMStateStore. Contributed by Tsuyoshi OZAWA 2014-11-25 12:48:22 -08:00
Zhijie Shen
e37a4ff0c1 YARN-2697. Remove useless RMAuthenticationHandler. Contributed by Haosong Huang. 2014-11-24 14:58:59 -08:00
Sandy Ryza
a128cca305 YARN-2669. FairScheduler: queue names shouldn't allow periods (Wei Yan via Sandy Ryza) 2014-11-21 16:06:41 -08:00
Karthik Kambatla
3114d4731d YARN-2604. Scheduler should consider max-allocation-* in conjunction with the largest node. (Robert Kanter via kasha) 2014-11-21 10:32:28 -08:00
Karthik Kambatla
a9a0cc3679 YARN-2315. FairScheduler: Set current capacity in addition to capacity. (Zhihai Xu via kasha) 2014-11-19 20:15:40 -08:00
Karthik Kambatla
c90fb84aaa YARN-2802. ClusterMetrics to include AM launch and register delays. (Zhihai Xu via kasha) 2014-11-19 19:50:12 -08:00
Jian He
9cb8b75ba5 YARN-2865. Fixed RM to always create a new RMContext when transtions from StandBy to Active. Contributed by Rohith Sharmaks 2014-11-19 19:48:52 -08:00
Karthik Kambatla
2fce6d6141 YARN-2690. [YARN-2574] Make ReservationSystem and its dependent classes independent of Scheduler type. (Anubhav Dhoot via kasha) 2014-11-17 16:45:57 -08:00
Jason Lowe
81c9d17af8 YARN-2414. RM web UI: app page will crash if app is failed before any attempt has been created. Contributed by Wangda Tan 2014-11-17 21:15:48 +00:00
Jian He
9b860661a5 YARN-2432. RMStateStore should process the pending events before close. Contributed by Varun Saxena 2014-11-14 17:24:09 -08:00
Sandy Ryza
1a47f890ba YARN-2811. In Fair Scheduler, reservation fulfillments shouldn't ignore max share (Siqi Li via Sandy Ryza) 2014-11-14 15:18:56 -08:00
Jian He
d005404ef7 YARN-2856. Fixed RMAppImpl to handle ATTEMPT_KILLED event at ACCEPTED state on app recovery. Contributed by Rohith Sharmaks 2014-11-13 15:34:26 -08:00
Vinod Kumar Vavilapalli
3651fe1b08 YARN-2853. Fixed a bug in ResourceManager causing apps to hang when the user kill request races with ApplicationMaster finish. Contributed by Jian He. 2014-11-13 08:13:03 -08:00
Jason Lowe
f8aefa5e9c YARN-2780. Log aggregated resource allocation in rm-appsummary.log. Contributed by Eric Payne 2014-11-12 17:01:15 +00:00
Vinod Kumar Vavilapalli
e76faebc95 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. 2014-11-09 18:56:58 -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
Zhijie Shen
9a4e0d343e YARN-2505. Supported get/add/remove/change labels in RM REST API. Contributed by Craig Welch. 2014-11-07 20:35:46 -08:00
Vinod Kumar Vavilapalli
df36edf751 YARN-2826. Fixed user-groups mappings' refresh bug caused by YARN-2826. Contributed by Wangda Tan. 2014-11-07 19:43:55 -08:00
Vinod Kumar Vavilapalli
4cfd5bc7c1 YARN-2753. Fixed a bunch of bugs in the NodeLabelsManager classes. Contributed by Zhihai xu. 2014-11-07 14:15:53 -08:00
Vinod Kumar Vavilapalli
2ac1be7dec 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. 2014-11-07 10:39:37 -08:00
Xuan
1e97f2f094 YARN-2810. TestRMProxyUsersConf fails on Windows VMs. Contributed by Varun Vasudev 2014-11-07 09:44:43 -08:00
Vinod Kumar Vavilapalli
a5657182a7 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. 2014-11-07 09:28:36 -08:00
Vinod Kumar Vavilapalli
a3839a9fbf YARN-2744. Fixed CapacityScheduler to validate node-labels correctly against queues. Contributed by Wangda Tan. 2014-11-06 17:28:12 -08:00
Jian He
395275af86 YARN-2579. Fixed a deadlock issue when EmbeddedElectorService and FatalEventDispatcher try to transition RM to StandBy at the same time. Contributed by Rohith Sharmaks 2014-11-05 16:59:54 -08:00
Vinod Kumar Vavilapalli
834e931d8e YARN-2805. Fixed ResourceManager to load HA configs correctly before kerberos login. Contributed by Wangda Tan. 2014-11-05 15:30:33 -08:00
Zhijie Shen
b4c951ab83 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. 2014-11-05 10:57:38 -08:00
Karthik Kambatla
b2cd269802 YARN-2010. Handle app-recovery failures gracefully. (Jian He and Karthik Kambatla via kasha) 2014-11-04 17:45:24 -08:00
Vinod Kumar Vavilapalli
ec6cbece8e YARN-2795. Fixed ResourceManager to not crash loading node-label data from HDFS in secure mode. Contributed by Wangda Tan. 2014-11-03 13:44:06 -08:00
Zhijie Shen
27715ec63b YARN-2785. Fixed intermittent TestContainerResourceUsage failure. Contributed by Varun Vasudev. 2014-11-02 15:20:40 -08:00
Vinod Kumar Vavilapalli
d1828d9443 YARN-2779. Fixed ResourceManager to not require delegation tokens for communicating with Timeline Service. Contributed by Zhijie Shen. 2014-10-30 23:16:19 -07:00
Vinod Kumar Vavilapalli
e0233c16eb YARN-2698. Moved some node label APIs to be correctly placed in client protocol. Contributed by Wangda Tan. 2014-10-30 22:59:31 -07:00
Karthik Kambatla
179cab81e0 YARN-2712. TestWorkPreservingRMRestart: Augment FS tests with queue and headroom checks. (Tsuyoshi Ozawa via kasha) 2014-10-30 00:29:07 -07:00
Karthik Kambatla
782971ae7a YARN-2742. FairSchedulerConfiguration should allow extra spaces between value and unit. (Wei Yan via kasha) 2014-10-29 10:24:57 -07:00
Jian He
d5e0a09721 YARN-2503. Added node lablels in web UI. Contributed by Wangda Tan 2014-10-28 17:57:54 -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
Xuan
ce1a4419a6 YARN-2726. CapacityScheduler should explicitly log when an accessible label has no capacity. Contributed by Wangda Tan 2014-10-27 10:26:21 -07:00
Vinod Kumar Vavilapalli
0186645505 YARN-2743. Fixed a bug in ResourceManager that was causing RMDelegationToken identifiers to be tampered and thus causing app submission failures in secure mode. Contributed by Jian He. 2014-10-26 11:14:34 -07:00
Jian He
5864dd99a4 YARN-1915. Fixed a race condition that client could use the ClientToAMToken to contact with AM before AM actually receives the ClientToAMTokenMasterKey. Contributed by Jason Lowe 2014-10-24 22:47:56 -07:00
Zhijie Shen
0f3b6900be YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and made related MR changes. Contributed by Jian He. 2014-10-23 21:56:03 -07:00
Zhijie Shen
7e3b5e6f5c YARN-2721. Suppress NodeExist exception thrown by ZKRMStateStore when it retries creating znode. Contributed by Jian He. 2014-10-21 21:49:17 -07:00
Vinod Kumar Vavilapalli
c0e034336c YARN-2715. Fixed ResourceManager to respect common configurations for proxy users/groups beyond just the YARN level config. Contributed by Zhijie Shen. 2014-10-21 20:09:40 -07:00
Vinod Kumar Vavilapalli
8256766498 YARN-2504. Enhanced RM Admin CLI to support management of node-labels. Contribyted by Wangda Tan. 2014-10-18 12:07:40 -07:00