Skip to content

K
k3s
Unverified Commit db8335f4 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #58566 from bowei/cp-op-fix

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. GCE: invalid location was used in regional and zonal operations Location was set to the full URL instead of the short name. Adds logging to the operations to make future issues easier to debug. Big thanks to nick for root causing this bug! I merged your patch in with the logging changes and chose to pass key instead of manipulating the compute API struct directly. /assign @nicksardo ```release-note NONE ```
parents b7b5bbb2 76c796ff
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 25 deletions
pkg/cloudprovider/providers/gce/cloud/op.go
View file @ db8335f4
...@@ -18,6 +18,9 @@ package cloud ...@@ -18,6 +18,9 @@ package cloud
import ( import (
"context" "context"
"fmt"
"github.com/golang/glog"
alpha "google.golang.org/api/compute/v0.alpha" alpha "google.golang.org/api/compute/v0.alpha"
beta "google.golang.org/api/compute/v0.beta" beta "google.golang.org/api/compute/v0.beta"
...@@ -40,6 +43,11 @@ type gaOperation struct { ...@@ -40,6 +43,11 @@ type gaOperation struct {
s *Service s *Service
op *ga.Operation op *ga.Operation
projectID string projectID string
key *meta.Key
}
func (o *gaOperation) String() string {
return fmt.Sprintf("gaOperation{%q, %v}", o.projectID, o.key)
} }
func (o *gaOperation) isDone(ctx context.Context) (bool, error) { func (o *gaOperation) isDone(ctx context.Context) (bool, error) {
...@@ -48,13 +56,18 @@ func (o *gaOperation) isDone(ctx context.Context) (bool, error) { ...@@ -48,13 +56,18 @@ func (o *gaOperation) isDone(ctx context.Context) (bool, error) {
err error err error
) )
switch { switch o.key.Type() {
case o.op.Region != "": case meta.Regional:
op, err = o.s.GA.RegionOperations.Get(o.projectID, o.op.Region, o.op.Name).Context(ctx).Do() op, err = o.s.GA.RegionOperations.Get(o.projectID, o.key.Region, o.op.Name).Context(ctx).Do()
case o.op.Zone != "": glog.V(5).Infof("GA.RegionOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Region, o.op.Name, op, err, ctx)
op, err = o.s.GA.ZoneOperations.Get(o.projectID, o.op.Zone, o.op.Name).Context(ctx).Do() case meta.Zonal:
default: op, err = o.s.GA.ZoneOperations.Get(o.projectID, o.key.Zone, o.op.Name).Context(ctx).Do()
glog.V(5).Infof("GA.ZoneOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Zone, o.op.Name, op, err, ctx)
case meta.Global:
op, err = o.s.GA.GlobalOperations.Get(o.projectID, o.op.Name).Context(ctx).Do() op, err = o.s.GA.GlobalOperations.Get(o.projectID, o.op.Name).Context(ctx).Do()
glog.V(5).Infof("GA.GlobalOperations.Get(%v, %v) = %+v, %v; ctx = %v", o.projectID, o.op.Name, op, err, ctx)
default:
return false, fmt.Errorf("invalid key type: %#v", o.key)
} }
if err != nil { if err != nil {
return false, err return false, err
...@@ -75,6 +88,11 @@ type alphaOperation struct { ...@@ -75,6 +88,11 @@ type alphaOperation struct {
s *Service s *Service
op *alpha.Operation op *alpha.Operation
projectID string projectID string
key *meta.Key
}
func (o *alphaOperation) String() string {
return fmt.Sprintf("alphaOperation{%q, %v}", o.projectID, o.key)
} }
func (o *alphaOperation) isDone(ctx context.Context) (bool, error) { func (o *alphaOperation) isDone(ctx context.Context) (bool, error) {
...@@ -83,13 +101,18 @@ func (o *alphaOperation) isDone(ctx context.Context) (bool, error) { ...@@ -83,13 +101,18 @@ func (o *alphaOperation) isDone(ctx context.Context) (bool, error) {
err error err error
) )
switch { switch o.key.Type() {
case o.op.Region != "": case meta.Regional:
op, err = o.s.Alpha.RegionOperations.Get(o.projectID, o.op.Region, o.op.Name).Context(ctx).Do() op, err = o.s.Alpha.RegionOperations.Get(o.projectID, o.key.Region, o.op.Name).Context(ctx).Do()
case o.op.Zone != "": glog.V(5).Infof("Alpha.RegionOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Region, o.op.Name, op, err, ctx)
op, err = o.s.Alpha.ZoneOperations.Get(o.projectID, o.op.Zone, o.op.Name).Context(ctx).Do() case meta.Zonal:
default: op, err = o.s.Alpha.ZoneOperations.Get(o.projectID, o.key.Zone, o.op.Name).Context(ctx).Do()
glog.V(5).Infof("Alpha.ZoneOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Zone, o.op.Name, op, err, ctx)
case meta.Global:
op, err = o.s.Alpha.GlobalOperations.Get(o.projectID, o.op.Name).Context(ctx).Do() op, err = o.s.Alpha.GlobalOperations.Get(o.projectID, o.op.Name).Context(ctx).Do()
glog.V(5).Infof("Alpha.GlobalOperations.Get(%v, %v) = %+v, %v; ctx = %v", o.projectID, o.op.Name, op, err, ctx)
default:
return false, fmt.Errorf("invalid key type: %#v", o.key)
} }
if err != nil { if err != nil {
return false, err return false, err
...@@ -110,6 +133,11 @@ type betaOperation struct { ...@@ -110,6 +133,11 @@ type betaOperation struct {
s *Service s *Service
op *beta.Operation op *beta.Operation
projectID string projectID string
key *meta.Key
}
func (o *betaOperation) String() string {
return fmt.Sprintf("betaOperation{%q, %v}", o.projectID, o.key)
} }
func (o *betaOperation) isDone(ctx context.Context) (bool, error) { func (o *betaOperation) isDone(ctx context.Context) (bool, error) {
...@@ -118,13 +146,18 @@ func (o *betaOperation) isDone(ctx context.Context) (bool, error) { ...@@ -118,13 +146,18 @@ func (o *betaOperation) isDone(ctx context.Context) (bool, error) {
err error err error
) )
switch { switch o.key.Type() {
case o.op.Region != "": case meta.Regional:
op, err = o.s.Beta.RegionOperations.Get(o.projectID, o.op.Region, o.op.Name).Context(ctx).Do() op, err = o.s.Beta.RegionOperations.Get(o.projectID, o.key.Region, o.op.Name).Context(ctx).Do()
case o.op.Zone != "": glog.V(5).Infof("Beta.RegionOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Region, o.op.Name, op, err, ctx)
op, err = o.s.Beta.ZoneOperations.Get(o.projectID, o.op.Zone, o.op.Name).Context(ctx).Do() case meta.Zonal:
default: op, err = o.s.Beta.ZoneOperations.Get(o.projectID, o.key.Zone, o.op.Name).Context(ctx).Do()
glog.V(5).Infof("Beta.ZoneOperations.Get(%v, %v, %v) = %+v, %v; ctx = %v", o.projectID, o.key.Zone, o.op.Name, op, err, ctx)
case meta.Global:
op, err = o.s.Beta.GlobalOperations.Get(o.projectID, o.op.Name).Context(ctx).Do() op, err = o.s.Beta.GlobalOperations.Get(o.projectID, o.op.Name).Context(ctx).Do()
glog.V(5).Infof("Beta.GlobalOperations.Get(%v, %v) = %+v, %v; ctx = %v", o.projectID, o.op.Name, op, err, ctx)
default:
return false, fmt.Errorf("invalid key type: %#v", o.key)
} }
if err != nil { if err != nil {
return false, err return false, err
......
pkg/cloudprovider/providers/gce/cloud/service.go
View file @ db8335f4
...@@ -20,6 +20,8 @@ import ( ...@@ -20,6 +20,8 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/golang/glog"
alpha "google.golang.org/api/compute/v0.alpha" alpha "google.golang.org/api/compute/v0.alpha"
beta "google.golang.org/api/compute/v0.beta" beta "google.golang.org/api/compute/v0.beta"
ga "google.golang.org/api/compute/v1" ga "google.golang.org/api/compute/v1"
...@@ -36,26 +38,26 @@ type Service struct { ...@@ -36,26 +38,26 @@ type Service struct {
} }
// wrapOperation wraps a GCE anyOP in a version generic operation type. // wrapOperation wraps a GCE anyOP in a version generic operation type.
func (g *Service) wrapOperation(anyOp interface{}) (operation, error) { func (s *Service) wrapOperation(anyOp interface{}) (operation, error) {
switch o := anyOp.(type) { switch o := anyOp.(type) {
case *ga.Operation: case *ga.Operation:
r, err := ParseResourceURL(o.SelfLink) r, err := ParseResourceURL(o.SelfLink)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &gaOperation{g, o, r.ProjectID}, nil return &gaOperation{s, o, r.ProjectID, r.Key}, nil
case *alpha.Operation: case *alpha.Operation:
r, err := ParseResourceURL(o.SelfLink) r, err := ParseResourceURL(o.SelfLink)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &alphaOperation{g, o, r.ProjectID}, nil return &alphaOperation{s, o, r.ProjectID, r.Key}, nil
case *beta.Operation: case *beta.Operation:
r, err := ParseResourceURL(o.SelfLink) r, err := ParseResourceURL(o.SelfLink)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &betaOperation{g, o, r.ProjectID}, nil return &betaOperation{s, o, r.ProjectID, r.Key}, nil
default: default:
return nil, fmt.Errorf("invalid type %T", anyOp) return nil, fmt.Errorf("invalid type %T", anyOp)
} }
...@@ -64,16 +66,20 @@ func (g *Service) wrapOperation(anyOp interface{}) (operation, error) { ...@@ -64,16 +66,20 @@ func (g *Service) wrapOperation(anyOp interface{}) (operation, error) {
// WaitForCompletion of a long running operation. This will poll the state of // WaitForCompletion of a long running operation. This will poll the state of
// GCE for the completion status of the given operation. genericOp can be one // GCE for the completion status of the given operation. genericOp can be one
// of alpha, beta, ga Operation types. // of alpha, beta, ga Operation types.
func (g *Service) WaitForCompletion(ctx context.Context, genericOp interface{}) error { func (s *Service) WaitForCompletion(ctx context.Context, genericOp interface{}) error {
op, err := g.wrapOperation(genericOp) op, err := s.wrapOperation(genericOp)
if err != nil { if err != nil {
glog.Errorf("wrapOperation(%+v) error: %v", genericOp, err)
return err return err
} }
for done, err := op.isDone(ctx); !done; done, err = op.isDone(ctx) { for done, err := op.isDone(ctx); !done; done, err = op.isDone(ctx) {
if err != nil { if err != nil {
glog.V(4).Infof("op.isDone(%v) error; op = %v, err = %v", ctx, op, err)
return err return err
} }
g.RateLimiter.Accept(ctx, op.rateLimitKey()) glog.V(5).Infof("op.isDone(%v) waiting; op = %v", ctx, op)
s.RateLimiter.Accept(ctx, op.rateLimitKey())
} }
glog.V(5).Infof("op.isDone(%v) complete; op = %v", ctx, op)
return nil return nil
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment