-
Notifications
You must be signed in to change notification settings - Fork 45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(mis/portal): 集群停用功能 #1266
Merged
ddadaal
merged 5 commits into
master
from
revert-1264-revert-1219-feat-suspend-cluster-by-admin
Jun 1, 2024
Merged
feat(mis/portal): 集群停用功能 #1266
ddadaal
merged 5 commits into
master
from
revert-1264-revert-1219-feat-suspend-cluster-by-admin
Jun 1, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit a12a987.
🦋 Changeset detectedLatest commit: 624ed39 The changes in this PR will be included in the next version bump. This PR includes changesets to release 18 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
|
请测试老师进行测试 @lyl-available |
ddadaal
approved these changes
May 24, 2024
pkuhpc-review-bot
bot
added
Code-Approved
Code Review approved
ReadyForMerge
Ready for merge
and removed
Code-ReviewRequested
Code Review Requested
labels
May 24, 2024
pkuhpc-review-bot
bot
added
E2E-ReviewRequested
E2E Test requested
and removed
ReadyForMerge
Ready for merge
labels
May 24, 2024
2和3主要是由于获取集群配置文件时一些类型和可选泛型定义不准确导致,已按照原获取配置文件类型一一对照进行修改 |
piccaSun
force-pushed
the
revert-1264-revert-1219-feat-suspend-cluster-by-admin
branch
from
May 31, 2024 07:41
839fd53
to
d23c9ac
Compare
lyl-available
approved these changes
May 31, 2024
pkuhpc-review-bot
bot
added
E2E-Approved
E2E Test approved
ReadyForMerge
Ready for merge
and removed
E2E-ReviewRequested
E2E Test requested
labels
May 31, 2024
OYX-1
pushed a commit
that referenced
this pull request
Jun 4, 2024
Reverts #1264 增加依赖于管理系统的数据库及grpc-api接口的集群停用功能 管理员在管理系统中进行集群停用后,集群在scow中停用 停用后集群中数据不再更新,上线后账户/作业等数据如需同步需手动同步 停用后理应在所有页面不再显示,但注意如历史作业等已经存在的数据可按原集群信息进行查询 **修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigFiles, 不再在config.js下直接读取配置 文件** **更改集群配置时不再需要重启系统只需刷新页面** ![image](https://github.com/PKUHPC/SCOW/assets/43978285/566de74d-da9c-4587-b7a0-e977881c3af6) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/d7c3c991-5b30-4152-ab7a-c55e57d323a2) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/ff19386f-41ce-4086-90c2-e621508ca1fa) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/bd062972-2371-4e11-9b9b-33f2f47d9a01) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/04e5bbe0-6229-4536-b1ae-e9465809f474) 如果正在访问的集群不存在或没有可以使用的集群 则页面报错或跳转无可用集群页面 请测试老师测试时注意集群配置读取,集群停用时和再启用后的各相关功能
OYX-1
pushed a commit
that referenced
this pull request
Jun 4, 2024
Reverts #1264 增加依赖于管理系统的数据库及grpc-api接口的集群停用功能 管理员在管理系统中进行集群停用后,集群在scow中停用 停用后集群中数据不再更新,上线后账户/作业等数据如需同步需手动同步 停用后理应在所有页面不再显示,但注意如历史作业等已经存在的数据可按原集群信息进行查询 **修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigFiles, 不再在config.js下直接读取配置 文件** **更改集群配置时不再需要重启系统只需刷新页面** ![image](https://github.com/PKUHPC/SCOW/assets/43978285/566de74d-da9c-4587-b7a0-e977881c3af6) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/d7c3c991-5b30-4152-ab7a-c55e57d323a2) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/ff19386f-41ce-4086-90c2-e621508ca1fa) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/bd062972-2371-4e11-9b9b-33f2f47d9a01) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/04e5bbe0-6229-4536-b1ae-e9465809f474) 如果正在访问的集群不存在或没有可以使用的集群 则页面报错或跳转无可用集群页面 请测试老师测试时注意集群配置读取,集群停用时和再启用后的各相关功能
OYX-1
pushed a commit
that referenced
this pull request
Jul 4, 2024
Reverts #1264 ### 做了什么 增加依赖于管理系统的数据库及grpc-api接口的集群停用功能 管理员在管理系统中进行集群停用后,集群在scow中停用 停用后集群中数据不再更新,上线后账户/作业等数据如需同步需手动同步 停用后理应在所有页面不再显示,但注意如历史作业等已经存在的数据可按原集群信息进行查询 **修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigFiles, 不再在config.js下直接读取配置 文件** **更改集群配置时不再需要重启系统只需刷新页面** ![image](https://github.com/PKUHPC/SCOW/assets/43978285/566de74d-da9c-4587-b7a0-e977881c3af6) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/d7c3c991-5b30-4152-ab7a-c55e57d323a2) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/ff19386f-41ce-4086-90c2-e621508ca1fa) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/bd062972-2371-4e11-9b9b-33f2f47d9a01) ![image](https://github.com/PKUHPC/SCOW/assets/43978285/04e5bbe0-6229-4536-b1ae-e9465809f474) 如果正在访问的集群不存在或没有可以使用的集群 则页面报错或跳转无可用集群页面 请测试老师测试时注意集群配置读取,集群停用时和再启用后的各相关功能
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #1264
做了什么
增加依赖于管理系统的数据库及grpc-api接口的集群停用功能
管理员在管理系统中进行集群停用后,集群在scow中停用
停用后集群中数据不再更新,上线后账户/作业等数据如需同步需手动同步
停用后理应在所有页面不再显示,但注意如历史作业等已经存在的数据可按原集群信息进行查询
变更web端集群信息获取方式为通过grpc api
getClusterConfigFiles
后续涉及到集群开发时可能包括以下注意事项:
1.修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigFiles, 不再在config.js下直接读取配置
文件,更改集群配置时不再需要重启系统只需刷新页面
2.对于配置了管理系统的其他系统,可以通过libs/web和libs/server的通用方法调用mis-server的grpc接口获取在线集群信息
后端通常需通过接口判断当前访问集群是否仍然在线
前端通过ClusterInfoStore获取相应的保存在上下文中的集群中的各类信息
如果正在访问的集群不存在或没有可以使用的集群
则页面报错或跳转无可用集群页面
请测试老师测试时注意集群配置读取,集群停用时和再启用后的各相关功能