big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,901 Commits 2 Branches 2 Tags 264 MiB
280357c29f
Commit Graph

816 Commits

Author SHA1 Message Date
Jian He
1cb3299b48 YARN-4403. (AM/NM/Container)LivelinessMonitor should use monotonic time when calculating period. Contributed by Junping Du 2015-12-14 13:51:23 -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
Xuan
21daa6c68a YARN-3623-Addendum: Improve the description for Timeline Service Version configuration in yarn-default.xml 2015-12-10 10:56:12 -08:00
Junping Du
f910e4f639 YARN-3623. Add a config to indicate the Timeline Service version. Contributed by Xuan Gong. 2015-12-10 02:53:47 -08:00
rohithsharmaks
01a641bc44 YARN-3456. Improve handling of incomplete TimelineEntities. (Varun Saxena via rohithsharmaks) 2015-12-07 15:16:56 +05:30
Jian He
e84d6ca2df Add missing file for YARN-4419 2015-12-03 19:07:28 -08:00
Jian He
755dda8dd8 YARN-4405. Support node label store in non-appendable file system. Contributed by Wangda Tan 2015-12-03 17:45:31 -08: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
Jian He
6b9a5beb2b YARN-4398. Remove unnecessary synchronization in RMStateStore. Contributed by Ning Ding 2015-12-02 11:07:18 -08:00
Jason Lowe
f5acf94eca YARN-4365. FileSystemNodeLabelStore should check for root dir existence on startup. Contributed by Kuhu Shukla 2015-11-24 23:47:10 +00: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
Akira Ajisaka
8c0133f3d4 YARN-4298. Fix findbugs warnings in hadoop-yarn-common. Contributed by Sunil G. 2015-11-24 18:40:33 +09:00
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
Akira Ajisaka
23d0db551c YARN-4241. Fix typo of property name in yarn-default.xml. Contributed by Anthony Rojas. 2015-11-11 16:13:08 +09: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
Jian He
c41699965e YARN-4288. Fixed RMProxy to retry on IOException from local host. Contributed by Junping Du 2015-10-29 00:00:48 -07:00
Wangda Tan
6f606214e7 YARN-4169. Fix racing condition of TestNodeStatusUpdaterForLabels. (Naganarasimha G R via wangda) 2015-10-26 16:36:34 -07:00
Wangda Tan
3cc73773eb YARN-4285. Display resource usage as percentage of queue and cluster in the RM UI (Varun Vasudev via wangda) 2015-10-26 13:07:39 -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
Jonathan Eagles
f8adeb712d YARN-4009. CORS support for ResourceManager REST API. ( Varun Vasudev via jeagles) 2015-10-23 10:34:08 -05:00
Junping Du
0fce5f9a49 YARN-4243. Add retry on establishing Zookeeper conenction in EmbeddedElectorService#serviceInit. Contributed by Xuan Gong. 2015-10-22 13:41:09 -07:00
Jonathan Eagles
25f8f801d1 YARN-2513. Host framework UIs in YARN for use with the ATS (jeagles) 2015-10-21 15:38:08 -05:00
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
Jian He
f9da5cdb2b YARN-4170. AM need to be notified with priority in AllocateResponse. Contributed by Sunil G 2015-10-16 15:26:27 -07: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
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
Devaraj K
db93047881 YARN-3964. Support NodeLabelsProvider at Resource Manager side. 
Contributed by Dian Fu.
 2015-10-11 11:21:29 +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
Harsh J
c918f7be5e HADOOP-12458. Retries is typoed to spell Retires in parts of hadoop-yarn and hadoop-common. Contributed by Neelesh Srinivas Salian. 2015-10-03 18:37:58 +05:30
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
Jian He
89cab1ba5f YARN-1651. CapacityScheduler side changes to support container resize. Contributed by Wangda Tan 2015-09-23 13:29:38 -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
Jian He
dfe2cb849f YARN-3866. AM-RM protocol changes to support container resizing. Contributed by Meng Ding 2015-09-23 13:29:36 -07:00
Tsuyoshi Ozawa
dfd807afab HADOOP-12428. Fix inconsistency between log-level guards and statements. Contributed by Jagadesh Kiran N and Jackie Chang. 2015-09-22 12:54:29 +09:00
Wangda Tan
b00392dd9c YARN-4113. RM should respect retry-interval when uses RetryPolicies.RETRY_FOREVER. (Sunil G via wangda) 2015-09-21 11:04:03 -07:00
Steve Loughran
bf2f2b4fc4 YARN-3433. Jersey tests failing with Port in Use -again. (Brahma Reddy Battula) 2015-09-16 10:31:02 +01:00
Wangda Tan
ae5308fe1d YARN-3717. Expose app/am/queue's node-label-expression to RM web UI / CLI / REST-API. (Naganarasimha G R via wangda) 2015-09-15 11:40:50 -07:00
Junping Du
73e3a49eb0 YARN-313. Add Admin API for supporting node resource configuration in command line. (Contributed by Inigo Goiri, Kenji Kikushima and Junping Du) 2015-09-15 07:56:47 -07:00
Karthik Kambatla
332b520a48 YARN-3697. FairScheduler: ContinuousSchedulingThread can fail to shutdown. (Zhihai Xu via kasha) 2015-09-13 18:07:43 -07:00
Karthik Kambatla
81df7b586a YARN-2005. Blacklisting support for scheduling AMs. (Anubhav Dhoot via kasha) 2015-09-13 17:03:15 -07:00
Steve Loughran
7269906254 HADOOP-12087. [JDK8] Fix javadoc errors caused by incorrect or illegal tags. (Akira AJISAKA via stevel). 2015-09-13 14:25:26 +01:00
Robert Kanter
6dd6ca442a YARN-4086. Allow Aggregated Log readers to handle HAR files (rkanter) 2015-09-09 18:03:04 -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
Xuan
9b78e6e33d YARN-4087. Followup fixes after YARN-2019 regarding RM behavior when 
state-store error occurs. Contributed by Jian He
 2015-09-07 17:45:47 -07:00
Wangda Tan
bcc85e3bab YARN-4024. YARN RM should avoid unnecessary resolving IP when NMs doing heartbeat. (Hong Zhiguo via wangda) 2015-09-04 15:13:53 -07:00
Jian He
a3fd2ccc86 YARN-4092. Fixed UI redirection to print useful messages when both RMs are in standby mode. Contributed by Xuan Gong 2015-08-31 17:33:24 -07:00
Jian He
a9c8ea71aa YARN-3250. Support admin cli interface in for Application Priority. Contributed by Rohith Sharma K S 2015-08-27 13:25:53 -07:00
Jian He
57c7ae1aff YARN-4014. Support user cli interface in for Application Priority. Contributed by Rohith Sharma K S 2015-08-24 20:36:44 -07:00
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
Karthik Kambatla
def12933b3 YARN-3534. Collect memory/cpu usage on the node. (Inigo Goiri via kasha) 2015-08-16 06:24:16 -07:00
rohithsharmaks
1c12adb71f YARN-4023. Publish Application Priority to TimelineServer. (Sunil G via rohithsharmaks) 2015-08-12 14:45:41 +05:30
Xuan
3ae716fa69 YARN-3999. RM hangs on draing events. Contributed by Jian He 2015-08-11 18:25:11 -07:00
Rohith Sharma K S
b6265d39c5 YARN-3948. Display Application Priority in RM Web UI.(Sunil G via rohithsharmaks) 2015-08-07 10:43:41 +05:30
Arun Suresh
154c9d2e42 YARN-3961. Expose pending, running and reserved containers of a queue in REST api and yarn top (adhoot via asuresh) 2015-08-05 23:14:14 -07:00
Xuan
0306d902f5 YARN-3543. ApplicationReport should be able to tell whether the 
Application is AM managed or not. Contributed by Rohith Sharma K S
 2015-08-03 15:46:00 -07:00
Wangda Tan
8acb30b016 YARN-3963. AddNodeLabel on duplicate label addition shows success. (Bibin A Chundatt via wangda) 2015-07-30 09:42:55 -07:00
rohithsharmaks
c020b62cf8 YARN-3919. NPEs' while stopping service after exception during CommonNodeLabelsManager#start. (varun saxena via rohithsharmaks) 2015-07-29 23:30:47 +05:30
Karthik Kambatla
5205a330b3 YARN-2768. Avoid cloning Resource in FSAppAttempt#updateDemand. (Hong Zhiguo via kasha) 2015-07-29 09:42:32 -07:00
Akira Ajisaka
42d4e0ae99 YARN-3958. TestYarnConfigurationFields should be moved to hadoop-yarn-api module. Contributed by Varun Saxena. 2015-07-27 11:43:25 +09:00
Rohith Sharma K S
e202efaf93 YARN-3845. Scheduler page does not render RGBA color combinations in IE11. (Contributed by Mohammad Shahid Khan) 2015-07-24 12:43:06 +05:30
Robert Kanter
1d3026e7b3 YARN-3900. Protobuf layout of yarn_security_token causes errors in other protos that include it (adhoot via rkanter) 2015-07-23 14:46:54 -07:00
Junping Du
ee98d6354b YARN-2019. Retrospect on decision of making RM crashed if any exception throw in ZKRMStateStore. Contributed by Jian He. 2015-07-22 17:52:35 -07:00
rohithsharmaks
8376ea3297 YARN-3954. Fix TestYarnConfigurationFields#testCompareConfigurationClassAgainstXml. (varun saxena via rohithsharmaks) 2015-07-23 00:28:24 +05:30
Jian He
393fe71771 YARN-3878. AsyncDispatcher can hang while stopping if it is configured for draining events on stop. Contributed by Varun Saxena 2015-07-21 15:05:41 -07:00
Wangda Tan
fa2b63ed16 YARN-3930. FileSystemNodeLabelsStore should make sure edit log file closed when exception is thrown. (Dian Fu via wangda) 2015-07-16 16:06:20 -07:00
Chris Douglas
a431ed9075 HADOOP-12211. Collect disk usage on the node. Contributed by Robert Grandl 2015-07-13 15:36:11 -07:00
Jian He
2466460d4c Revert "YARN-3878. AsyncDispatcher can hang while stopping if it is configured for draining events on stop. (Varun Saxena via kasha)" 
This reverts commit aa067c6aa4.
 2015-07-13 14:30:35 -07:00
Akira Ajisaka
19295b36d9 YARN-3381. Fix typo InvalidStateTransitonException. Contributed by Brahma Reddy Battula. 2015-07-13 17:52:13 +09:00
Akira Ajisaka
d6675606dc YARN-3069. Document missing properties in yarn-default.xml. Contributed by Ray Chiang. 2015-07-13 12:57:01 +09:00
Gera Shegalov
d7319dee37 YARN-3917. getResourceCalculatorPlugin for the default should intercept all exceptions. (gera) 2015-07-11 22:29:36 -07: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
Chris Douglas
1a0752d85a HADOOP-12210. Collect network usage on the node. Contributed by Robert Grandl 2015-07-09 17:48:43 -07:00
Karthik Kambatla
ac6048372a HADOOP-12180. Move ResourceCalculatorPlugin from YARN to Common. (Chris Douglas via kasha) 2015-07-09 09:56:40 -07:00
Karthik Kambatla
aa067c6aa4 YARN-3878. AsyncDispatcher can hang while stopping if it is configured for draining events on stop. (Varun Saxena via kasha) 2015-07-09 09:48:29 -07:00
Akira Ajisaka
d6325745e2 YARN-3690. [JDK8] 'mvn site' fails. Contributed by Brahma Reddy Battula. 2015-07-08 15:42:31 +09:00
Xuan
688617d6d7 YARN-3882. AggregatedLogFormat should close aclScanner and ownerScanner 
after create them. Contributed by zhihai xu
 2015-07-04 21:51:58 -07:00
Devaraj K
7405c59799 YARN-3823. Fix mismatch in default values for 
yarn.scheduler.maximum-allocation-vcores property. Contributed by Ray
Chiang.
 2015-07-01 11:11:26 +05:30
Gera Shegalov
6f2a41e37d YARN-3768. ArrayIndexOutOfBoundsException with empty environment variables. (Zhihai Xu via gera) 2015-06-30 14:59:33 -07:00
Jian He
4672315e2d YARN-3770. SerializedException should also handle java.lang.Error on de-serialization. Contributed by Lavkesh Lahngir 2015-06-29 14:31:49 -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
Devaraj K
b381f88c71 YARN-3745. SerializedException should also try to instantiate internal 
exception with the default constructor. Contributed by Lavkesh Lahngir.
 2015-06-25 17:38:11 +05:30
Jason Lowe
2a20dd9b61 YARN-3809. Failed to launch new attempts because ApplicationMasterLauncher's threads all hang. Contributed by Jun Gong 2015-06-24 16:23:48 +00:00
Karthik Kambatla
5ebf2817e5 YARN-3842. NMProxy should retry on NMNotYetReadyException. (Robert Kanter via kasha) 2015-06-22 17:47:47 -07:00
Gera Shegalov
63d40d5286 MAPREDUCE-6316. Task Attempt List entries should link to the task overview. (Siqi Li via gera) 2015-06-20 11:38:21 -07:00
Devaraj K
318d2cde7c YARN-3617. Fix WindowsResourceCalculatorPlugin.getCpuFrequency() returning 
always -1. Contributed by J.Andreina.
 2015-06-17 13:54:09 +05:30
Xuan
e27d5a13b0 YARN-3714. AM proxy filter can not get RM webapp address from 
yarn.resourcemanager.hostname.rm-id. Contributed by Masatake Iwasaki
 2015-06-16 14:06:16 -07:00
Zhijie Shen
8d0ef31632 YARN-3787. Allowed generic history service to load a number of applications whose started time is within the given range. Contributed by Xuan Gong. 2015-06-08 23:14:58 -07:00
Wangda Tan
405bbcf68c Add missing test file of YARN-3733 2015-06-04 13:18:44 -07:00
Wangda Tan
ebd797c48f YARN-3733. Fix DominantRC#compare() does not work as expected if cluster resource is empty. (Rohith Sharmaks via wangda) 2015-06-04 10:22:57 -07:00
Xuan
5766a04428 YARN-3749. We should make a copy of configuration when init 
MiniYARNCluster with multiple RMs. Contributed by Chun Chen
 2015-06-03 17:20:15 -07:00
Zhijie Shen
bc85959edd Revert "YARN-1462. Made RM write application tags to timeline server and exposed them to users via generic history web UI and REST API. Contributed by Xuan Gong." 
This reverts commit 4a9ec1a824.
 2015-06-03 14:15:56 -07:00
Wangda Tan
5cc3fced95 YARN-3725. App submission via REST API is broken in secure mode due to Timeline DT service address is empty. (Zhijie Shen via wangda) 2015-05-31 16:31:09 -07:00
Zhijie Shen
4a9ec1a824 YARN-1462. Made RM write application tags to timeline server and exposed them to users via generic history web UI and REST API. Contributed by Xuan Gong. 2015-05-30 21:05:36 -07:00
Wangda Tan
788bfa0359 YARN-3716. Node-label-expression should be included by ResourceRequestPBImpl.toString. (Xianyin Xin via wangda) 2015-05-28 16:34:18 -07:00
Devaraj K
7e509f5843 YARN-3722. Merge multiple TestWebAppUtils into 
o.a.h.yarn.webapp.util.TestWebAppUtils. Contributed by Masatake Iwasaki.
 2015-05-28 15:35:06 +05:30
Zhijie Shen
54504133f4 YARN-3700. Made generic history service load a number of latest applications according to the parameter or the configuration. Contributed by Xuan Gong. 2015-05-27 16:52:22 -07:00
Wangda Tan
ec0a852a37 YARN-3647. RMWebServices api's should use updated api from CommonNodeLabelsManager to get NodeLabel object. (Sunil G via wangda) 2015-05-27 12:51:20 -07:00
Wangda Tan
cdbd66be11 YARN-3686. CapacityScheduler should trim default_node_label_expression. (Sunil G via wangda) 2015-05-26 15:58:47 -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
Xuan
39077dba2e YARN-2238. Filtering on UI sticks even if I move away from the page. 
Contributed by Jian He
 2015-05-25 22:39:16 -07:00
Vinayakumar B
55ed6558ba HADOOP-11743. maven doesn't clean all the site files (Contributed by ramtin) 2015-05-22 16:45:19 +05:30
Devaraj K
0305316d69 YARN-3646. Applications are getting stuck some times in case of retry 
policy forever. Contributed by Raju Bairishetti.
 2015-05-21 20:14:44 +05:30
Jian He
8966d42179 YARN-3609. Load node labels from storage inside RM serviceStart. Contributed by Wangda Tan 2015-05-20 16:30:07 -07:00
Wangda Tan
563eb1ad2a YARN-3583. Support of NodeLabel object instead of plain String in YarnClient side. (Sunil G via wangda) 2015-05-19 16:54:38 -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
Xuan
76afd28862 YARN-3541. Add version info on timeline service / generic history web UI and REST API. Contributed by Zhijie Shen 2015-05-18 13:17:16 -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
d4f53fc963 YARN-3579. CommonNodeLabelsManager should support NodeLabel instead of string label name when getting node-to-label/label-to-label mappings. (Sunil G via wangda) 2015-05-13 13:29:09 -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
Zhijie Shen
fcd0702c10 YARN-3539. Updated timeline server documentation and marked REST APIs evolving. Contributed by Steve Loughran. 2015-05-12 21:13:22 -07:00
Karthik Kambatla
70fb37cd79 YARN-1287. Consolidate MockClocks. (Sebastian Wong and Anubhav Dhoot via kasha) 2015-05-09 14:34:54 -07: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
Thomas Graves
f0f5e3c075 YARN-20. More information for yarn.resourcemanager.webapp.address in yarn-default.xml (Bartosz Ługowski vai tgraves) 2015-05-08 17:21:32 +00:00
Devaraj K
241a72af0d YARN-2784. Make POM project names consistent. Contributed by Rohith. 2015-05-08 19:23:53 +05:30
Jason Lowe
9757864fd6 YARN-3554. Default value for maximum nodemanager connect wait time is too high. Contributed by Naganarasimha G R 2015-05-08 13:45:35 +00:00
Tsuyoshi Ozawa
f26700f287 YARN-3589. RM and AH web UI display DOCTYPE wrongly. Contbituted by Rohith. 2015-05-08 17:13:40 +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
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
Tsuyoshi Ozawa
e8d0ee5fc9 YARN-1993. Cross-site scripting vulnerability in TextView.java. Contributed byKenji Kikushima. 2015-05-03 10:51:17 +09:00
Junping Du
57d9a972cb YARN-2454. Fix compareTo of variable UNBOUNDED in o.a.h.y.util.resource.Resources. Contributed by Xu Yang. 2015-05-02 10:18:44 -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
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
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
Jian He
aa4a192feb YARN-3522. Fixed DistributedShell to instantiate TimeLineClient as the correct user. Contributed by Zhijie Shen 2015-04-23 11:07:26 -07: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
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
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
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
Junping Du
a77d628339 YARN-3347. Improve YARN log command to get AMContainer logs as well as running containers logs. Contributed by Xuan Gong. 2015-04-13 17:29:06 -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
Wangda Tan
7af086a515 YARN-3459. Fix failiure of TestLog4jWarningErrorMetricsAppender. (Varun Vasudev via wangda) 2015-04-08 10:57:48 -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
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
Wangda Tan
492239424a YARN-3425. NPE from RMNodeLabelsManager.serviceStop when NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda) 2015-04-01 10:14:48 -07:00
Vinod Kumar Vavilapalli
7610925e90 YARN-3304. Addendum patch. Cleaning up ResourceCalculatorProcessTree APIs for public use and removing inconsistencies in the default values. (Junping Du and Karthik Kambatla via vinodkv) 2015-03-31 17:27:46 -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
Robert Kanter
87130bf6b2 YARN-3400. [JDK 8] Build Failure due to unreported exceptions in RPCUtil (rkanter) 2015-03-26 11:00:20 -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
Junping Du
7f1e2f9969 YARN-3350. YARN RackResolver spams logs with messages at info level. Contributed by Wilfred Spiegelenburg 2015-03-20 18:21:33 -07: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
Xuan
1a4b528691 YARN-2777. Mark the end of individual log in aggregated log. Contributed 
by Varun Saxena
 2015-03-20 10:24:13 -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
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
Zhijie Shen
d6e05c5ee2 YARN-3287. Made TimelineClient put methods do as the correct login context. Contributed by Daryn Sharp and Jonathan Eagles. 2015-03-09 13:54:36 -07:00
Junping Du
7ce3c76353 YARN-3296. Mark ResourceCalculatorProcessTree class as Public for configurable resource monitoring. Contributed by Hitesh Shah 2015-03-08 14:47:35 -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
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
Xuan
d1abc5d4fc YARN-3227. Timeline renew delegation token fails when RM user's TGT is 
expired. Contributed by Zhijie Shen
 2015-03-06 13:32:05 -08: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
Karthik Kambatla
53947f37c7 YARN-3122. Metrics for container's actual CPU usage. (Anubhav Dhoot via kasha) 2015-03-04 17:33:30 -08:00
Tsuyoshi Ozawa
d1c6accb6f HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa) 2015-03-03 14:17:52 +09: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
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
92d67ace32 YARN-3238. Connection timeouts to nodemanagers are retried at multiple 
levels. Contributed by Jason Lowe
 2015-02-21 16:06:12 -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
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
Xuan
2586915bb3 YARN-3179. Update use of Iterator to Iterable in RMAdminCLI and 
CommonNodeLabelsManager. Contributed by Ray Chiang
 2015-02-12 17:31:45 -08:00
Tsuyoshi Ozawa
7bc492adab YARN-3157. Refactor the exception handling in ConverterUtils#to*Id. Contributed by Bibin A Chundatt. 2015-02-12 23:48:43 +09:00
Junping Du
46c7577b98 YARN-1580. Documentation error regarding container-allocation.expiry-interval-ms (Brahma Reddy Battula via junping_du) 2015-02-12 03:38:54 -08:00
Tsuyoshi Ozawa
4cbaa74f62 Revert "YARN-3157. Refactor the exception handling in ConverterUtils#to*Id. Contributed by Bibin A Chundatt." 
This reverts commit 95a41bf35d.
 2015-02-12 18:48:17 +09:00
Tsuyoshi Ozawa
95a41bf35d YARN-3157. Refactor the exception handling in ConverterUtils#to*Id. Contributed by Bibin A Chundatt. 2015-02-12 18:41:17 +09:00
Tsuyoshi Ozawa
b3bcbaf277 YARN-1237. Description for yarn.nodemanager.aux-services in yarn-default.xml is misleading. Contributed by Brahma Reddy Battula. 2015-02-12 15:17:51 +09:00
Steve Loughran
c3da2db48f YARN-2683. [YARN-913] registry config options: document and move to core-default. (stevel) 2015-02-11 14:26:37 +00:00
Zhijie Shen
23bf6c7207 YARN-3100. Made YARN authorization pluggable. Contributed by Jian He. 2015-02-09 20:34:56 -08:00
Wangda Tan
00a748d24a YARN-3155. Refactor the exception handling code for TimelineClientImpl's retryOn method (Li Lu via wangda) 2015-02-09 17:20:34 -08:00
Jonathan Eagles
af08425893 YARN-2971. RM uses conf instead of token service address to renew timeline delegation tokens (jeagles) 2015-02-09 17:56:05 -06: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
Jason Lowe
6f10434a5a YARN-3144. Configuration for making delegation token failures to timeline server not-fatal. Contributed by Jonathan Eagles 2015-02-06 20:55:00 +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
Xuan
b77ff37686 YARN-3149. Fix typo in message for invalid application id. Contributed 
by Bibin A Chundatt.
 2015-02-05 15:13:57 -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
Kihwal Lee
f33c99ba39 YARN-3113. Release audit warning for Sorting icons.psd. Contributed by Steve Loughran. 2015-02-02 12:58:35 -06:00
Tsuyoshi Ozawa
7acce7d364 YARN-3029. FSDownload.unpack() uses local locale for FS case conversion, may not work everywhere. Contributed by Varun Saxena. 2015-01-30 04:42:05 +09: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
fd93e5387b YARN-3028. Better syntax for replaceLabelsOnNode in RMAdmin CLI. Contributed by Rohith Sharmaks 2015-01-27 15:23:45 -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
Tsuyoshi Ozawa
5712c9f96a YARN-3078. LogCLIHelpers lacks of a blank space before string 'does not exist'. Contributed by Sam Liu. 2015-01-22 12:25:05 +09:00
Wangda Tan
f250ad1773 YARN-2731. Fixed RegisterApplicationMasterResponsePBImpl to properly invoke maybeInitBuilder. (Contributed by Carlo Curino) 2015-01-20 14:46:22 -08:00
Junping Du
f92e503800 YARN-3019. Make work-preserving-recovery the default mechanism for RM recovery. (Contributed by Jian He) 2015-01-13 18:20:57 -08:00
Robert Kanter
f451631915 YARN-2957. Create unit test to automatically compare YarnConfiguration and yarn-default.xml. (rchiang via rkanter) 2015-01-12 12:00:30 -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
Jian He
2638f4d0f0 YARN-2936. Changed YARNDelegationTokenIdentifier to set proto fields on getProto method. Contributed by Varun Saxena 2015-01-07 16:14:22 -08:00
Jian He
fe8d2bd741 YARN-2230. Fixed few configs description in yarn-default.xml. Contributed by Vijay Bhat 2015-01-07 10:57:06 -08:00
Zhijie Shen
947578c1c1 YARN-2991. Fixed DrainDispatcher to reuse the draining code path in AsyncDispatcher. Contributed by Rohith Sharmaks. 2015-01-02 11:08:47 -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
Tsuyoshi Ozawa
b256dd7600 YARN-2988. Graph#save() may leak file descriptors. (Ted Yu via ozawa) 2014-12-25 12:48:24 +09: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
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
b7f64823e1 YARN-2203. [YARN-1492] Web UI for cache manager. (Chris Trezzo via kasha) 2014-12-17 16:32:21 -08:00
Harsh J
0e37bbc8e3 YARN-2950. Change message to mandate, not suggest JS requirement on UI. Contributed by Dustin Cote. 2014-12-13 07:10:40 +05:30
Steve Loughran
3681de2039 YARN-2912 Jersey Tests failing with port in use. (varun saxena via stevel) 2014-12-12 17:11:07 +00:00
Jian He
614b6afea4 YARN-2917. Fixed potential deadlock when system.exit is called in AsyncDispatcher. Contributed by Rohith Sharmaks 2014-12-11 11:17:54 -08:00
Karthik Kambatla
78968155d7 YARN-2189. [YARN-1492] Admin service for cache manager. (Chris Trezzo via kasha) 2014-12-04 17:36:32 -08:00
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
Jian He
a7fba0bc28 YARN-2765. Added leveldb-based implementation for RMStateStore. Contributed by Jason Lowe 2014-12-01 16:38:25 -08:00
Jason Lowe
0f9528b99a YARN-2905. AggregatedLogsBlock page can infinitely loop if the aggregated log file is corrupted. Contributed by Varun Saxena 2014-12-01 22:29:05 +00:00
Zhijie Shen
8f1454cc6d YARN-2165. Added the sanity check for the numeric configuration values of the timeline service. Contributed by Vasanth kumar RJ. 2014-11-26 12:09:34 -08:00
Karthik Kambatla
fe1f2db5ee YARN-2188. [YARN-1492] Client service for cache manager. (Chris Trezzo and Sangjin Lee via kasha) 2014-11-25 16:21:46 -08:00
Jonathan Eagles
c298a9a845 YARN-2375. Allow enabling/disabling timeline server per framework. (Mit Desai via jeagles) 2014-11-20 23:34:35 -06: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
Jason Lowe
f2fe8a800e YARN-2857. ConcurrentModificationException in ContainerLogAppender. Contributed by Mohammad Kamrul Islam 2014-11-14 20:47:26 +00: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
456b973819 YARN-570. Time strings are formated in different timezone. (Akira Ajisaka and Peng Zhang via kasha) 2014-11-11 13:22:59 -08:00
Vinod Kumar Vavilapalli
0fd97f9c19 YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so as to make them work correctly. Contributed by Wangda Tan. 2014-11-11 12:33:10 -08:00
Xuan
5c9a51f140 YARN-2841. RMProxy should retry EOFException. Contributed by Jian He 2014-11-10 18:25:01 -08:00
Karthik Kambatla
b31b4bf029 Fix broken download of directories 
(cherry picked from commit 745c9a01243b8eefc72d89d1164d7d010b80983b)
 2014-11-09 19:03:49 -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
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
b76179895d YARN-2804. Fixed Timeline service to not fill the logs with JAXB bindings exceptions. Contributed by Zhijie Shen. 2014-11-04 18:00:06 -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
Vinod Kumar Vavilapalli
71fbb474f5 YARN-2798. Fixed YarnClient to populate the renewer correctly for Timeline delegation tokens. Contributed by Zhijie Shen. 2014-11-03 12:49:42 -08:00
Jason Lowe
7bc179f9f5 YARN-2707. Potential null dereference in FSDownload. Contributed by Gera Shegalov 2014-10-31 22:53:04 +00:00
Jian He
1b4be91866 YARN-2770. Added functionality to renew/cancel TimeLineDelegationToken. Contributed by Zhijie Shen 2014-10-31 13:16:45 -07:00
Karthik Kambatla
256697acd5 YARN-2186. [YARN-1492] Node Manager uploader service for cache manager. (Chris Trezzo and Sangjin Lee via kasha) 2014-10-31 13:00:42 -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
Zhijie Shen
ec63a3ffbd YARN-2747. Fixed the test failure of TestAggregatedLogFormat when native I/O is enabled. Contributed by Xuan Gong. 2014-10-28 22:43:40 -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
caecd9fffe YARN-2734. Skipped sub-folders in the local log dir when aggregating logs. Contributed by Xuan Gong. 2014-10-26 12:57:31 -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
Karthik Kambatla
c51e53d7aa YARN-2183. [YARN-1492] Cleaner service for cache manager. (Chris Trezzo and Sangjin Lee via kasha) 2014-10-25 10:31:06 -07:00
Jian He
f44cf99599 YARN-2314. Disable ContainerManagementProtocolProxy cache by default to prevent creating thousands of threads in a large cluster. Contributed by Jason Lowe 2014-10-24 23:05:16 -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
Karthik Kambatla
683897fd02 YARN-2713. "RM Home" link in NM should point to one of the RMs in an HA setup. (kasha) 2014-10-24 15:00:12 -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
Zhijie Shen
e31f0a6558 YARN-2724. Skipped uploading a local log file to HDFS if exception is raised when opening it. Contributed by Xuan Gong. 2014-10-24 11:13:44 -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
b2942762d7 YARN-2709. Made timeline client getDelegationToken API retry if ConnectException happens. Contributed by Li Lu. 2014-10-21 16:06:39 -07:00
Zhijie Shen
171f2376d2 YARN-2717. Avoided duplicate logging when container logs are not found. Contributed by Xuan Gong. 2014-10-20 22:21:37 -07:00
Zhijie Shen
e90718fa5a YARN-2582. Fixed Log CLI and Web UI for showing aggregated logs of LRS. Contributed Xuan Gong. 2014-10-20 13:38:59 -07:00
Zhijie Shen
89427419a3 YARN-2673. Made timeline client put APIs retry if ConnectException happens. Contributed by Li Lu. 2014-10-20 12:22:17 -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
Vinod Kumar Vavilapalli
39063cd36f YARN-2676. Enhanced Timeline auth-filter to support proxy users. Contributed by Zhijie Shen. 2014-10-17 22:02:50 -07:00
Vinod Kumar Vavilapalli
e9c66e8fd2 YARN-2705. Fixed bugs in ResourceManager node-label manager that were causing test-failures: added a dummy in-memory labels-manager. Contributed by Wangda Tan. 2014-10-17 18:26:12 -07:00
Vinod Kumar Vavilapalli
abae63caf9 YARN-2699. Fixed a bug in CommonNodeLabelsManager that caused tests to fail when using ephemeral ports on NodeIDs. Contributed by Wangda Tan. 2014-10-17 08:58:08 -07:00
Vinod Kumar Vavilapalli
b3056c266a YARN-2685. Fixed a bug in CommonNodeLabelsManager that caused wrong resource tracking per label when a host runs multiple node-managers. Contributed by Wangda Tan. 2014-10-15 18:47:26 -07:00