Merge branch 'dev' into 'master'

remove useless config params

See merge request !143

Author: CMGS

core.yaml.sample

@@ -1,17 +1,16 @@
-bind: ":5001"
+bind: ":5002"
+agent_port: "12345"
 appdir: "/home"
+backupdir: "/data/backup"
 permdir: "/mnt/mfs/permdirs"
-backupdir: "/mnt/mfs/backupdirs"
 etcd:
     - "http://127.0.0.1:2379"
 etcd_lock_prefix: "/eru-core/_lock"
-
-resource_alloc: "cpu-period"
 statsd: "statsd2.ricebook.net:8125"
 
-zone: "c1"
-
+zone: "test-zone"
 image_cache: 2
+global_timeout: 300
 
 git:
     public_key: "***REMOVED***"
@@ -31,7 +30,6 @@ docker:
 scheduler:
     lock_key: "_scheduler_lock"
     lock_ttl: 10
-    type: "complex"
     maxshare: -1
     sharebase: 10
 

rpc/rpc_test.go

@@ -193,7 +193,6 @@ func initConfig(mStore *mockstore.MockStore) (types.Config, *vibranium) {
 		BackupDir:      "/tmp",            // Backup dir on host
 		EtcdMachines:   []string{"MOCK"},  // etcd cluster addresses
 		EtcdLockPrefix: "/eru-core/_lock", // etcd lock prefix, all locks will be created under this dir
-		ResourceAlloc:  "cpu-period",      // scheduler or cpu-period TODO give it a good name
 		Statsd:         "localhost:1080",  // Statsd host and port
 		Zone:           "c1",              // zone for core, e.g. C1, C2
 
@@ -203,7 +202,6 @@ func initConfig(mStore *mockstore.MockStore) (types.Config, *vibranium) {
 		Scheduler: types.SchedConfig{
 			LockKey: "_scheduler_lock",
 			LockTTL: 10,
-			Type:    "complex",
 		},
 		Syslog: types.SyslogConfig{
 			Address:  "udp://localhost:5111",

scheduler/complex/potassium_test.go

@@ -25,7 +25,6 @@ func newPotassium() (*potassium, error) {
 		Scheduler: types.SchedConfig{
 			LockKey:   "/coretest",
 			LockTTL:   1,
-			Type:      "complex",
 			ShareBase: 10,
 			MaxShare:  -1,
 		},
@@ -189,7 +188,6 @@ func TestComplexNodes(t *testing.T) {
 		Scheduler: types.SchedConfig{
 			LockKey:   "/coretest",
 			LockTTL:   1,
-			Type:      "complex",
 			ShareBase: 10,
 			MaxShare:  -1,
 		},

scheduler/scheduler_test.go

@@ -15,7 +15,6 @@ func TestSchedulerInvoke(t *testing.T) {
 		Scheduler: types.SchedConfig{
 			LockKey:   "/coretest",
 			LockTTL:   1,
-			Type:      "complex",
 			ShareBase: 10,
 			MaxShare:  -1,
 		},

types/config.go

@@ -10,7 +10,6 @@ type Config struct {
 	BackupDir      string        `yaml:"backupdir"`        // Backup dir on host
 	EtcdMachines   []string      `yaml:"etcd"`             // etcd cluster addresses
 	EtcdLockPrefix string        `yaml:"etcd_lock_prefix"` // etcd lock prefix, all locks will be created under this dir
-	ResourceAlloc  string        `yaml:"resource_alloc"`   // scheduler or cpu-period TODO give it a good name
 	Statsd         string        `yaml:"statsd"`           // Statsd host and port
 	Zone           string        `yaml:"zone"`             // zone for core, e.g. C1, C2
 	ImageCache     int           `yaml:"image_cache"`      // cache image count
@@ -46,7 +45,6 @@ type DockerConfig struct {
 type SchedConfig struct {
 	LockKey   string `yaml:"lock_key"`  // key for etcd lock
 	LockTTL   int    `yaml:"lock_ttl"`  // TTL for etcd lock
-	Type      string `yaml:"type"`      // choose simple or complex scheduler
 	MaxShare  int64  `yaml:"maxshare"`  // comlpex scheduler use maxshare
 	ShareBase int64  `yaml:"sharebase"` // how many pieces for one core
 }