kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #125 from WestleyK/better_error_handling

Browse Source 
Better error handling for some of wwctl commands
This commit is contained in:
Gregory M. Kurtzer
2021-09-10 21:20:31 -07:00
committed by GitHub
parent 85ba06211c 705b321f80
commit 0ae20aab31
3 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/wwctl/main.go
View File

@@ -1,6 +1,7 @@
package main
import (
"fmt"
"os"
"github.com/hpcng/warewulf/internal/app/wwctl"
@@ -11,6 +12,10 @@ func main() {
err := root.Execute()
if err != nil {
fmt.Fprintf(os.Stderr, "%s: %s\n", os.Args[0], err)
if wwctl.DebugFlag {
fmt.Printf("\nSTACK TRACE: %+v\n", err)
}
os.Exit(255)
}
}

59
internal/app/wwctl/node/add/main.go
View File

@@ -1,9 +1,6 @@
package add
import (
"fmt"
"os"
"github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/pkg/errors"
@@ -13,32 +10,28 @@ import (
func CobraRunE(cmd *cobra.Command, args []string) error {
nodeDB, err := node.New()
if err != nil {
wwlog.Printf(wwlog.ERROR, "Failed to open node database: %s\n", err)
os.Exit(1)
return errors.Wrap(err, "failed to open node database")
}
for _, a := range args {
n, err := nodeDB.AddNode(a)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
return errors.Wrap(err, "failed to add node")
}
fmt.Printf("Added node: %s\n", a)
wwlog.Printf(wwlog.INFO, "Added node: %s\n", a)
if SetClusterName != "" {
wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting cluster name to: %s\n", n.Id.Get(), SetClusterName)
n.ClusterName.Set(SetClusterName)
err := nodeDB.NodeUpdate(n)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
return errors.Wrap(err, "failed to update node")
}
}
if SetIpaddr != "" {
if SetNetDev == "" {
wwlog.Printf(wwlog.ERROR, "You must include the '--netdev' option\n")
os.Exit(1)
return errors.New("you must include the '--netdev' option")
}
if _, ok := n.NetDevs[SetNetDev]; !ok {
@@ -52,85 +45,72 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
n.NetDevs[SetNetDev].Default.SetB(true)
err := nodeDB.NodeUpdate(n)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
return errors.Wrap(err, "failed to update nodedb")
}
}
if SetNetmask != "" {
if SetNetDev == "" {
wwlog.Printf(wwlog.ERROR, "You must include the '--netdev' option\n")
os.Exit(1)
return errors.New("you must include the '--netdev' option")
}
if _, ok := n.NetDevs[SetNetDev]; !ok {
wwlog.Printf(wwlog.ERROR, "Network Device doesn't exist: %s\n", SetNetDev)
os.Exit(1)
return errors.New("network device does not exist: " + SetNetDev)
}
wwlog.Printf(wwlog.VERBOSE, "Node: %s:%s, Setting netmask to: %s\n", n.Id.Get(), SetNetDev, SetNetmask)
n.NetDevs[SetNetDev].Netmask.Set(SetNetmask)
err := nodeDB.NodeUpdate(n)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
return errors.Wrap(err, "failed to update nodedb")
}
}
if SetGateway != "" {
if SetNetDev == "" {
wwlog.Printf(wwlog.ERROR, "You must include the '--netdev' option\n")
os.Exit(1)
return errors.New("you must include the '--netdev' option")
}
if _, ok := n.NetDevs[SetNetDev]; !ok {
wwlog.Printf(wwlog.ERROR, "Network Device doesn't exist: %s\n", SetNetDev)
os.Exit(1)
return errors.New("network device does not exist: " + SetNetDev)
}
wwlog.Printf(wwlog.VERBOSE, "Node: %s:%s, Setting gateway to: %s\n", n.Id.Get(), SetNetDev, SetGateway)
n.NetDevs[SetNetDev].Gateway.Set(SetGateway)
err := nodeDB.NodeUpdate(n)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
return errors.Wrap(err, "failed to update nodedb")
}
}
if SetHwaddr != "" {
if SetNetDev == "" {
wwlog.Printf(wwlog.ERROR, "You must include the '--netdev' option\n")
os.Exit(1)
return errors.New("you must include the '--netdev' option")
}
if _, ok := n.NetDevs[SetNetDev]; !ok {
wwlog.Printf(wwlog.ERROR, "Network Device doesn't exist: %s\n", SetNetDev)
os.Exit(1)
return errors.New("network device does not exist: " + SetNetDev)
}
wwlog.Printf(wwlog.VERBOSE, "Node: %s:%s, Setting HW address to: %s\n", n.Id.Get(), SetNetDev, SetHwaddr)
n.NetDevs[SetNetDev].Hwaddr.Set(SetHwaddr)
err := nodeDB.NodeUpdate(n)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
return errors.Wrap(err, "failed to update nodedb")
}
}
if SetType != "" {
if SetNetDev == "" {
wwlog.Printf(wwlog.ERROR, "You must include the '--netdev' option\n")
os.Exit(1)
return errors.New("you must include the '--netdev' option")
}
if _, ok := n.NetDevs[SetNetDev]; !ok {
wwlog.Printf(wwlog.ERROR, "Network Device doesn't exist: %s\n", SetNetDev)
os.Exit(1)
return errors.New("network device does not exist: " + SetNetDev)
}
wwlog.Printf(wwlog.VERBOSE, "Node: %s:%s, Setting Type to: %s\n", n.Id.Get(), SetNetDev, SetType)
n.NetDevs[SetNetDev].Type.Set(SetType)
err := nodeDB.NodeUpdate(n)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
return errors.Wrap(err, "failed to update nodedb")
}
}
@@ -140,8 +120,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
n.Discoverable.SetB(true)
err := nodeDB.NodeUpdate(n)
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
return errors.Wrap(err, "failed to update nodedb")
}
}

6
internal/app/wwctl/root.go
View File

@@ -25,12 +25,12 @@ var (
SilenceUsage: true,
}
verboseArg bool
debugArg bool
DebugFlag bool
)
func init() {
rootCmd.PersistentFlags().BoolVarP(&verboseArg, "verbose", "v", false, "Run with increased verbosity.")
rootCmd.PersistentFlags().BoolVarP(&debugArg, "debug", "d", false, "Run with debugging messages enabled.")
rootCmd.PersistentFlags().BoolVarP(&DebugFlag, "debug", "d", false, "Run with debugging messages enabled.")
rootCmd.AddCommand(overlay.GetCommand())
rootCmd.AddCommand(container.GetCommand())
@@ -49,7 +49,7 @@ func GetRootCommand() *cobra.Command {
}
func rootPersistentPreRunE(cmd *cobra.Command, args []string) error {
if debugArg {
if DebugFlag {
wwlog.SetLevel(wwlog.DEBUG)
} else if verboseArg {
wwlog.SetLevel(wwlog.VERBOSE)