Merge branch 'add-zone' into 'master'

Add zone

See merge request !48

Author: timfeirg

README.md

@@ -69,6 +69,7 @@ permdir: "/mnt/mfs/permdirs" # 宿主机的 permdir 的路径
 etcd: # etcd 集群的地址
     - "http://127.0.0.1:2379"
 etcd_lock_prefix: "/eru-core/_lock" # etcd 分布式锁的前缀, 一般会用隐藏文件夹
+zone: "c1" # 机房区域
 
 git:
     public_key: "[path_to_pub_key]" # git clone 使用的公钥

cluster/calcium/meta.go

@@ -67,3 +67,7 @@ func (c *calcium) GetContainer(id string) (*types.Container, error) {
 func (c *calcium) GetContainers(ids []string) ([]*types.Container, error) {
 	return c.store.GetContainers(ids)
 }
+
+func (c *calcium) GetZone() string {
+	return c.config.Zone
+}

cluster/cluster.go

@@ -24,4 +24,7 @@ type Cluster interface {
 	UpgradeContainer(ids []string, image string) (chan *types.UpgradeContainerMessage, error)
 	RemoveContainer(ids []string) (chan *types.RemoveContainerMessage, error)
 	RemoveImage(podname, nodename string, images []string) (chan *types.RemoveImageMessage, error)
+
+	// cluster attribute methods
+	GetZone() string
 }

core.yaml.sample

@@ -8,6 +8,8 @@ etcd_lock_prefix: "/eru-core/_lock"
 resource_alloc: "cpu-period"
 statsd: "statsd2.ricebook.net:8125"
 
+zone: "c1"
+
 git:
     public_key: "***REMOVED***"
     private_key: "***REMOVED***"

devtools/core_pb2.py

@@ -52,6 +52,7 @@ message Node {
     map<string, int64> cpu = 5;
     string info = 6;
     bool available = 7;
+    string zone = 8;
 }
 
 message Nodes {

rpc/gen/core.pb.go

@@ -63,7 +63,7 @@ func (v *virbranium) AddNode(ctx context.Context, opts *pb.AddNodeOptions) (*pb.
 		return nil, err
 	}
 
-	return toRPCNode(n), nil
+	return toRPCNode(n, v.cluster.GetZone()), nil
 }
 
 // AddNode saves a node and returns it to client
@@ -84,7 +84,7 @@ func (v *virbranium) GetNode(ctx context.Context, opts *pb.GetNodeOptions) (*pb.
 		return nil, err
 	}
 
-	return toRPCNode(n), nil
+	return toRPCNode(n, v.cluster.GetZone()), nil
 }
 
 // ListPodNodes returns a list of node for pod
@@ -96,7 +96,7 @@ func (v *virbranium) ListPodNodes(ctx context.Context, opts *pb.ListNodesOptions
 
 	nodes := []*pb.Node{}
 	for _, n := range ns {
-		nodes = append(nodes, toRPCNode(n))
+		nodes = append(nodes, toRPCNode(n, v.cluster.GetZone()))
 	}
 	return &pb.Nodes{Nodes: nodes}, nil
 }
@@ -172,7 +172,7 @@ func (v *virbranium) SetNodeAvailable(ctx context.Context, opts *pb.NodeAvailabl
 	if err != nil {
 		return nil, err
 	}
-	return toRPCNode(n), nil
+	return toRPCNode(n, v.cluster.GetZone()), nil
 }
 
 // streamed returned functions

rpc/gen/core.proto

@@ -23,7 +23,7 @@ func toRPCNetwork(n *types.Network) *pb.Network {
 	return &pb.Network{Name: n.Name, Subnets: n.Subnets}
 }
 
-func toRPCNode(n *types.Node) *pb.Node {
+func toRPCNode(n *types.Node, zone string) *pb.Node {
 	bytes := []byte("")
 	if info, err := n.Info(); err == nil {
 		bytes, _ = json.Marshal(info)
@@ -37,6 +37,7 @@ func toRPCNode(n *types.Node) *pb.Node {
 		Cpu:       toRPCCPUMap(n.CPU),
 		Info:      string(bytes),
 		Available: n.Available,
+		Zone:      zone,
 	}
 }
 

rpc/rpc.go

@@ -9,6 +9,7 @@ type Config struct {
 	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
 
 	Git       GitConfig    `yaml:"git"`
 	Docker    DockerConfig `yaml:"docker"`