Merge branch 'refactor/add-pod' into 'master'

pod 相关的 grpc 接口优化

See merge request !136

Author: CMGS

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

cluster/calcium/create_container.go

@@ -21,8 +21,6 @@ import (
 )
 
 const (
-	MEMORY_PRIOR   = "MEM"
-	CPU_PRIOR      = "CPU"
 	RESTART_ALWAYS = "always"
 )
 
@@ -34,7 +32,7 @@ func (c *calcium) CreateContainer(specs types.Specs, opts *types.DeployOptions)
 	if err != nil {
 		return nil, err
 	}
-	if pod.Scheduler == CPU_PRIOR {
+	if pod.Favor == types.CPU_PRIOR {
 		return c.createContainerWithCPUPrior(specs, opts)
 	}
 	log.Infof("Creating container with options: %v", opts)
@@ -110,7 +108,7 @@ func (c *calcium) doCreateContainerWithMemoryPrior(nodeInfo types.NodeInfo, spec
 	}
 
 	for i = 0; i < nodeInfo.Deploy; i++ {
-		config, hostConfig, networkConfig, containerName, err := c.makeContainerOptions(i+index, nil, specs, opts, node, MEMORY_PRIOR)
+		config, hostConfig, networkConfig, containerName, err := c.makeContainerOptions(i+index, nil, specs, opts, node, types.MEMORY_PRIOR)
 		ms[i].ContainerName = containerName
 		ms[i].Podname = opts.Podname
 		ms[i].Nodename = node.Name
@@ -281,7 +279,7 @@ func (c *calcium) doCreateContainerWithCPUPrior(nodeName string, cpuMap []types.
 
 	for i, quota := range cpuMap {
 		// create options
-		config, hostConfig, networkConfig, containerName, err := c.makeContainerOptions(i+index, quota, specs, opts, node, CPU_PRIOR)
+		config, hostConfig, networkConfig, containerName, err := c.makeContainerOptions(i+index, quota, specs, opts, node, types.CPU_PRIOR)
 		ms[i].ContainerName = containerName
 		ms[i].Podname = opts.Podname
 		ms[i].Nodename = node.Name
@@ -385,7 +383,7 @@ func (c *calcium) releaseQuota(node *types.Node, quota types.CPUMap) {
 	c.store.UpdateNodeCPU(node.Podname, node.Name, quota, "+")
 }
 
-func (c *calcium) makeContainerOptions(index int, quota types.CPUMap, specs types.Specs, opts *types.DeployOptions, node *types.Node, optionMode string) (
+func (c *calcium) makeContainerOptions(index int, quota types.CPUMap, specs types.Specs, opts *types.DeployOptions, node *types.Node, favor string) (
 	*enginecontainer.Config,
 	*enginecontainer.HostConfig,
 	*enginenetwork.NetworkingConfig,
@@ -528,7 +526,7 @@ func (c *calcium) makeContainerOptions(index int, quota types.CPUMap, specs type
 	}
 
 	var resource enginecontainer.Resources
-	if optionMode == CPU_PRIOR {
+	if favor == types.CPU_PRIOR {
 		resource = c.makeCPUPriorSetting(quota)
 	} else {
 		resource = c.makeMemoryPriorSetting(opts.Memory, opts.CPUQuota)

cluster/calcium/create_container_test.go

@@ -90,15 +90,10 @@ func TestCreateContainerWithMemPrior(t *testing.T) {
 func TestClean(t *testing.T) {
 	initMockConfig()
 
-	// delete pod
-	err := mockc.store.DeletePod(podname, false)
+	// delete pod, which will fail because there are remaining nodes
+	err := mockc.store.RemovePod(podname)
 	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "still has nodes, delete the nodes first")
-
-	// force delete
-	err = mockc.store.DeletePod(podname, true)
-	assert.NoError(t, err)
-
+	assert.Contains(t, err.Error(), "still has nodes")
 }
 
 func TestCreateContainerWithCPUPrior(t *testing.T) {

cluster/calcium/meta.go

@@ -12,8 +12,12 @@ func (c *calcium) ListPods() ([]*types.Pod, error) {
 	return c.store.GetAllPods()
 }
 
-func (c *calcium) AddPod(podname, desc string) (*types.Pod, error) {
-	return c.store.AddPod(podname, desc)
+func (c *calcium) AddPod(podname, favor, desc string) (*types.Pod, error) {
+	return c.store.AddPod(podname, favor, desc)
+}
+
+func (c *calcium) RemovePod(podname string) error {
+	return c.store.RemovePod(podname)
 }
 
 func (c *calcium) GetPod(podname string) (*types.Pod, error) {

cluster/calcium/meta_test.go

@@ -38,15 +38,16 @@ func TestAddPod(t *testing.T) {
 	config := types.Config{}
 	c := &calcium{store: store, config: config, scheduler: simplescheduler.New(), network: calico.New(config), source: gitlab.New(config)}
 
-	store.On("AddPod", "pod1", "desc1").Return(&types.Pod{Name: "pod1", Desc: "desc1"}, nil)
-	store.On("AddPod", "pod2", "desc2").Return(nil, fmt.Errorf("Etcd Error"))
+	store.On("AddPod", "pod1", "", "desc1").Return(&types.Pod{Name: "pod1", Favor: "MEM", Desc: "desc1"}, nil)
+	store.On("AddPod", "pod2", "", "desc2").Return(nil, fmt.Errorf("Etcd Error"))
 
-	p, err := c.AddPod("pod1", "desc1")
+	p, err := c.AddPod("pod1", "", "desc1")
 	assert.Equal(t, p.Name, "pod1")
+	assert.Equal(t, p.Favor, "MEM")
 	assert.Equal(t, p.Desc, "desc1")
 	assert.Nil(t, err)
 
-	p, err = c.AddPod("pod2", "desc2")
+	p, err = c.AddPod("pod2", "", "desc2")
 	assert.Nil(t, p)
 	assert.Equal(t, err.Error(), "Etcd Error")
 }

cluster/calcium/mock_test.go

@@ -324,7 +324,7 @@ func initMockConfig() {
 		Engine:    clnt,
 	}
 
-	pod := &coretypes.Pod{Name: podname, Desc: desc, Scheduler: "complex"}
+	pod := &coretypes.Pod{Name: podname, Desc: desc, Favor: "MEM"}
 	mockStringType := mock.AnythingOfType("string")
 	mockStore.On("GetPod", mockStringType).Return(pod, nil)
 	mockStore.On("GetNodesByPod", mockStringType).Return([]*coretypes.Node{n1, n2}, nil)
@@ -344,7 +344,7 @@ func initMockConfig() {
 		return true
 	})).Return(nil)
 
-	mockStore.On("DeletePod", mockStringType, mock.AnythingOfType("bool")).Return(nil)
+	mockStore.On("RemovePod", mockStringType).Return(nil)
 
 	deployNodeInfo := []coretypes.NodeInfo{
 		coretypes.NodeInfo{

cluster/calcium/realloc.go

@@ -45,7 +45,7 @@ func (c *calcium) ReallocResource(ids []string, cpu float64, mem int64) (chan *t
 			return nil, err
 		}
 		containersInfo[pod][node] = append(containersInfo[pod][node], container)
-		if pod.Scheduler == CPU_PRIOR {
+		if pod.Favor == types.CPU_PRIOR {
 			if _, ok := cpuContainersInfo[pod]; !ok {
 				cpuContainersInfo[pod] = CPUNodeContainers{}
 			}
@@ -67,7 +67,7 @@ func (c *calcium) ReallocResource(ids []string, cpu float64, mem int64) (chan *t
 		wg := sync.WaitGroup{}
 		wg.Add(len(containersInfo))
 		for pod, nodeContainers := range containersInfo {
-			if pod.Scheduler == CPU_PRIOR {
+			if pod.Favor == types.CPU_PRIOR {
 				nodeCPUContainersInfo := cpuContainersInfo[pod]
 				go func(pod *types.Pod, nodeCPUContainersInfo CPUNodeContainers) {
 					defer wg.Done()

cluster/cluster.go

@@ -9,7 +9,8 @@ import (
 type Cluster interface {
 	// meta data methods
 	ListPods() ([]*types.Pod, error)
-	AddPod(podname, desc string) (*types.Pod, error)
+	AddPod(podname, favor, desc string) (*types.Pod, error)
+	RemovePod(podname string) error
 	GetPod(podname string) (*types.Pod, error)
 	AddNode(nodename, endpoint, podname, cafile, certfile, keyfile string, public bool) (*types.Node, error)
 	RemoveNode(nodename, podname string) (*types.Pod, error)

devtools/client.py

@@ -44,11 +44,12 @@ def list_pods(ctx):
 
 @cli.command('pod:add')
 @click.argument('name')
+@click.argument('favor')
 @click.argument('desc')
 @click.pass_context
-def create_pod(ctx, name, desc):
+def add_pod(ctx, name, favor, desc):
     stub = _get_stub(ctx)
-    opts = pb.AddPodOptions(name=name, desc=desc)
+    opts = pb.AddPodOptions(name=name, favor=favor, desc=desc)
 
     try:
         pod = stub.AddPod(opts, 5)
@@ -63,6 +64,22 @@ def create_pod(ctx, name, desc):
     click.echo(click.style('create pod %s successfully' % pod, fg='green'))
 
 
+@cli.command('pod:remove')
+@click.argument('name')
+@click.pass_context
+def remove_pod(ctx, name):
+    stub = _get_stub(ctx)
+    opts = pb.RemovePodOptions(name=name)
+
+    try:
+        stub.RemovePod(opts, 5)
+    except AbortionError as e:
+        click.echo(click.style('abortion error: %s' % e.details, fg='red', bold=True))
+        ctx.exit(-1)
+
+    click.echo(click.style('pod %s removed' % name, fg='green'))
+
+
 @cli.command('pod:get')
 @click.argument('name')
 @click.pass_context