Commit Graph

608 Commits

Author SHA1 Message Date
qiwang 79620eacdb Merge pull request 'update vmInfo' (#203) from master-wq into master
Former-commit-id: 7331583d196c3f36280c4c2a55ea6bfe179595e8
2024-05-24 16:45:16 +08:00
qiwang f73f2e8456 fix: update vmInfo
Former-commit-id: c3bce348108e72183076232fec484a798c0543da
2024-05-24 16:35:22 +08:00
qiwang c3a6190fa1 Merge pull request 'update vmInfo' (#202) from master-wq into master
Former-commit-id: cf388c3e00931a8871a3691e9d330fcc54cbef48
2024-05-23 16:10:53 +08:00
qiwang 68c4469969 fix: update vmInfo
Former-commit-id: 99cbee2f2c7c00e628cf97c9f4622c8c1bbea29a
2024-05-23 16:05:08 +08:00
jagger 55cece2e7d fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 35f7cdd6445c7509399141af92dd8bb49a58413e
2024-05-22 11:57:49 +08:00
tzwang 7fcfcfe7ac Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 28da880d850ec7649bbde5638b02629299561a86
2024-05-22 11:52:05 +08:00
tzwang 296901c592 fix LOG bugs
Former-commit-id: 15e2a7f765b3fb6a54f024ef0af127c7503693f4
2024-05-22 11:51:46 +08:00
tzwang 75086c1d7e Merge pull request 'fix tasklog bugs' (#200) from tzwang/pcm-coordinator:master into master
Former-commit-id: f613c07c155d8febd22d117305a28f4ead3c6dc9
2024-05-22 10:12:53 +08:00
tzwang 705afead2b fix LOG bugs
Former-commit-id: 71434c3bafcfa2653462acb43ed63e0dcb6a2ddf
2024-05-22 10:08:31 +08:00
jagger 10456d0e57 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 7bdaf82a118554802ec5dad98f04a4267bd8d2a2
2024-05-22 10:01:57 +08:00
qiwang bbccccb408 Merge remote-tracking branch 'origin/master' into master-wq
# Conflicts:
#	api/internal/scheduler/schedulers/aiScheduler.go


Former-commit-id: 4a5c08df6633b6956fe99b9b2745afc383f3c15c
2024-05-21 19:00:18 +08:00
qiwang ed059e3863 Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: f59ee459bf0670a2176c1f6a13f0b6737fb2012c
2024-05-21 18:56:46 +08:00
qiwang 7e8670492f fix: add ai Random RandomStrategy
Former-commit-id: 005e2279af52f6e00335612e5677d426df41ea9a
2024-05-21 18:56:18 +08:00
jagger c8a3734d74 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: f8d094ff122700a414fa4dbca9ec484985192779
2024-05-21 18:43:41 +08:00
tzwang 8037550224 fix taskresult bugs
Former-commit-id: b906f3f0a67dc9c845c46ca1002f69343ca1c3cb
2024-05-21 16:31:12 +08:00
tzwang ba26039043 fix tasklist bugs
Former-commit-id: a37be139ca44f8eb0fb8a6a32420f14b324615fc
2024-05-21 15:11:54 +08:00
tzwang de5d7ec1f1 fix strategy bugs
Former-commit-id: 1a10655de7ace36f0888008c23b50edb9d89af7c
2024-05-21 11:00:29 +08:00
tzwang d4db154bc7 fix tasklist time bugs
Former-commit-id: f86a6d74faf21d9ecd248512dfe5316e50ac6fcf
2024-05-21 10:50:13 +08:00
tzwang 477df1fb00 fix tasklist bugs
Former-commit-id: 689adf62b5cd055f339458d268fc1d012e72b87e
2024-05-21 10:18:50 +08:00
jagger 375de5c4b2 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: bf0f7835384dbd6813fff0006c218209818a7379
2024-05-21 09:22:37 +08:00
tzwang 6a3d79c82d Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 98a7d3a544ba31c4376a5cb29a24c666d8734b4f
2024-05-21 08:58:16 +08:00
tzwang 9d5e75b0c2 fix tasklist bugs
Former-commit-id: 06cd3c9adac9c7c1ad07dd8cc6ae24e47f0a1835
2024-05-21 08:57:10 +08:00
jagger 1a2e4b031a fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: b2946b0f6946b3c587f6b1f3ced3068cc005459c
2024-05-20 21:13:06 +08:00
qiwang 1d4709f66b Merge pull request 'add RandomStrategy' (#192) from master-wq into master
Former-commit-id: e475d2c4e71d36e2c8ed7fed56b7898c032e0422
2024-05-20 20:54:42 +08:00
qiwang fa1390fed2 fix: add ai Random RandomStrategy
Former-commit-id: 6293f4eeb0e6f7f60b9f75522cdf19c7fb332643
2024-05-20 20:43:55 +08:00
tzwang bc8d65af40 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 51daa59a9496c33698931f90bd64e55c9ef94687
2024-05-20 20:34:25 +08:00
tzwang 00d56e62dc fix tasklist bugs
Former-commit-id: 64b3cd1678e9cf7435e8308ba4096409c9de1812
2024-05-20 20:30:15 +08:00
qiwang af7b932962 NewRandomStrategy
Former-commit-id: 6d0df33c37d7e5a58d46a41d4e3ce78bf2860a62
2024-05-20 20:29:28 +08:00
qiwang 122075a3cb Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: 75a3fba2c4b7e27305cc8438c8fc466d374610de
2024-05-20 20:19:23 +08:00
qiwang d4e18c8796 fix: add ai Random RandomStrategy
Former-commit-id: bde21281fe09457b3353852e75776df92209a155
2024-05-20 20:18:37 +08:00
jagger 61f7363302 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: adc07bd843d2938c09d0932a8fe9cf1031a30005
2024-05-20 19:58:33 +08:00
tzwang 6b6aa42d01 fix aicenter bugs
Former-commit-id: d9185bf8675a7e4e3cfb470d1dd7b54dd15a2cf9
2024-05-20 19:10:43 +08:00
tzwang 766c862af7 added getclusterbalance api
Former-commit-id: 856cdfb1b2c380bf848782bbf85275f34e925cfd
2024-05-20 16:48:09 +08:00
tzwang ff117751b0 updated types
Former-commit-id: 898388856c31253f46aca54df8b6d72b5d15333a
2024-05-20 16:19:06 +08:00
tzwang 130b116b52 added get balance api
Former-commit-id: 2c8df408652a3e2bede8652ff11e9460ba8fc7e0
2024-05-20 15:46:49 +08:00
tzwang 79db3cd444 fix task time bugs
Former-commit-id: ea14c8fc26cce49b1151d9d2cec9500c54f3242e
2024-05-20 11:06:19 +08:00
tzwang 6c724b4ab9 fix task updatedtime bugs
Former-commit-id: 226201747e9a5aabd47cb93a57d66448df3248b5
2024-05-19 22:52:41 +08:00
devad a977f63f63 fix
Former-commit-id: 443ebf0046a411542e28d142c4784a4be8a827ae
2024-05-17 21:09:44 +08:00
tzwang ce0d5a9b32 fix db bugs
Former-commit-id: 55a997bc7669f4b207da153a3fdd1cb3b1b2935d
2024-05-17 19:43:25 +08:00
tzwang f42a48b27f fix submit bugs
Former-commit-id: 249398644e9177b761dc6d47c1a2c795effd29af
2024-05-17 17:38:48 +08:00
qiwang 96ab6a81a6 fix: update ai Replicas
Former-commit-id: e4f63e15056835d0f9b34b39b7b527db387e216d
2024-05-17 17:35:48 +08:00
tzwang 258258b04f fix submit bugs
Former-commit-id: b3b4da6986f71dfee5fdb682866aabd43b830a37
2024-05-17 17:21:31 +08:00
jagger 974fcf0590 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: a8b52619ad241f5c4069b2805b87c752303289b4
2024-05-17 16:53:22 +08:00
tzwang 02f991ec1a Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: e9d012131ae17679b7d4fcb461609f1c0a141003
2024-05-16 18:18:21 +08:00
tzwang f8a4656d83 fix aischeduler bugs
Former-commit-id: 4df953f2a614800510376210d69f82a646cae02f
2024-05-16 18:17:57 +08:00
jagger 70a8f48058 fix
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 7898052cec2ba197689bca016811a5f98220f3c4
2024-05-16 17:50:51 +08:00
tzwang fffc3b9718 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 8deb2ba33ca4c8f8a553679600217eaf137b04ee
2024-05-16 16:54:57 +08:00
tzwang 62ecd4e2e4 fix aischeduler bugs
Former-commit-id: 887857a40bd3492ac3a412902893cb3990048677
2024-05-16 16:49:50 +08:00
zhangwei 3825703ede modify path
Former-commit-id: e65fecbe3d93ddbc8787e23a2fea7f83fd3b2ea5
2024-05-16 16:46:02 +08:00
qiwang 961ec2d790 Merge remote-tracking branch 'origin/master' into master-wq
# Conflicts:
#	api/internal/logic/schedule/schedulesubmitlogic.go
#	api/internal/scheduler/database/aiStorage.go


Former-commit-id: dd876d4244717e948b9ec8cef12e5c243fa982cc
2024-05-16 15:58:34 +08:00