Skip to content

[Manual Sync Required] Add delete node action for admin #1226

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

Open
csg-pr-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Manual Sync Required] Add delete node action for admin #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions _mocks/opencsg.com/csghub-server/builder/store/database/mock_ClusterInfoStore.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions _mocks/opencsg.com/csghub-server/component/mock_ClusterComponent.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions builder/store/database/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type ClusterInfoStore interface {
UpdateClusterNodeByNode(ctx context.Context, node ClusterNode) error
AddNodeOwnership(ctx context.Context, ownership ClusterNodeOwnership) error
DeleteNodeOwnership(ctx context.Context, clusterNodeID int64) error
DeleteClusterNodeByID(ctx context.Context, id int64) error
GetNodeOwnership(ctx context.Context, clusterNodeID int64) (*ClusterNodeOwnership, error)
GetNodeOwnershipByNameSpace(ctx context.Context, nameSpace string) ([]ClusterNodeOwnership, error)
UpdateNodeOwnership(ctx context.Context, ownership ClusterNodeOwnership) error
Expand Down Expand Up @@ -507,6 +508,47 @@ func (s *clusterInfoStoreImpl) DeleteNodeOwnership(ctx context.Context, clusterN
_, err := s.db.Operator.Core.NewDelete().Model(&ClusterNodeOwnership{}).Where("cluster_node_id = ?", clusterNodeID).Exec(ctx)
return errorx.HandleDBError(err, nil)
}
func (s *clusterInfoStoreImpl) DeleteClusterNodeByID(ctx context.Context, id int64) error {
err := s.db.Operator.Core.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
var node ClusterNode
err := tx.NewSelect().Model(&node).Where("id = ?", id).Scan(ctx)
if err != nil {
return err
}
clusterID := node.ClusterID
_, err = tx.NewDelete().Model(&ClusterNodeOwnership{}).Where("cluster_node_id = ?", id).Exec(ctx)
if err != nil {
return err
}

_, err = tx.NewDelete().Model(&ClusterNode{}).Where("id = ?", id).Exec(ctx)
if err != nil {
return err
}

count, err := tx.NewSelect().Model(&ClusterNode{}).Where("cluster_id = ?", clusterID).Count(ctx)
if err != nil {
return err
}
if count < 1 {
_, err = tx.NewDelete().Model(&ClusterInfo{}).Where("cluster_id = ?", clusterID).Exec(ctx)
if err != nil {
return err
}
_, err = tx.NewDelete().Model(&SpaceResource{}).Where("cluster_id = ?", clusterID).Exec(ctx)
if err != nil {
return err
}
}

return nil
})

if err != nil {
return errorx.HandleDBError(err, nil)
}
return nil
}

func (s *clusterInfoStoreImpl) GetNodeOwnership(ctx context.Context, clusterNodeID int64) (*ClusterNodeOwnership, error) {
var ownership ClusterNodeOwnership
Expand Down
135 changes: 135 additions & 0 deletions builder/store/database/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,3 +624,138 @@ func TestClusterStore_ClusterNodeOperations(t *testing.T) {
require.NoError(t, err)
require.Nil(t, deletedOwnership)
}

func TestClusterStore_DeleteClusterNodeByID_NotLastNode(t *testing.T) {
db := tests.InitTestDB()
defer db.Close()
ctx := context.TODO()

store := database.NewClusterInfoStoreWithDB(db)

cluster, err := store.Add(ctx, "config-delete-not-last", "region-1", types.ConnectModeKubeConfig)
require.NoError(t, err)

node1 := &database.ClusterNode{
ClusterID: cluster.ClusterID,
Name: "node-1",
Status: "Ready",
}
_, err = db.Core.NewInsert().Model(node1).Exec(ctx)
require.NoError(t, err)

node2 := &database.ClusterNode{
ClusterID: cluster.ClusterID,
Name: "node-2",
Status: "Ready",
}
_, err = db.Core.NewInsert().Model(node2).Exec(ctx)
require.NoError(t, err)

ownership := database.ClusterNodeOwnership{
ClusterNodeID: node1.ID,
ClusterID: cluster.ClusterID,
Namespace: "ns-1",
}
err = store.AddNodeOwnership(ctx, ownership)
require.NoError(t, err)

sr := &database.SpaceResource{
Name: "resource-1",
Resources: "{}",
ClusterID: cluster.ClusterID,
}
_, err = db.Core.NewInsert().Model(sr).Exec(ctx)
require.NoError(t, err)

err = store.DeleteClusterNodeByID(ctx, node1.ID)
require.NoError(t, err)

_, err = store.GetClusterNodeByID(ctx, node1.ID)
require.Error(t, err)

fetchedOwnership, err := store.GetNodeOwnership(ctx, node1.ID)
require.NoError(t, err)
require.Nil(t, fetchedOwnership)

nodes, err := store.FindNodeByClusterID(ctx, cluster.ClusterID)
require.NoError(t, err)
require.Len(t, nodes, 1)
require.Equal(t, node2.ID, nodes[0].ID)

existingCluster, err := store.ByClusterID(ctx, cluster.ClusterID)
require.NoError(t, err)
require.Equal(t, cluster.ClusterID, existingCluster.ClusterID)

var remainingSR []database.SpaceResource
err = db.Core.NewSelect().Model(&remainingSR).Where("cluster_id = ?", cluster.ClusterID).Scan(ctx)
require.NoError(t, err)
require.Len(t, remainingSR, 1)
}

func TestClusterStore_DeleteClusterNodeByID_LastNode(t *testing.T) {
db := tests.InitTestDB()
defer db.Close()
ctx := context.TODO()

store := database.NewClusterInfoStoreWithDB(db)

cluster, err := store.Add(ctx, "config-delete-last", "region-1", types.ConnectModeKubeConfig)
require.NoError(t, err)

node := &database.ClusterNode{
ClusterID: cluster.ClusterID,
Name: "node-only",
Status: "Ready",
}
_, err = db.Core.NewInsert().Model(node).Exec(ctx)
require.NoError(t, err)

ownership := database.ClusterNodeOwnership{
ClusterNodeID: node.ID,
ClusterID: cluster.ClusterID,
Namespace: "ns-1",
}
err = store.AddNodeOwnership(ctx, ownership)
require.NoError(t, err)

sr := &database.SpaceResource{
Name: "resource-1",
Resources: "{}",
ClusterID: cluster.ClusterID,
}
_, err = db.Core.NewInsert().Model(sr).Exec(ctx)
require.NoError(t, err)

err = store.DeleteClusterNodeByID(ctx, node.ID)
require.NoError(t, err)

_, err = store.GetClusterNodeByID(ctx, node.ID)
require.Error(t, err)

fetchedOwnership, err := store.GetNodeOwnership(ctx, node.ID)
require.NoError(t, err)
require.Nil(t, fetchedOwnership)

nodes, err := store.FindNodeByClusterID(ctx, cluster.ClusterID)
require.NoError(t, err)
require.Len(t, nodes, 0)

_, err = store.ByClusterID(ctx, cluster.ClusterID)
require.Error(t, err)

var remainingSR []database.SpaceResource
err = db.Core.NewSelect().Model(&remainingSR).Where("cluster_id = ?", cluster.ClusterID).Scan(ctx)
require.NoError(t, err)
require.Len(t, remainingSR, 0)
}

func TestClusterStore_DeleteClusterNodeByID_NonExistentNode(t *testing.T) {
db := tests.InitTestDB()
defer db.Close()
ctx := context.TODO()

store := database.NewClusterInfoStoreWithDB(db)

err := store.DeleteClusterNodeByID(ctx, 99999)
require.Error(t, err)
}
1 change: 1 addition & 0 deletions component/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type ClusterComponent interface {
GetWorkflowsByTimeRangeStream(ctx context.Context, req types.WorkflowTimeRangeReq) (<-chan []string, <-chan error)
StopDeploy(ctx context.Context, stopReq types.DeployActReq) error
StopWorkflow(ctx context.Context, stopReq types.ArgoWorkFlowDeleteReq) error
DeleteClusterNode(ctx context.Context, id int64) error
}

func NewClusterComponent(config *config.Config) (ClusterComponent, error) {
Expand Down
4 changes: 4 additions & 0 deletions component/cluster_ce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,7 @@ func (c *clusterComponentImpl) StopDeploy(ctx context.Context, stopReq types.Dep
func (c *clusterComponentImpl) StopWorkflow(ctx context.Context, stopReq types.ArgoWorkFlowDeleteReq) error {
return nil
}

func (c *clusterComponentImpl) DeleteClusterNode(ctx context.Context, id int64) error {
return nil
}
Loading