github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Add waiting for GCE operations to finish before proceeding in various

Browse Source 
functions.
This commit is contained in:
gmarek 2015-02-24 14:29:17 +01:00
parent 754a2a8305
commit 9996654c4c
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/cloudprovider/gce/gce.go
View File

@ -174,7 +174,11 @@ func (gce *GCECloud) makeTargetPool(name, region string, hosts []string, affinit
Instances: instances, Instances: instances,
SessionAffinity: string(affinityType), 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
}
err = gce.waitForRegionOp(op, region)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -186,7 +190,7 @@ func (gce *GCECloud) waitForRegionOp(op *compute.Operation, region string) error
pollOp := op pollOp := op
for pollOp.Status != "DONE" { for pollOp.Status != "DONE" {
var err error var err error
time.Sleep(time.Second * 10) time.Sleep(time.Second)
pollOp, err = gce.service.RegionOperations.Get(gce.projectID, region, op.Name).Do() pollOp, err = gce.service.RegionOperations.Get(gce.projectID, region, op.Name).Do()
if err != nil { if err != nil {
return err return err
@ -254,17 +258,34 @@ func (gce *GCECloud) UpdateTCPLoadBalancer(name, region string, hosts []string)
Instances: refs, 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()
gce.waitForRegionOp(op, region)
if err != nil {
return err
}
return err return err
} }
// DeleteTCPLoadBalancer is an implementation of TCPLoadBalancer.DeleteTCPLoadBalancer. // DeleteTCPLoadBalancer is an implementation of TCPLoadBalancer.DeleteTCPLoadBalancer.
func (gce *GCECloud) DeleteTCPLoadBalancer(name, region string) error { 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 { if err != nil {
glog.Warningln("Failed to delete Forwarding Rules %s: got error %s. Trying to delete Target Pool", name, err.Error())
return err 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 return err
} }