Skip to content

Commit

Permalink
Create a backgroud task to register static list of machines.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ddysher
ddysher committed Nov 21, 2014
1 parent ea58ab7 commit 762e9a0
Show file tree
Hide file tree
Showing 3 changed files with 185 additions and 64 deletions.
38 changes: 32 additions & 6 deletions pkg/cloudprovider/controller/minioncontroller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,39 @@ func NewMinionController(
// Run starts syncing instances from cloudprovider periodically, or create initial minion list.
func (s *MinionController) Run(period time.Duration) {
if s.cloud != nil && len(s.matchRE) > 0 {
go util.Forever(func() { s.Sync() }, period)
go util.Forever(func() { s.SyncCloud() }, period)
} else {
go s.SyncStatic(period)
}
}

// SyncStatic registers list of machines from command line flag. It returns after successful
// registration of all machines.
func (s *MinionController) SyncStatic(period time.Duration) error {
registered := util.NewStringSet()
for {
for _, minionID := range s.minions {
s.kubeClient.Minions().Create(&api.Minion{
if registered.Has(minionID) {
continue
}
_, err := s.kubeClient.Minions().Create(&api.Minion{
ObjectMeta: api.ObjectMeta{Name: minionID},
NodeResources: *s.staticResources,
})
if err == nil {
registered.Insert(minionID)
}
}
if registered.Len() == len(s.minions) {
return nil
}
time.Sleep(period)
}
return nil
}

// Sync syncs list of instances from cloudprovider to master etcd registry.
func (s *MinionController) Sync() error {
// SyncCloud syncs list of instances from cloudprovider to master etcd registry.
func (s *MinionController) SyncCloud() error {
matches, err := s.cloudMinions()
if err != nil {
return err
Expand All @@ -84,14 +104,20 @@ func (s *MinionController) Sync() error {
for _, minion := range matches.Items {
if _, ok := minionMap[minion.Name]; !ok {
glog.Infof("Create minion in registry: %s", minion.Name)
s.kubeClient.Minions().Create(&minion)
_, err = s.kubeClient.Minions().Create(&minion)
if err != nil {
glog.Errorf("Create minion error: %s", minion.Name)
}
}
delete(minionMap, minion.Name)
}

for minionID := range minionMap {
glog.Infof("Delete minion from registry: %s", minionID)
s.kubeClient.Minions().Delete(minionID)
err = s.kubeClient.Minions().Delete(minionID)
if err != nil {
glog.Errorf("Delete minion error: %s", minionID)
}
}
return nil
}
Expand Down
206 changes: 148 additions & 58 deletions pkg/cloudprovider/controller/minioncontroller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,102 +18,192 @@ package controller

import (
"fmt"
"net/http"
"net/http/httptest"
"testing"
"time"

"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/fake"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
fake_cloud "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/fake"
)

func newMinionList(count int) *api.MinionList {
func newMinion(name string) *api.Minion {
return &api.Minion{ObjectMeta: api.ObjectMeta{Name: name}}
}

type FakeMinionHandler struct {
client.Fake
client.FakeMinions

// Input: Hooks determine if request is valid or not
CreateHook func(*FakeMinionHandler, *api.Minion) bool
Existing []*api.Minion

// Output
CreatedMinions []*api.Minion
DeletedMinions []*api.Minion
RequestCount int
}

func (c *FakeMinionHandler) Minions() client.MinionInterface {
return c
}

func (m *FakeMinionHandler) Create(minion *api.Minion) (*api.Minion, error) {
defer func() { m.RequestCount++ }()
if m.CreateHook == nil || m.CreateHook(m, minion) {
m.CreatedMinions = append(m.CreatedMinions, minion)
return minion, nil
} else {
return nil, fmt.Errorf("Create error.")
}
}

func (m *FakeMinionHandler) List() (*api.MinionList, error) {
defer func() { m.RequestCount++ }()
minions := []api.Minion{}
for i := 0; i < count; i++ {
minions = append(minions, api.Minion{
ObjectMeta: api.ObjectMeta{
Name: fmt.Sprintf("minion%d", i),
},
})
for i := 0; i < len(m.Existing); i++ {
if !contains(m.Existing[i], m.DeletedMinions) {
minions = append(minions, *m.Existing[i])
}
}
return &api.MinionList{
Items: minions,
for i := 0; i < len(m.CreatedMinions); i++ {
if !contains(m.Existing[i], m.DeletedMinions) {
minions = append(minions, *m.CreatedMinions[i])
}
}
return &api.MinionList{Items: minions}, nil
}

type serverResponse struct {
statusCode int
obj interface{}
func (m *FakeMinionHandler) Delete(id string) error {
m.DeletedMinions = append(m.DeletedMinions, newMinion(id))
m.RequestCount++
return nil
}

func makeTestServer(t *testing.T, minionResponse serverResponse) (*httptest.Server, *util.FakeHandler) {
fakeMinionHandler := util.FakeHandler{
StatusCode: minionResponse.statusCode,
ResponseBody: runtime.EncodeOrDie(testapi.Codec(), minionResponse.obj.(runtime.Object)),
}
mux := http.NewServeMux()
mux.Handle("/api/"+testapi.Version()+"/minions", &fakeMinionHandler)
mux.Handle("/api/"+testapi.Version()+"/minions/", &fakeMinionHandler)
mux.HandleFunc("/", func(res http.ResponseWriter, req *http.Request) {
t.Errorf("unexpected request: %v", req.RequestURI)
res.WriteHeader(http.StatusNotFound)
})
return httptest.NewServer(mux), &fakeMinionHandler
func TestSyncStaticCreateMinion(t *testing.T) {
fakeMinionHandler := &FakeMinionHandler{
CreateHook: func(fake *FakeMinionHandler, minion *api.Minion) bool {
return true
},
}
minionController := NewMinionController(nil, ".*", []string{"minion0"}, &api.NodeResources{}, fakeMinionHandler)
if err := minionController.SyncStatic(time.Millisecond); err != nil {
t.Errorf("unexpected error: %v", err)
}

if fakeMinionHandler.RequestCount != 1 {
t.Errorf("Expected 1 call, but got %v.", fakeMinionHandler.RequestCount)
}
if len(fakeMinionHandler.CreatedMinions) != 1 {
t.Errorf("expect only 1 minion created, got %v", len(fakeMinionHandler.CreatedMinions))
}
if fakeMinionHandler.CreatedMinions[0].Name != "minion0" {
t.Errorf("unexpect minion %v created", fakeMinionHandler.CreatedMinions[0].Name)
}
}

func TestSyncStaticCreateMinionWithError(t *testing.T) {
fakeMinionHandler := &FakeMinionHandler{
CreateHook: func(fake *FakeMinionHandler, minion *api.Minion) bool {
if fake.RequestCount == 0 {
return false
}
return true
},
}
minionController := NewMinionController(nil, ".*", []string{"minion0"}, &api.NodeResources{}, fakeMinionHandler)
if err := minionController.SyncStatic(time.Millisecond); err != nil {
t.Errorf("unexpected error: %v", err)
}

if fakeMinionHandler.RequestCount != 2 {
t.Errorf("Expected 2 call, but got %v.", fakeMinionHandler.RequestCount)
}
if len(fakeMinionHandler.CreatedMinions) != 1 {
t.Errorf("expect only 1 minion created, got %v", len(fakeMinionHandler.CreatedMinions))
}
if fakeMinionHandler.CreatedMinions[0].Name != "minion0" {
t.Errorf("unexpect minion %v created", fakeMinionHandler.CreatedMinions[0].Name)
}
}

func TestSyncCreateMinion(t *testing.T) {
testServer, minionHandler := makeTestServer(t,
serverResponse{http.StatusOK, newMinionList(1)})
defer testServer.Close()
client := client.NewOrDie(&client.Config{Host: testServer.URL, Version: testapi.Version()})
func TestSyncCloudCreateMinion(t *testing.T) {
fakeMinionHandler := &FakeMinionHandler{
Existing: []*api.Minion{newMinion("minion0")},
}
instances := []string{"minion0", "minion1"}
fakeCloud := fake_cloud.FakeCloud{
Machines: instances,
}
minionController := NewMinionController(&fakeCloud, ".*", nil, nil, client)
if err := minionController.Sync(); err != nil {
minionController := NewMinionController(&fakeCloud, ".*", nil, nil, fakeMinionHandler)
if err := minionController.SyncCloud(); err != nil {
t.Errorf("unexpected error: %v", err)
}

data := runtime.EncodeOrDie(testapi.Codec(), &api.Minion{ObjectMeta: api.ObjectMeta{Name: "minion1"}})
minionHandler.ValidateRequest(t, "/api/"+testapi.Version()+"/minions", "POST", &data)
if fakeMinionHandler.RequestCount != 2 {
t.Errorf("Expected 2 call, but got %v.", fakeMinionHandler.RequestCount)
}
if len(fakeMinionHandler.CreatedMinions) != 1 {
t.Errorf("expect only 1 minion created, got %v", len(fakeMinionHandler.CreatedMinions))
}
if fakeMinionHandler.CreatedMinions[0].Name != "minion1" {
t.Errorf("unexpect minion %v created", fakeMinionHandler.CreatedMinions[0].Name)
}
}

func TestSyncDeleteMinion(t *testing.T) {
testServer, minionHandler := makeTestServer(t,
serverResponse{http.StatusOK, newMinionList(2)})
defer testServer.Close()
client := client.NewOrDie(&client.Config{Host: testServer.URL, Version: testapi.Version()})
func TestSyncCloudDeleteMinion(t *testing.T) {
fakeMinionHandler := &FakeMinionHandler{
Existing: []*api.Minion{newMinion("minion0"), newMinion("minion1")},
}
instances := []string{"minion0"}
fakeCloud := fake_cloud.FakeCloud{
Machines: instances,
}
minionController := NewMinionController(&fakeCloud, ".*", nil, nil, client)
if err := minionController.Sync(); err != nil {
minionController := NewMinionController(&fakeCloud, ".*", nil, nil, fakeMinionHandler)
if err := minionController.SyncCloud(); err != nil {
t.Errorf("unexpected error: %v", err)
}

minionHandler.ValidateRequest(t, "/api/"+testapi.Version()+"/minions/minion1", "DELETE", nil)
if fakeMinionHandler.RequestCount != 2 {
t.Errorf("Expected 2 call, but got %v.", fakeMinionHandler.RequestCount)
}
if len(fakeMinionHandler.DeletedMinions) != 1 {
t.Errorf("expect only 1 minion deleted, got %v", len(fakeMinionHandler.DeletedMinions))
}
if fakeMinionHandler.DeletedMinions[0].Name != "minion1" {
t.Errorf("unexpect minion %v created", fakeMinionHandler.DeletedMinions[0].Name)
}
}

func TestSyncMinionRegexp(t *testing.T) {
testServer, minionHandler := makeTestServer(t,
serverResponse{http.StatusOK, newMinionList(1)})
defer testServer.Close()
client := client.NewOrDie(&client.Config{Host: testServer.URL, Version: testapi.Version()})
func TestSyncCloudRegexp(t *testing.T) {
fakeMinionHandler := &FakeMinionHandler{
Existing: []*api.Minion{newMinion("minion0")},
}
instances := []string{"minion0", "minion1", "node0"}
fakeCloud := fake_cloud.FakeCloud{
Machines: instances,
}
minionController := NewMinionController(&fakeCloud, "minion[0-9]+", nil, nil, client)
if err := minionController.Sync(); err != nil {
minionController := NewMinionController(&fakeCloud, "minion[0-9]+", nil, nil, fakeMinionHandler)
if err := minionController.SyncCloud(); err != nil {
t.Errorf("unexpected error: %v", err)
}

// Only minion1 is created.
data := runtime.EncodeOrDie(testapi.Codec(), &api.Minion{ObjectMeta: api.ObjectMeta{Name: "minion1"}})
minionHandler.ValidateRequest(t, "/api/"+testapi.Version()+"/minions", "POST", &data)
if fakeMinionHandler.RequestCount != 2 {
t.Errorf("Expected 2 call, but got %v.", fakeMinionHandler.RequestCount)
}
if len(fakeMinionHandler.CreatedMinions) != 1 {
t.Errorf("expect only 1 minion created, got %v", len(fakeMinionHandler.CreatedMinions))
}
if fakeMinionHandler.CreatedMinions[0].Name != "minion1" {
t.Errorf("unexpect minion %v created", fakeMinionHandler.CreatedMinions[0].Name)
}
}

func contains(minion *api.Minion, minions []*api.Minion) bool {
for i := 0; i < len(minions); i++ {
if minion.Name == minions[i].Name {
return true
}
}
return false
}
5 changes: 5 additions & 0 deletions pkg/util/set.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,8 @@ func (s StringSet) List() []string {
sort.StringSlice(res).Sort()
return res
}

// Len returns the size of the set.
func (s StringSet) Len() int {
return len(s)
}

0 comments on commit 762e9a0

Please sign in to comment.