Commit Graph

1008 Commits

Author SHA1 Message Date
Yan Li 397dbfaffe set priority in add_task 2018-11-10 20:31:03 +08:00
GallenShao 085efb0537
Merge pull request #350 from GallenShao/batch
add gpu support
2018-11-09 21:48:20 +08:00
zhong yehong 613c5cee4a
Merge pull request #349 from zhongyehong/master
support user to report a bug in dashboard
2018-11-09 19:02:00 +08:00
zhongyehong 0c71df4804 Merge remote-tracking branch 'upstream/master' 2018-11-09 19:00:48 +08:00
zhongyehong f84661bb69 support user to report a bug in dashboard 2018-11-09 18:58:46 +08:00
Gallen 6f937eb6b3 thread lock bug fixed & add priority 2018-11-01 17:06:46 +08:00
Gallen cb7f476ec6 support gpu 2018-11-01 15:43:35 +08:00
Gallen 39831e9fb9 add thread lock to task_queue & add gpu info fetcher to monitor 2018-11-01 15:31:44 +08:00
Yujian Zhu a4ff878c3e
Merge pull request #348 from FirmlyReality/batch
Can stop tasks on taskcontroller
2018-10-29 01:18:07 +08:00
zhuyj17 d4eb7a7711 Can stop task on taskcontroller 2018-10-29 01:17:13 +08:00
Yujian Zhu 16f7f6b547
Merge pull request #347 from FirmlyReality/batch
Show monitoring information of batch containers on status page
2018-10-22 01:50:27 +08:00
zhuyj17 a5db73bbb5 replace NAN when monitor batch containers. 2018-10-22 01:48:19 +08:00
zhuyj17 e539e2da17 Fix some bugs 2018-10-22 01:24:26 +08:00
zhuyj17 ba0a0034ee Merge branch 'master' of https://github.com/unias/docklet into batch 2018-10-22 00:48:36 +08:00
Yujian Zhu 62d2c6bbbc
Merge pull request #346 from FirmlyReality/master
update status.html that use container name to tag the data
2018-10-22 00:48:21 +08:00
zhuyj17 949b77c9b8 update status.html 2018-10-22 00:47:06 +08:00
zhuyj17 cfeab99ae1 Add new api to get all batch containers of a user 2018-10-22 00:39:33 +08:00
zhong yehong 8865e205d1
Merge pull request #345 from zhongyehong/batch
divide worker into two kinds
2018-10-21 20:28:42 +08:00
zhongyehong d80e49816b divide worker into two kinds 2018-10-21 20:21:54 +08:00
zhong yehong b4d72a809b
Merge pull request #344 from zhongyehong/master
release lock when exception occur
2018-10-21 14:57:08 +08:00
zhongyehong e765225d62 release lock when exception occur 2018-10-21 14:00:50 +08:00
zhongyehong 6d29858905 release lock when exception occur 2018-10-20 21:33:55 +08:00
Yujian Zhu 941c70d4b3
Merge pull request #342 from FirmlyReality/batch
Update container collector to monitor container from batch job.
2018-10-14 22:49:28 +08:00
zhuyj17 ae95101e90 Merge branch 'master' of https://github.com/unias/docklet into batch 2018-10-14 22:48:17 +08:00
Yujian Zhu d190b90766
Merge pull request #341 from FirmlyReality/master
Aggregate api of monitor at the backend
2018-10-14 22:47:59 +08:00
zhuyj17 6a3e1eace7 Aggregate http request on status realtime pages for monitor information 2018-10-14 22:45:24 +08:00
zhuyj17 c1ba31a4b6 Aggregate api of monitor at the backend 2018-10-14 21:34:46 +08:00
zhuyj17 1a866b9c8b Update container collector to monitor container from batch job. 2018-10-14 20:38:50 +08:00
Yujian Zhu 0281f1d0b5
Merge pull request #340 from FirmlyReality/batch
Use oss mounter and update mountpoint
2018-10-09 10:45:11 +08:00
zhuyj17 42749d4a8e Mount on '/opt/docklet/global/users/oss' 2018-10-09 10:43:43 +08:00
zhuyj17 528d64f521 Update oss mounter and rpc 2018-10-08 09:52:48 +08:00
zhuyj17 e06464758d Add ossmounter 2018-10-08 09:08:58 +08:00
Yujian Zhu aaafa7be1a
Merge pull request #339 from FirmlyReality/batch
Aliyun oss can be mounted to the container when using batch job computing.
2018-09-26 00:32:52 +08:00
Firmlyzhu 4d81254f04 Enable that Mount aliyun oss when using batch job computing. 2018-09-24 16:39:08 +08:00
zhuyj17 4912526dac Merge branch 'batch' of https://github.com/FirmlyReality/docklet into batch 2018-09-23 23:20:04 +08:00
zhuyj17 371ec5e535 Merge branch 'master' of https://github.com/unias/docklet into batch 2018-09-23 23:17:37 +08:00
Yujian Zhu 6651b064ff
Merge pull request #338 from FirmlyReality/batch
Update Batch from master
2018-09-23 12:47:32 +08:00
Firmlyzhu a10b9393f6 Merge branch 'master' of https://github.com/unias/docklet into batch 2018-09-23 12:45:14 +08:00
Yujian Zhu 69059c3fff
Merge pull request #337 from FirmlyReality/login_info
further update
2018-09-20 00:24:49 +08:00
zhuyj17 f5e960a80a further update 2018-09-20 00:23:43 +08:00
Yujian Zhu b07eb75a62
Merge pull request #336 from FirmlyReality/login_info
Prevent users that is not activated from applying for beans
2018-09-20 00:19:57 +08:00
zhuyj17 4ddab4fa4b Check if user is activated before applying for beans 2018-09-20 00:16:53 +08:00
zhuyj17 7497e58bdc Fix a bug of not import urlencode 2018-09-19 22:57:16 +08:00
Yujian Zhu cba223104c
Merge pull request #335 from FirmlyReality/login_info
Login info
2018-09-16 23:22:31 +08:00
Firmlyzhu 7e470463b1 add login info into db 2018-09-16 16:18:06 +08:00
Firmlyzhu 987077e7d7 Add information of login to user log 2018-09-16 15:52:15 +08:00
Firmlyzhu 46ea09828d fix a bug that net stats can't be shown 2018-09-16 14:56:27 +08:00
GallenShao 62fd6463c2
Merge pull request #334 from GallenShao/batch
[taskmgr] fix a avaliable memory calc bug
2018-08-10 14:42:31 +08:00
Gallen 6bc2a06705 [taskmgr] fix a avaliable memory calc bug 2018-08-10 13:40:58 +08:00
Yan Li a77e6a8d38
Merge pull request #333 from iteratorlee/dev_batch
update front end
2018-08-10 13:11:17 +09:00