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

AWS: cache instances during service reload to avoid rate limiting on restart #26900

Merged
merged 1 commit into from
Jun 12, 2016
Merged

AWS: cache instances during service reload to avoid rate limiting on restart #26900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions pkg/cloudprovider/providers/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,15 @@ import (
"github.com/aws/aws-sdk-go/service/autoscaling"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/elb"
"github.com/golang/glog"
"gopkg.in/gcfg.v1"

"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/service"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/cloudprovider"
aws_credentials "k8s.io/kubernetes/pkg/credentialprovider/aws"
"k8s.io/kubernetes/pkg/types"

"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api/service"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/util/sets"
)

Expand Down Expand Up @@ -262,7 +261,9 @@ type AWSCloud struct {
// Note that we cache some state in awsInstance (mountpoints), so we must preserve the instance
selfAWSInstance *awsInstance

mutex sync.Mutex
mutex sync.Mutex
lastNodeNames sets.String
lastInstancesByNodeNames []*ec2.Instance
}

var _ Volumes = &AWSCloud{}
Expand Down Expand Up @@ -2237,7 +2238,8 @@ func (s *AWSCloud) EnsureLoadBalancer(apiService *api.Service, hosts []string) (
return nil, fmt.Errorf("LoadBalancerIP cannot be specified for AWS ELB")
}

instances, err := s.getInstancesByNodeNames(hosts)
hostSet := sets.NewString(hosts...)
instances, err := s.getInstancesByNodeNamesCached(hostSet)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -2675,7 +2677,8 @@ func (s *AWSCloud) EnsureLoadBalancerDeleted(service *api.Service) error {

// UpdateLoadBalancer implements LoadBalancer.UpdateLoadBalancer
func (s *AWSCloud) UpdateLoadBalancer(service *api.Service, hosts []string) error {
instances, err := s.getInstancesByNodeNames(hosts)
hostSet := sets.NewString(hosts...)
instances, err := s.getInstancesByNodeNamesCached(hostSet)
if err != nil {
return err
}
Expand Down Expand Up @@ -2747,10 +2750,21 @@ func (a *AWSCloud) getInstancesByIDs(instanceIDs []*string) (map[string]*ec2.Ins
return instancesByID, nil
}

// Fetches instances by node names; returns an error if any cannot be found.
// Fetches and caches instances by node names; returns an error if any cannot be found.
// This is implemented with a multi value filter on the node names, fetching the desired instances with a single query.
func (a *AWSCloud) getInstancesByNodeNames(nodeNames []string) ([]*ec2.Instance, error) {
names := aws.StringSlice(nodeNames)
// TODO(therc): make all the caching more rational during the 1.4 timeframe
func (a *AWSCloud) getInstancesByNodeNamesCached(nodeNames sets.String) ([]*ec2.Instance, error) {
a.mutex.Lock()
defer a.mutex.Unlock()
if nodeNames.Equal(a.lastNodeNames) {
if len(a.lastInstancesByNodeNames) > 0 {
// We assume that if the list of nodes is the same, the underlying
// instances have not changed. Later we might guard this with TTLs.
glog.V(2).Infof("Returning cached instances for %v", nodeNames)
return a.lastInstancesByNodeNames, nil
}
}
names := aws.StringSlice(nodeNames.List())

nodeNameFilter := &ec2.Filter{
Name: aws.String("private-dns-name"),
Expand Down Expand Up @@ -2778,6 +2792,9 @@ func (a *AWSCloud) getInstancesByNodeNames(nodeNames []string) ([]*ec2.Instance,
return nil, nil
}

glog.V(2).Infof("Caching instances for %v", nodeNames)
a.lastNodeNames = nodeNames
a.lastInstancesByNodeNames = instances
return instances, nil
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/cloudprovider/providers/aws/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ func TestFindInstanceByNodeNameExcludesTerminatedInstances(t *testing.T) {
}
}

func TestFindInstancesByNodeName(t *testing.T) {
func TestFindInstancesByNodeNameCached(t *testing.T) {
awsServices := NewFakeAWSServices()

nodeNameOne := "my-dns.internal"
Expand Down Expand Up @@ -1132,8 +1132,8 @@ func TestFindInstancesByNodeName(t *testing.T) {
return
}

nodeNames := []string{nodeNameOne}
returnedInstances, errr := c.getInstancesByNodeNames(nodeNames)
nodeNames := sets.NewString(nodeNameOne)
returnedInstances, errr := c.getInstancesByNodeNamesCached(nodeNames)

if errr != nil {
t.Errorf("Failed to find instance: %v", err)
Expand Down