Commit Graph

629 Commits

Author SHA1 Message Date
jagger 2f45fef202 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 7ea30faf0152e15a9058fd8da894e5b6d993eb8d
2024-06-06 20:59:58 +08:00
tzwang ccbf2a00f1 fix clusterResouces bugs
Former-commit-id: 52c5b84d8957dd7f2529ce3dd5416ee7ffd9b07d
2024-06-06 19:08:51 +08:00
tzwang 8ffc0106d7 fix clusterResouces bugs
Former-commit-id: c977dc87486fd72df375a92d71c185fac668cb2c
2024-06-06 17:10:06 +08:00
qiwang 5db1db5bea Merge pull request 'update vminfo 060601' (#214) from master-wq into master
Former-commit-id: 5c1c0d40d899aca9eb06b0d08a570656b8a629cc
2024-06-06 12:28:10 +08:00
qiwang c2a3b77aff fix: update vmInfo 060601
Former-commit-id: 8d2c4ce27e51ef178a07f6361d5bb7ecb2e0837b
2024-06-06 12:24:11 +08:00
tzwang b61e434f75 added cron updateClusterResources
Former-commit-id: f38bd68df8012cb81ba9866a0c8b0310511c2427
2024-06-06 10:53:48 +08:00
qiwang 04f0eae608 Merge pull request 'update vminfo 0606' (#212) from master-wq into master
Former-commit-id: b0960aa18e7cc2fdf05762733d86806ab7b1038c
2024-06-06 10:51:13 +08:00
qiwang a1d6951493 fix: update vmInfo 0606
Former-commit-id: 98a2d9812255789f94ed2c859f7b486e3934a6e5
2024-06-06 10:47:28 +08:00
qiwang bf0ae0877d Merge pull request 'update vminfo 0606' (#211) from master-wq into master
Former-commit-id: 1299105095f70f4a210fa8288f59dcb5d88495b7
2024-06-06 10:37:46 +08:00
qiwang db9fe273d8 fix: update vmInfo 0606
Former-commit-id: a1711e74b84d91e661c7e6d4257f8967c17cf573
2024-06-06 10:30:48 +08:00
devad 8de946e139 Merge pull request 'fix bug' (#209) from devad/pcm-coordinator:master into master
Former-commit-id: c354ec6d0aab9ee47275353734258214fbe10fa5
2024-06-05 18:36:37 +08:00
tzwang da4c0e4717 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: f4d1ca4412d8250a8d4c5ac528707edbb5e4adb8
2024-06-05 18:29:53 +08:00
tzwang cdcbc84372 added cron updateadapters
Former-commit-id: 00c5b593ca264313e9848ff214bed1bf350dfff5
2024-06-05 18:29:30 +08:00
jagger 255643d246 Merge remote-tracking branch 'upstream/master' into upstream
Former-commit-id: b6ced17038c09bc2700532036b2927d658cb3ec8
2024-06-05 17:57:27 +08:00
jagger ba84c312a3 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: ac8e28da5b7851f03b2fe1207fcbc83f0eee255e
2024-06-05 17:56:59 +08:00
qiwang f66138afa0 Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: e150842727f39e6ad9eb4b83db0197c97af108ea
2024-06-05 17:25:22 +08:00
qiwang c227103dbd fix: update vmInfo
Former-commit-id: 2bfc197d20297aac19e32ae1d3fa71e4647eedcc
2024-06-05 17:25:03 +08:00
jagger e29002b4d6 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: a6d78147813b92708df308d1c24f717af41168bd
2024-06-04 17:36:24 +08:00
jagger d8e8370e5b fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 53039ebcdb46e353f2dcec112389cad7c3b91432
2024-06-04 15:23:16 +08:00
jagger 321a054df2 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: afd3e450e10a2fc1d7779633540d4f1bf8b8478f
2024-05-31 17:09:00 +08:00
qiwang 641a762620 fix: update vmInfo
Former-commit-id: fbc9276038394ddf3c0bfb27a216eaa2f96c6abe
2024-05-26 17:25:56 +08:00
qiwang 5738c04525 Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: 6c5ab94b5e5bb2eb9e4bb271563caf0d1ab963fc
2024-05-24 16:40:11 +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