From 6fcb646ca52a3b3195aeb5c4b85c60c6869ed83f Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sat, 3 Jan 2015 20:39:39 -0800 Subject: [PATCH 1/3] Set sync frequency during integration Without this, the sync loop runs continuously. IMO: This right here is why open structs are inferior to explicity constructors that take 75 arguments - you can't forget to pass an argument. --- pkg/standalone/standalone.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/standalone/standalone.go b/pkg/standalone/standalone.go index 4ef72ff28de..fa6d9d1fb3b 100644 --- a/pkg/standalone/standalone.go +++ b/pkg/standalone/standalone.go @@ -157,6 +157,7 @@ func SimpleRunKubelet(etcdClient tools.EtcdClient, dockerClient dockertools.Dock Address: util.IP(net.ParseIP(address)), EnableServer: true, EnableDebuggingHandlers: true, + SyncFrequency: 3 * time.Second, } RunKubelet(&kcfg) } From 297c8d1d5a1bcb180097577167812a8a75f227d5 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sat, 3 Jan 2015 20:48:19 -0800 Subject: [PATCH 2/3] Parse flags for in integration test. The default --v=10 might be reconsidered. --- cmd/integration/integration.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 8579ee157a3..7047123ec56 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -19,6 +19,7 @@ limitations under the License. package main import ( + "flag" "io/ioutil" "net" "net/http" @@ -548,6 +549,7 @@ func runServiceTest(client *client.Client) { type testFunc func(*client.Client) func main() { + flag.Parse() runtime.GOMAXPROCS(runtime.NumCPU()) util.ReallyCrash = true util.InitLogs() From a57976b46d3791b580f4c0099c007b58868bb5bf Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sat, 3 Jan 2015 20:51:14 -0800 Subject: [PATCH 3/3] fix call to Fatal() vs Fatalf() --- cmd/integration/integration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 7047123ec56..f96b8c94c4c 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -173,7 +173,7 @@ func startComponents(manifestURL string) (apiServerURL string) { schedulerConfigFactory := factory.NewConfigFactory(cl) schedulerConfig, err := schedulerConfigFactory.Create() if err != nil { - glog.Fatal("Couldn't create scheduler config: %v", err) + glog.Fatalf("Couldn't create scheduler config: %v", err) } scheduler.New(schedulerConfig).Run()