Commit Graph

579 Commits

Author SHA1 Message Date
qiwang fa1390fed2 fix: add ai Random RandomStrategy
Former-commit-id: 6293f4eeb0e6f7f60b9f75522cdf19c7fb332643
2024-05-20 20:43:55 +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
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
qiwang b2eb0a6156 fix: update ai Replicas
Former-commit-id: f08e733c5be93758e45a19808851d12569a4f2d3
2024-05-16 15:49:53 +08:00
tzwang c8d0f54f5c fix aitasklist bugs
Former-commit-id: b955cc404935f0e733b2eb5904ce4654d347d088
2024-05-16 11:20:26 +08:00
tzwang 9764c139bb updated resourcetype
Former-commit-id: 349f96c869214b144c03b86d840adfbfb4ed4e96
2024-05-15 18:31:36 +08:00
tzwang a336b737f0 updated scheduleResult
Former-commit-id: 5158fe0420e1921b63fce8b21c6477341801d243
2024-05-15 18:29:20 +08:00
tzwang 95b2258e2c updated types
Former-commit-id: 4e459de0331e4ea2587aafcd2cd93d94b94ecfd7
2024-05-15 17:41:57 +08:00
tzwang 3f9e814e88 added jobid to scheduleResult api
Former-commit-id: 3a2e77a99adb0cfca2e80183ba0cce7264311f2d
2024-05-15 17:34:02 +08:00
tzwang 120dbecc1d updated aioption protobuf
Former-commit-id: 1e23b5326cb6c616c8d20fa64b789ef68fbafcbf
2024-05-15 16:57:40 +08:00
tzwang a64dc47c9c updated aioption api
Former-commit-id: 4f975cb2660461eb2ed1dd5937d4e0ed02ce9cef
2024-05-15 16:48:43 +08:00
tzwang cda53ae916 updated scheduleResult
Former-commit-id: 38db46a22a099b0e54dd59168860503774f144a3
2024-05-15 16:13:00 +08:00
qiwang a2342261f5 Merge pull request 'create vm task' (#175) from master-wq into master
Former-commit-id: 495d29591d470a244a2eaa4c8e47b2dc575c0137
2024-05-15 15:52:03 +08:00
qiwang e4df9839ad Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: b92e02d0b7afafc67ff0d73c565208e4d6607fec
2024-05-15 15:47:48 +08:00
qiwang 2a478ef3ab fix: create vm task
Former-commit-id: 0686e64ffc1a5889d37e33059b725a3fa5ba5539
2024-05-15 15:47:01 +08:00
tzwang 9b518d0182 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: b8f86f8afbca80fac35424a62b8ca72f7aad047d
2024-05-14 17:48:13 +08:00
tzwang 3b5295a08e fix aitask status bugs
Former-commit-id: 4f8466962405557bd85d51573dd79d86984cafce
2024-05-14 17:46:00 +08:00
Jake 896aa2c5ab fix
Former-commit-id: a9e47ada3f20619fd1df0eadbb59822901a87b8f
2024-05-14 17:36:37 +08:00
tzwang fcd12bbe61 Merge pull request 'fix db bugs' (#172) from tzwang/pcm-coordinator:master into master
Former-commit-id: 91e8e0532cbd60ec7a5ea4b7419515a49fe0aaf4
2024-05-14 15:07:48 +08:00
tzwang bd3f60d62e fix db bugs
Former-commit-id: 3e372dc02fb4f2a4e4f9ab14922abaa51dbc7eea
2024-05-14 15:03:31 +08:00
Jake 7d067b0082 merge conflict
Former-commit-id: b6a6a7c963182194e03b9673f5b2e47fe47952f4
2024-05-14 10:43:58 +08:00
Jake 6304fee876 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
# Conflicts:
#	api/internal/logic/hpc/commithpctasklogic.go


Former-commit-id: b2c609dfe260b2149c6f50e38140561f88a1e619
2024-05-14 10:41:23 +08:00
Jake 374bb1a5ad change log level
Former-commit-id: f8155160b352fb6602fd34ca8efff37659ceab65
2024-05-14 10:40:06 +08:00
tzwang dd1142245c fix task list bugs
Former-commit-id: c71b8802cd2d99a628175171ca2149e5a870c137
2024-05-14 08:46:47 +08:00
tzwang 520cfc00d9 updated aitask apis
Former-commit-id: 3b5a3d75f23fc82c31f3ab84866c5ebc64ff5b36
2024-05-13 15:22:21 +08:00
tzwang e2fc3b8b87 fix task time bugs
Former-commit-id: ee55e0cc23f74218579a00960f599b60da5cdb04
2024-05-13 11:34:45 +08:00
qiwang a48a44a05a fix: create vm task
Former-commit-id: 62cd00915314b280231809d0b6d7b7cffc1966ee
2024-05-13 10:32:15 +08:00
tzwang 99985ec130 updated octopus cardname
Former-commit-id: a62d3350bd21690be3f75a11bfed6518fc23b0a8
2024-05-12 22:50:48 +08:00
tzwang e12f80725e fix log bugs
Former-commit-id: 92a183cafaea2973d5d0fe5c868537c9cd69e4b2
2024-05-11 19:25:33 +08:00
tzwang 8ccb51cab0 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: e31d516e8d87623c8471fb45c383834cb6ad21b3
2024-05-11 18:40:26 +08:00
tzwang c4d4e74d33 fix status bugs
Former-commit-id: 547178d1d6f7af5c8b0745ad04885402a1da68b0
2024-05-11 18:40:06 +08:00
zhangwei c14b67d312 delete alertrule
Former-commit-id: dcff95ad60288cbcb62998aa849909fdbd543a8c
2024-05-11 18:28:07 +08:00