Skip to content
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

Conversation

piccaSun
Copy link
Contributor

@piccaSun piccaSun commented May 24, 2024

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获取相应的保存在上下文中的集群中的各类信息

image
image
image
image
image

如果正在访问的集群不存在或没有可以使用的集群
则页面报错或跳转无可用集群页面

请测试老师测试时注意集群配置读取,集群停用时和再启用后的各相关功能

Copy link

changeset-bot bot commented May 24, 2024

🦋 Changeset detected

Latest commit: 624ed39

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 18 packages
Name Type
@scow/mis-server Minor
@scow/ai Patch
@scow/config Patch
@scow/portal-server Minor
@scow/portal-web Minor
@scow/mis-web Minor
@scow/lib-server Minor
@scow/cli Minor
@scow/lib-web Minor
@scow/docs Minor
@scow/grpc-api Minor
@scow/lib-hook Patch
@scow/lib-operation-log Patch
@scow/audit-server Patch
@scow/auth Minor
@scow/protos Patch
@scow/lib-scheduler-adapter Patch
@scow/gateway Minor

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

@piccaSun piccaSun marked this pull request as ready for review May 24, 2024 13:14
@pkuhpc-review-bot pkuhpc-review-bot bot added the Code-ReviewRequested Code Review Requested label May 24, 2024
@pkuhpc-review-bot pkuhpc-review-bot bot requested a review from ddadaal May 24, 2024 13:14
Copy link
Contributor

github-actions bot commented May 24, 2024

PR Preview Action v1.4.7
Preview removed because the pull request was closed.
2024-06-01 08:06 UTC

@piccaSun
Copy link
Contributor Author

请测试老师进行测试 @lyl-available

@pkuhpc-review-bot 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 pkuhpc-review-bot bot added E2E-ReviewRequested E2E Test requested and removed ReadyForMerge Ready for merge labels May 24, 2024
@lyl-available
Copy link
Contributor

lyl-available commented May 27, 2024

1、桌面页面无法加载
image
2、k8s集群数据转换问题
3、文件传输界面报错
image

@piccaSun
Copy link
Contributor Author

2和3主要是由于获取集群配置文件时一些类型和可选泛型定义不准确导致,已按照原获取配置文件类型一一对照进行修改
1应该是由于从桌面页面端ssr渲染时未附上鉴权相关属性,已修改并在58部署环境测试通过,请再次测试

@piccaSun piccaSun force-pushed the revert-1264-revert-1219-feat-suspend-cluster-by-admin branch from 839fd53 to d23c9ac Compare May 31, 2024 07:41
@pkuhpc-review-bot 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
@ddadaal ddadaal merged commit b8d1270 into master Jun 1, 2024
11 checks passed
@ddadaal ddadaal deleted the revert-1264-revert-1219-feat-suspend-cluster-by-admin branch June 1, 2024 08:04
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
Code-Approved Code Review approved E2E-Approved E2E Test approved ReadyForMerge Ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants