kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix error naming convention

pull/4642/head
josedonizetti 2019-06-29 11:28:54 -03:00
parent f464fa93db
commit 4d00a093d1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/drivers/kvm/domain.go
View File

@ -156,7 +156,7 @@ func closeDomain(dom *libvirt.Domain, conn *libvirt.Connect) error {
} }
res, err := conn.Close() res, err := conn.Close()
if res != 0 { if res != 0 {
return fmt.Errorf("CloseConnection() == %d, expected 0", res) return fmt.Errorf("conn.Close() == %d, expected 0", res)
} }
return err return err
} }
@ -188,14 +188,14 @@ func (d *Driver) createDomain() (*libvirt.Domain, error) {
conn, err := getConnection(d.ConnectionURI) conn, err := getConnection(d.ConnectionURI)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Error getting libvirt connection") return nil, errors.Wrap(err, "error getting libvirt connection")
} }
defer conn.Close() defer conn.Close()
// define the domain in libvirt using the generated XML // define the domain in libvirt using the generated XML
dom, err := conn.DomainDefineXML(domainXML.String()) dom, err := conn.DomainDefineXML(domainXML.String())
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "Error defining domain xml: %s", domainXML.String()) return nil, errors.Wrapf(err, "error defining domain xml: %s", domainXML.String())
} }
return dom, nil return dom, nil

10
pkg/drivers/kvm/kvm.go
View File

@ -118,7 +118,7 @@ func NewDriver(hostName, storePath string) *Driver {
func (d *Driver) PreCommandCheck() error { func (d *Driver) PreCommandCheck() error {
conn, err := getConnection(d.ConnectionURI) conn, err := getConnection(d.ConnectionURI)
if err != nil { if err != nil {
return errors.Wrap(err, "Error connecting to libvirt socket. Have you added yourself to the libvirtd group?") return errors.Wrap(err, "error connecting to libvirt socket. Have you added yourself to the libvirtd group?")
} }
libVersion, err := conn.GetLibVersion() libVersion, err := conn.GetLibVersion()
if err != nil { if err != nil {
@ -276,7 +276,7 @@ func (d *Driver) Start() (err error) {
log.Info("Creating domain...") log.Info("Creating domain...")
if err := dom.Create(); err != nil { if err := dom.Create(); err != nil {
return errors.Wrap(err, "Error creating VM") return errors.Wrap(err, "error creating VM")
} }
log.Info("Waiting to get IP...") log.Info("Waiting to get IP...")
@ -299,7 +299,7 @@ func (d *Driver) Start() (err error) {
} }
if d.IPAddress == "" { if d.IPAddress == "" {
return errors.New("Machine didn't return an IP after 120 seconds") return errors.New("machine didn't return an IP after 120 seconds")
} }
log.Info("Waiting for SSH to be available...") log.Info("Waiting for SSH to be available...")
@ -337,7 +337,7 @@ func (d *Driver) Create() (err error) {
log.Infof("Building disk image from %s", d.Boot2DockerURL) log.Infof("Building disk image from %s", d.Boot2DockerURL)
if err = pkgdrivers.MakeDiskImage(d.BaseDriver, d.Boot2DockerURL, d.DiskSize); err != nil { if err = pkgdrivers.MakeDiskImage(d.BaseDriver, d.Boot2DockerURL, d.DiskSize); err != nil {
return errors.Wrap(err, "Error creating disk") return errors.Wrap(err, "error creating disk")
} }
if err := ensureDirPermissions(store); err != nil { if err := ensureDirPermissions(store); err != nil {
@ -411,7 +411,7 @@ func (d *Driver) Stop() (err error) {
for i := 0; i < 60; i++ { for i := 0; i < 60; i++ {
s, err := d.GetState() s, err := d.GetState()
if err != nil { if err != nil {
return errors.Wrap(err, "Error getting state of VM") return errors.Wrap(err, "error getting state of VM")
} }
if s == state.Stopped { if s == state.Stopped {
return nil return nil