Merge pull request #989 from subutai-io/dev

Dev -> Master

Author: Dilshat

lib/fs/zfs.go

@@ -16,6 +16,8 @@ import (
 	"strconv"
 	"github.com/pkg/errors"
 	"github.com/subutai-io/agent/config"
+	"time"
+	"fmt"
 )
 
 var zfsRootDataset string
@@ -83,7 +85,7 @@ func CreateDataset(dataset string) error {
 // Lists snapshots for dataset
 // Returns output of `zfs list -t snapshot -r {root}/{dataset}` command
 func ListSnapshots(dataset string) (string, error) {
-	out, err := exec.Execute("zfs", "list", "-t", "snapshot", "-o", "name,creation", "-r", path.Join(zfsRootDataset, dataset))
+	out, err := exec.Execute("zfs", "list", "-t", "snapshot", "-o", "name,:created", "-r", path.Join(zfsRootDataset, dataset))
 	if err != nil {
 		return "", errors.Errorf("Error listing snapshots for %s: %s %s", dataset, out, err.Error())
 	}
@@ -117,7 +119,7 @@ func RollbackToSnapshot(snapshot string, forceRollback bool) error {
 // Creates snapshot
 // e.g. CreateSnapshot("foo/rootfs@now")
 func CreateSnapshot(snapshot string, recursive bool) error {
-	args := []string{"snapshot"}
+	args := []string{"snapshot", "-o", ":created=" + getTimestamp()}
 	if recursive {
 		args = append(args, "-r")
 	}
@@ -273,3 +275,11 @@ func ConvertToBytes(input string) (int, error) {
 	res := float64(multiplier) * num
 	return int(res), err
 }
+
+func getTimestamp() string {
+	t := time.Now()
+	umillisec := t.Nanosecond() / 1000000
+	return fmt.Sprintf("%d-%02d-%02dT%02d:%02d:%02d.%d",
+		t.Year(), t.Month(), t.Day(),
+		t.Hour(), t.Minute(), t.Second(), umillisec)
+}

main.go

@@ -14,6 +14,7 @@ import (
 	"github.com/subutai-io/agent/agent/vars"
 	"text/tabwriter"
 	"strings"
+	"github.com/subutai-io/agent/lib/container"
 )
 
 var version = "unknown"
@@ -42,6 +43,9 @@ var (
 	listName              = listCmd.Flag("name", "container/template name").Short('n').String()
 	listParents           = listCmd.Flag("parents", "list parents").Short('p').Bool()
 
+	existsCmd     = app.Command("exists", "Check if container/template exists, exit code 0 - exists, 1 - not found")
+	existsCmdName = existsCmd.Arg("name", "name of container/template").Required().String()
+
 	//attach command
 	/*
 	subutai attach foo
@@ -369,6 +373,10 @@ func main() {
 		cli.LxcList(*listName, false, false, true, *listParents)
 	case listAll.FullCommand():
 		cli.LxcList(*listName, true, true, false, *listParents)
+	case existsCmd.FullCommand():
+		if !container.LxcInstanceExists(*existsCmdName) {
+			os.Exit(1)
+		}
 	case daemonCmd.FullCommand():
 		config.InitAgentDebug()
 		agent.Start()