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.

Sign up for GitHub

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

Jump to bottom

feat(mis/portal): 集群停用功能 #1219

Merged
merged 28 commits into from
May 24, 2024
Merged

feat(mis/portal): 集群停用功能 #1219

merged 28 commits into from
May 24, 2024

Conversation

piccaSun
Copy link
Contributor

@piccaSun piccaSun commented Apr 22, 2024 •
edited
Loading

做了什么

增加依赖于管理系统的数据库及grpc-api接口的集群停用功能
管理员在管理系统中进行集群停用后，集群在scow中停用
停用后集群中数据不再更新，上线后账户/作业等数据如需同步需手动同步

修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigsInfo, 不再在config.js下直接读取配置文件

image
image
image
image
image

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

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Apr 22, 2024 •
edited
Loading

🦋 Changeset detected

Latest commit: a98768f

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 22, 2024 •
edited
Loading

PR Preview Action v1.4.7
Preview removed because the pull request was closed.
2024-05-24 12:41 UTC

@piccaSun piccaSun changed the title feat(mis/portal): 集群停用 feat(mis/portal): 集群停用功能 Apr 26, 2024
ddadaal
ddadaal requested changes Apr 27, 2024
View reviewed changes
apps/mis-server/src/entities/Cluster.ts Outdated Show resolved Hide resolved
apps/mis-server/src/bl/common.ts Outdated Show resolved Hide resolved
apps/mis-server/src/services/misConfig.ts Outdated Show resolved Hide resolved
apps/mis-server/src/utils/cluster.ts Outdated Show resolved Hide resolved
apps/mis-server/src/utils/createUser.ts Outdated Show resolved Hide resolved
apps/mis-server/src/entities/Cluster.ts Outdated Show resolved Hide resolved
apps/mis-server/src/plugins/clusters.ts Outdated Show resolved Hide resolved
@piccaSun piccaSun force-pushed the feat-suspend-cluster-by-admin branch from a09515b to 0f2d2f8 Compare May 8, 2024 02:21
@piccaSun piccaSun marked this pull request as ready for review May 8, 2024 14:51
@piccaSun piccaSun requested a review from ddadaal May 8, 2024 14:51
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ReviewRequested Code Review Requested and removed Code-ChangeRequested labels May 8, 2024
ddadaal
ddadaal requested changes May 9, 2024
View reviewed changes
Copy link
Member

@ddadaal ddadaal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以让测试来测试一下

apps/mis-server/src/entities/Cluster.ts Outdated Show resolved Hide resolved
apps/portal-web/src/components/errorPages/CLusterNotAvailablePage.tsx Outdated Show resolved Hide resolved
apps/portal-web/src/stores/CurrentClustersStore.ts Outdated Show resolved Hide resolved
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ReviewRequested Code Review Requested and removed Code-ChangeRequested labels May 13, 2024
ddadaal
ddadaal requested changes May 13, 2024
View reviewed changes
Copy link
Member

@ddadaal ddadaal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

功能不着急，研究一下进一步的改动

protos/server/config.proto Outdated Show resolved Hide resolved
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ChangeRequested and removed Code-ReviewRequested Code Review Requested labels May 13, 2024
@piccaSun piccaSun requested a review from ddadaal May 23, 2024 11:28
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ReviewRequested Code Review Requested and removed Code-ChangeRequested labels May 23, 2024
ddadaal
ddadaal requested changes May 23, 2024
View reviewed changes
protos/common/config.proto Outdated Show resolved Hide resolved
protos/common/config.proto Outdated Show resolved Hide resolved
protos/server/config.proto Outdated Show resolved Hide resolved
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ChangeRequested and removed Code-ReviewRequested Code Review Requested labels May 23, 2024
@piccaSun piccaSun requested a review from ddadaal May 24, 2024 03:30
@pkuhpc-review-bot pkuhpc-review-bot bot added Code-ReviewRequested Code Review Requested and removed Code-ChangeRequested labels May 24, 2024
@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
@ddadaal ddadaal merged commit e7c41de into master May 24, 2024
10 checks passed
@ddadaal ddadaal deleted the feat-suspend-cluster-by-admin branch May 24, 2024 12:39
ddadaal added a commit that referenced this pull request May 24, 2024
@ddadaal
Revert "feat(mis/portal): 集群停用功能 (#1219)"
d6314bc 
This reverts commit e7c41de.
@ddadaal ddadaal mentioned this pull request May 24, 2024
Merged
ddadaal added a commit that referenced this pull request May 24, 2024
@ddadaal
Revert "feat(mis/portal): 集群停用功能" (#1264)
a12a987 
Reverts #1219
/
OYX-1 pushed a commit that referenced this pull request Jul 4, 2024
@piccaSun @OYX-1
feat(mis/portal): 集群停用功能 (#1219)
1ffbad1 
### 做了什么
增加依赖于管理系统的数据库及grpc-api接口的集群停用功能
管理员在管理系统中进行集群停用后，集群在scow中停用
停用后集群中数据不再更新，上线后账户/作业等数据如需同步需手动同步

**修改mis-web/portal-web下获取集群配置信息的方法为使用grpc api getClusterConfigsInfo,
不再在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
@ddadaal @OYX-1
Revert "feat(mis/portal): 集群停用功能" (#1264)
5eed030 
Reverts #1219
/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ddadaal ddadaal ddadaal approved these changes

Assignees
No one assigned
Labels
Code-Approved Code Review approved ReadyForMerge Ready for merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@piccaSun @ddadaal