rancher
/
cli
mirror of https://github.com/rancher/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wait 

Problem:
Wait errors on already completed cluster
Error message has formatting

Solution:
Update to check status of watched object to every half second
Use value formatting for messages
This commit is contained in:
Dan Ramich 2019-02-13 09:42:33 -07:00 committed by Craig Jellick
parent fa7ea63697
commit 709f0a450d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/wait.go
View File

@ -46,13 +46,28 @@ func wait(ctx *cli.Context) error {
}
mapResource := map[string]interface{}{}
// Initial check shortcut
err = c.ByID(resource, &mapResource)
if err != nil {
return err
}
ok, err := checkDone(resource, mapResource)
if err != nil {
return err
}
if ok {
return nil
}
timeout := time.After(time.Duration(ctx.Int("timeout")) * time.Second)
every := time.Tick(10 * time.Second)
every := time.Tick(1 * time.Second)
for {
select {
case <-timeout:
return fmt.Errorf("Timeout reached %s:%s failed: %s", resource.Type, resource.ID, mapResource["transitioningMessage"])
return fmt.Errorf("Timeout reached %v:%v transitioningMessage: %v", resource.Type, resource.ID, mapResource["transitioningMessage"])
case <-every:
err = c.ByID(resource, &mapResource)
if err != nil {
@ -82,7 +97,7 @@ func checkDone(resource *ntypes.Resource, data map[string]interface{}) (bool, er
if data["state"] == "provisioning" {
break
}
return false, fmt.Errorf("%s:%s failed: %s", resource.Type, resource.ID, data["transitioningMessage"])
return false, fmt.Errorf("%v:%v failed, transitioningMessage: %v", resource.Type, resource.ID, data["transitioningMessage"])
}
return data["state"] == "active", nil