Merge branch 'feature/docker-cp' into 'master'

RFC backup functionality in eru-core

See merge request !59

Author: timfeirg

VERSION

@@ -1 +1 @@
-0.7.17
+0.7.18

cluster/calcium/backup.go

@@ -0,0 +1,65 @@
+package calcium
+
+import (
+	"compress/gzip"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"gitlab.ricebook.net/platform/core/types"
+	"gitlab.ricebook.net/platform/core/utils"
+)
+
+// Backup uses docker cp to copy specified directory into configured BackupDir
+func (c *calcium) Backup(id, srcPath string) (*types.BackupMessage, error) {
+	log.Debugf("Backup %s for container %s", srcPath, id)
+	container, err := c.GetContainer(id)
+	node, err := c.GetNode(container.Podname, container.Nodename)
+	ctx := utils.ToDockerContext(node.Engine)
+
+	resp, stat, err := node.Engine.CopyFromContainer(ctx, container.ID, srcPath)
+	defer resp.Close()
+	log.Debugf("Docker cp stat: %v", stat)
+	if err != nil {
+		log.Errorf("Error during CopyFromContainer: %v", err)
+		return nil, err
+	}
+
+	appname, entrypoint, ident, err := utils.ParseContainerName(container.Name)
+	if err != nil {
+		log.Errorf("Error during ParseContainerName: %v", err)
+		return nil, err
+	}
+	now := strings.Replace(time.Now().Format(time.RFC3339), ":", "", -1)
+	baseDir := filepath.Join(c.config.BackupDir, appname, entrypoint)
+	err = os.MkdirAll(baseDir, os.FileMode(0400))
+	if err != nil {
+		log.Errorf("Error during mkdir %s, %v", baseDir, err)
+		return nil, err
+	}
+
+	backupFile := filepath.Join(baseDir, stat.Name+"-"+ident+"-"+now+".tar.gz")
+	log.Debugf("Creating %s", backupFile)
+	file, err := os.Create(backupFile)
+	if err != nil {
+		log.Errorf("Error during create backup file %s: %v", backupFile, err)
+	}
+	defer file.Close()
+
+	gw := gzip.NewWriter(file)
+	defer gw.Close()
+
+	_, err = io.Copy(gw, resp)
+	if err != nil {
+		log.Errorf("Error during copy resp: %v", err)
+		return nil, err
+	}
+
+	return &types.BackupMessage{
+		Status: "ok",
+		Size:   stat.Size,
+	}, nil
+}

cluster/calcium/create_container.go

@@ -634,7 +634,7 @@ func (c *calcium) makeContainerOptions(quota map[string]int, specs types.Specs,
 
 	// name
 	suffix := utils.RandomString(6)
-	containerName := strings.Join([]string{specs.Appname, opts.Entrypoint, suffix}, "_")
+	containerName := utils.MakeContainerName(specs.Appname, opts.Entrypoint, suffix)
 
 	// network mode
 	networkMode := entry.NetworkMode

cluster/cluster.go

@@ -24,6 +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)
+	Backup(id, srcPath string) (*types.BackupMessage, error)
 
 	// cluster attribute methods
 	GetZone() string

core.yaml.sample

@@ -2,6 +2,7 @@ bind: ":5001"
 agent_port: "12345"
 appdir: "/home"
 permdir: "/mnt/mfs/permdirs"
+backupdir: "/mnt/mfs/backupdirs"
 etcd:
     - "http://127.0.0.1:2379"
 etcd_lock_prefix: "/eru-core/_lock"

devtools/core_pb2.py

@@ -20,6 +20,7 @@ then
   sudo yum makecache fast
   sudo yum remove -y eru-core
   sudo yum install -y eru-core
+  sudo cp /home/liuyifu/eru-core.service /usr/lib/systemd/system/eru-core.service
   sudo systemctl daemon-reload
   sudo systemctl restart eru-core.service
 EOF

devtools/upgrade-eru-core.sh

@@ -5,7 +5,7 @@ After=network.target
 [Service]
 Type=simple
 Environment=GOTRACEBACK=crash
-ExecStart=/usr/bin/eru-core --config /etc/eru-core/core.yaml
+ExecStart=/usr/bin/eru-core --config /etc/eru-core/core.yaml --log-level DEBUG
 LimitNOFILE=10485760
 LimitNPROC=10485760
 LimitCORE=infinity