Merge branch 'refactor/volume' into 'master'

Refactor/volume

See merge request !76

Author: timfeirg

Makefile

@@ -39,4 +39,4 @@ build:
 
 test:
 	go tool vet .
-	go test ./...
+	go test -v ./...

VERSION

@@ -1 +1 @@
-0.7.27a
+0.7.27b

cluster/calcium/create_container.go

@@ -555,19 +555,12 @@ func (c *calcium) makeContainerOptions(quota map[string]int, specs types.Specs,
 	env = append(env, fmt.Sprintf("ERU_NODE_IP=%s", nodeIP))
 	env = append(env, fmt.Sprintf("ERU_NODE_NAME=%s", node.Name))
 	env = append(env, fmt.Sprintf("ERU_ZONE=%s", c.config.Zone))
+	env = append(env, fmt.Sprintf("PERMDIR=%s", filepath.Join(c.config.PermDir, specs.Appname)))
+	env = append(env, fmt.Sprintf("APPDIR=%s", filepath.Join(c.config.AppDir, specs.Appname)))
 
 	// mount paths
 	binds, volumes := makeMountPaths(specs, c.config)
-
-	// add permdir to container
-	if entry.PermDir {
-		permDir := filepath.Join("/", specs.Appname, "permdir")
-		volumes[permDir] = struct{}{}
-
-		permDirHost := filepath.Join(c.config.PermDir, specs.Appname)
-		binds = append(binds, strings.Join([]string{permDirHost, permDir, "rw"}, ":"))
-		env = append(env, fmt.Sprintf("ERU_PERMDIR=%s", permDir))
-	}
+	log.Debugf("App %s will bind %v", specs.Appname, binds)
 
 	// log config
 	// 默认是配置里的driver, 如果entrypoint有指定json-file就用json-file.
@@ -923,7 +916,7 @@ func (c *calcium) doUpgradeContainer(containers []*types.Container, image string
 			Force:         false,
 			PruneChildren: true,
 		}
-		for image, _ := range imagesToDelete {
+		for image := range imagesToDelete {
 			log.Debugf("Try to remove image %q while upgrade container", image)
 			engine.ImageRemove(context.Background(), image, rmiOpts)
 		}

cluster/calcium/helper.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -69,44 +70,24 @@ func trimLeftSlash(name string) string {
 }
 
 // make mount paths
-// app.yaml支持三种写法.
-// app.yaml里可以支持mount_paths的写法, 例如
-// mount_paths:
-//     - "/var/www/html"
-//     - "/data/eggsy"
-// 这样的路径会被直接挂载到permdir下面去, 例如上面的路径就是
-// /mnt/mfs/permdirs/eggsy/data/eggsy
-// /mnt/mfs/permdirs/eggsy/var/www/html
-// 而且这些路径是可以读写的.
-//
-// 或者使用volumes, 参数格式跟docker一样, 例如
+// 使用volumes, 参数格式跟docker一样, 支持 $PERMDIR $APPDIR 的展开
 // volumes:
-//     - "/data/test:/test:ro"
-//     - "/data/testx:/testx"
-// 说明把宿主机的/data/test映射到容器里的/test, 只读, 同时
-// 把宿主机的/data/tests映射到容器里的/testx, 读写.
-//
-// 或者使用binds, 例如
-// binds:
-//     "/host/path":
-//         bind: "/container/path"
-//         ro: true
-// 说明把宿主机的/host/path映射到容器里的/container/path, 并且只读
+//     - "$PERMDIR/foo-data:$APPDIR/foodata:rw"
 func makeMountPaths(specs types.Specs, config types.Config) ([]string, map[string]struct{}) {
 	binds := []string{}
 	volumes := make(map[string]struct{})
-	permDirHost := filepath.Join(config.PermDir, specs.Appname)
 
-	// mount_paths
-	for _, path := range specs.MountPaths {
-		hostPath := filepath.Join(permDirHost, path)
-		binds = append(binds, fmt.Sprintf("%s:%s:rw", hostPath, path))
-		volumes[path] = struct{}{}
+	var expandENV = func(env string) string {
+		envMap := make(map[string]string)
+		envMap["PERMDIR"] = filepath.Join(config.PermDir, specs.Appname)
+		envMap["APPDIR"] = filepath.Join(config.AppDir, specs.Appname)
+		return envMap[env]
 	}
 
 	// volumes
 	for _, path := range specs.Volumes {
-		parts := strings.Split(path, ":")
+		expanded := os.Expand(path, expandENV)
+		parts := strings.Split(expanded, ":")
 		if len(parts) == 2 {
 			binds = append(binds, fmt.Sprintf("%s:%s:ro", parts[0], parts[1]))
 			volumes[parts[1]] = struct{}{}
@@ -116,21 +97,10 @@ func makeMountPaths(specs types.Specs, config types.Config) ([]string, map[strin
 		}
 	}
 
-	// binds
-	var mode string
-	for hostPath, bind := range specs.Binds {
-		if bind.ReadOnly {
-			mode = "ro"
-		} else {
-			mode = "rw"
-		}
-		binds = append(binds, fmt.Sprintf("%s:%s:%s", hostPath, bind.InContainerPath, mode))
-		volumes[bind.InContainerPath] = struct{}{}
-	}
-
 	// /proc/sys
 	volumes["/writable-proc/sys"] = struct{}{}
 	binds = append(binds, "/proc/sys:/writable-proc/sys:rw")
+	volumes["/writable-sys/kernel/mm/transparent_hugepage"] = struct{}{}
 	binds = append(binds, "/sys/kernel/mm/transparent_hugepage:/writable-sys/kernel/mm/transparent_hugepage:rw")
 	return binds, volumes
 }

cluster/calcium/helper_test.go

@@ -0,0 +1,16 @@
+package calcium
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"gitlab.ricebook.net/platform/core/types"
+)
+
+func TestMakeMountPaths(t *testing.T) {
+	config := types.Config{PermDir: "/mnt/mfs/permdirs", AppDir: "/home"}
+	specs := types.Specs{Appname: "foo", Volumes: []string{"$PERMDIR/foo-data:$APPDIR/foo-data"}}
+	binds, volumes := makeMountPaths(specs, config)
+	assert.Equal(t, binds, []string{"/mnt/mfs/permdirs/foo/foo-data:/home/foo/foo-data:ro", "/proc/sys:/writable-proc/sys:rw", "/sys/kernel/mm/transparent_hugepage:/writable-sys/kernel/mm/transparent_hugepage:rw"}, "binds should be the same")
+	assert.Equal(t, volumes, map[string]struct{}{"/home/foo/foo-data": struct{}{}, "/writable-proc/sys": struct{}{}, "/writable-sys/kernel/mm/transparent_hugepage": struct{}{}})
+}

devtools/test.yaml

@@ -52,9 +52,6 @@ build:
   - "curl www.baidu.com"
   - "pip install -r requirements.txt"
 base: "hub.ricebook.net/base/centos:python-latest"
-mount_paths:
-  - "/var/www/html"
-  - "/data/test-ci"
 permitted_users:
   - "cmgs"
 combos:

types/specs.go

@@ -13,10 +13,8 @@ type Specs struct {
 	Entrypoints map[string]Entrypoint `yaml:"entrypoints,omitempty,flow"`
 	Build       []string              `yaml:"build,omitempty,flow"`
 	Volumes     []string              `yaml:"volumes,omitempty,flow"`
-	Binds       map[string]Bind       `yaml:"binds,omitempty,flow"`
 	Meta        map[string]string     `yaml:"meta,omitempty,flow"`
 	Base        string                `yaml:"base"`
-	MountPaths  []string              `yaml:"mount_paths,omitempty,flow"`
 	DNS         []string              `yaml:"dns,omitempty,flow"`
 }
 
@@ -32,7 +30,6 @@ type Entrypoint struct {
 	HealthCheckUrl          string   `yaml:"healthcheck_url,omitempty"`
 	HealthCheckExpectedCode int      `yaml:"healthcheck_expected_code,omitempty"`
 	ExtraHosts              []string `yaml:"hosts,omitempty,flow"`
-	PermDir                 bool     `yaml:"permdir,omitempty"`
 	Privileged              string   `yaml:"privileged,omitempty"`
 	LogConfig               string   `yaml:"log_config,omitempty"`
 	WorkingDir              string   `yaml:"working_dir,omitempty"`