Skip to content
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

Jump to bottom

Add waiting for GCE operations to finish before proceeding in various functions. #4770

Merged
merged 2 commits into from
Feb 26, 2015
Merged

Add waiting for GCE operations to finish before proceeding in various functions. #4770

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9996654
Add waiting for GCE operations to finish before proceeding in various
gmarek Feb 24, 2015
0be5aa5
Apply comments
gmarek Feb 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 25 additions & 5 deletions pkg/cloudprovider/gce/gce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,13 @@ func (gce *GCECloud) makeTargetPool(name, region string, hosts []string, affinit
Instances: instances,
SessionAffinity: string(affinityType),
}
_, err := gce.service.TargetPools.Insert(gce.projectID, region, pool).Do()
op, err := gce.service.TargetPools.Insert(gce.projectID, region, pool).Do()
if err != nil {
return "", err
}
if err = gce.waitForRegionOp(op, region); err != nil {
return "", err
}
link := fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/targetPools/%s", gce.projectID, region, name)
return link, nil
}
Expand All @@ -186,7 +189,7 @@ func (gce *GCECloud) waitForRegionOp(op *compute.Operation, region string) error
pollOp := op
for pollOp.Status != "DONE" {
var err error
time.Sleep(time.Second * 10)
time.Sleep(time.Second)
pollOp, err = gce.service.RegionOperations.Get(gce.projectID, region, op.Name).Do()
if err != nil {
return err
Expand Down Expand Up @@ -254,17 +257,34 @@ func (gce *GCECloud) UpdateTCPLoadBalancer(name, region string, hosts []string)
Instances: refs,
}

_, err := gce.service.TargetPools.AddInstance(gce.projectID, region, name, req).Do()
op, err := gce.service.TargetPools.AddInstance(gce.projectID, region, name, req).Do()
if err != nil {
return err
}
err = gce.waitForRegionOp(op, region)
return err
}

// DeleteTCPLoadBalancer is an implementation of TCPLoadBalancer.DeleteTCPLoadBalancer.
func (gce *GCECloud) DeleteTCPLoadBalancer(name, region string) error {
_, err := gce.service.ForwardingRules.Delete(gce.projectID, region, name).Do()
op, err := gce.service.ForwardingRules.Delete(gce.projectID, region, name).Do()
if err != nil {
glog.Warningln("Failed to delete Forwarding Rules %s: got error %s. Trying to delete Target Pool", name, err.Error())
return err
} else {
err = gce.waitForRegionOp(op, region)
if err != nil {
glog.Warningln("Failed waiting for Forwarding Rule %s to be deleted: got error %s. Trying to delete Target Pool", name, err.Error())
}
}
op, err = gce.service.TargetPools.Delete(gce.projectID, region, name).Do()
if err != nil {
glog.Warningln("Failed to delete Target Pool %s, got error %s.", name, err.Error())
}
err = gce.waitForRegionOp(op, region)
if err != nil {
glog.Warningln("Failed waiting for Target Pool %s to be deleted: got error %s.", name, err.Error())
}
_, err = gce.service.TargetPools.Delete(gce.projectID, region, name).Do()
return err
}

Expand Down