Skip to content

Commit

Permalink
Sync from server repo (746fab2e98)
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Spilchen committed Sep 27, 2023
1 parent e824c52 commit f79171f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 28 deletions.
22 changes: 0 additions & 22 deletions .vscode/launch.json

This file was deleted.

13 changes: 7 additions & 6 deletions vclusterops/add_node.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,6 @@ func (vcc *VClusterCommands) VAddNode(options *VAddNodeOptions) (VCoordinationDa
}
}

// add_node is aborted if requirements are not met
err = checkAddNodeRequirements(&vdb, options.NewHosts)
if err != nil {
return vdb, err
}

err = options.setInitiator(vdb.PrimaryUpNodes)
if err != nil {
return vdb, err
Expand All @@ -180,6 +174,13 @@ func (vcc *VClusterCommands) VAddNode(options *VAddNodeOptions) (VCoordinationDa
return vdb, err
}

// add_node is aborted if requirements are not met.
// Here we check whether the nodes being added already exist
err = checkAddNodeRequirements(&vdb, options.NewHosts)
if err != nil {
return vdb, err
}

err = vdb.addHosts(options.NewHosts)
if err != nil {
return vdb, err
Expand Down

0 comments on commit f79171f

Please sign in to comment.