Add gocage destroy command, v0.35

CHANGELOG

@@ -1,3 +1,4 @@
-v.0.33b : Support jaling datasets on differents pools : jail_zfs_dataset now have to include the pool name  
+v.0.33b : Support jailing datasets on differents pools : jail_zfs_dataset now have to include the pool name  
 v.0.33c : Parallelize start/stop of jails with same priority  
-
+v.0.34 : jail name can be shortened 
+v.0.35 : One can now "gocage destroy"

README.md

@@ -126,6 +126,17 @@ Stop jails
 `gocage stop test`
 
 
+Update jails  
+----------
+To update jail patch version, use gocage update :  
+`gocage update test`
+
+
+Delete jails  
+----------
+`gocage destroy test`
+
+
 Multi datastore  
 ----------
 A datastore is a ZFS dataset mounted. It should be declared in gocage.conf.yml, specifying its ZFS mountpoint :
@@ -206,9 +217,7 @@ gocage fetch -r 12.3 -o iocage --from file:/iocage/download
 
 TODO
 ----------
-gocage update  
 gocage upgrade  
 gocage create  
-gocage destroy  
 gocage init  
   create default pool with defaults.json

cmd/destroy.go

@@ -0,0 +1,57 @@
+package cmd
+
+import (
+	"fmt"
+	//"log"
+	//"errors"
+	"strings"
+)
+
+func DestroyJails(args []string) {
+	for _, a := range args {
+		cj, err := getJailFromArray(a, gJails)
+		if err != nil {
+			fmt.Printf("Error getting jail: %s\n", err)
+			return
+		}
+		
+		if cj.Running == true {
+			fmt.Printf("Jail %s is running\n", cj.Name)
+			if gForce == false {
+				var answer string
+				fmt.Printf("Stop jail and delete? (y/n) ")
+				fmt.Scanln(&answer)
+				if false == strings.EqualFold(answer, "y") {
+					return
+				}
+			}
+			fmt.Printf("Stopping jail %s\n", cj.Name)
+			StopJail([]string{fmt.Sprintf("%s/%s", cj.Datastore, cj.Name)})
+		}
+		
+		// Get root and config datasets, then destroy
+		dsRootName, err := zfsGetDatasetByMountpoint(cj.RootPath)
+		if err != nil {
+			fmt.Printf("Error getting root dataset: %s\n", err)
+			return
+		}
+		fmt.Printf("DEBUG: Prepare to zfs destroy %s\n", dsRootName)
+		if err = zfsDestroy(dsRootName); err != nil {
+			fmt.Printf("Error deleting root dataset: %s\n", err)
+			return
+		}
+		
+		dsConfName, err := zfsGetDatasetByMountpoint(cj.ConfigPath)
+		if err != nil {
+			fmt.Printf("Error getting config dataset: %s\n", err)
+			return
+		}
+		fmt.Printf("DEBUG: Prepare to zfs destroy %s\n", dsConfName)
+		if err = zfsDestroy(dsConfName); err != nil {
+			fmt.Printf("Error deleting config dataset: %s\n", err)
+			return
+		}
+
+		//TODO: Delete jail named directory
+	}
+}

cmd/fetch.go

@@ -61,7 +61,7 @@ func fetchRelease(release string, proto string, arch string, datastore string, f
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(downloadDsName, downloadDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(downloadDsName, downloadDsMountPoint, "lz4"); err != nil {
 			return fmt.Errorf("Error creating dataset %s: %v\n", downloadDsName, err)
 		}
 	}
@@ -75,7 +75,7 @@ func fetchRelease(release string, proto string, arch string, datastore string, f
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(thisDownloadDsName, thisDownloadDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(thisDownloadDsName, thisDownloadDsMountPoint, "lz4"); err != nil {
 			return fmt.Errorf("Error creating dataset %s: %v\n", thisDownloadDsName, err)
 		}
 	}
@@ -147,7 +147,7 @@ func extractRelease(release string, datastore string) {
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(releaseDsName, releaseDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(releaseDsName, releaseDsMountPoint, "lz4"); err != nil {
 			fmt.Printf("Error creating dataset %s: %v\n", releaseDsName, err)
 			return
 		}
@@ -163,7 +163,7 @@ func extractRelease(release string, datastore string) {
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(thisReleaseDsName, thisReleaseDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(thisReleaseDsName, thisReleaseDsMountPoint, "lz4"); err != nil {
 			fmt.Printf("Error creating dataset %s: %v\n", thisReleaseDsName, err)
 			return
 		}
@@ -179,7 +179,7 @@ func extractRelease(release string, datastore string) {
 	}
 	if false == exist {
 		// Then create dataset
-		if err := createZfsDataset(thisReleaseRootDsName, thisReleaseRootDsMountPoint, "lz4"); err != nil {
+		if err := zfsCreateDataset(thisReleaseRootDsName, thisReleaseRootDsMountPoint, "lz4"); err != nil {
 			fmt.Printf("Error creating dataset %s: %v\n", thisReleaseRootDsName, err)
 			return
 		}

cmd/root.go

@@ -1,11 +1,12 @@
 package cmd
 
 import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
 	"os"
+	"fmt"
+	"sync"
 	"strings"
+	"io/ioutil"
+	"encoding/json"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -14,7 +15,7 @@ import (
 )
 
 const (
-	gVersion = "0.33c"
+	gVersion = "0.35"
 	
 	// TODO : Get from $jail_zpool/defaults.json
 	MIN_DYN_DEVFS_RULESET = 1000
@@ -55,6 +56,7 @@ var (
 	gFetchIntoDS     string
 	gFetchFrom       string
 
+	gMdevfs          sync.Mutex
 
 	rootCmd = &cobra.Command{
 		Use:   "gocage",
@@ -98,7 +100,7 @@ ex: gocage list srv-db srv-web`,
 		},
 	}
 
-/*	destroyCmd = &cobra.Command{
+	destroyCmd = &cobra.Command{
 		Use:   "destroy",
 		Short: "destroy jails",
 		Long: `Destroy jail filesystem, snapshots and configuration file.`,
@@ -107,7 +109,7 @@ ex: gocage list srv-db srv-web`,
 			DestroyJails(args)
 		},
 	}
-*/
+
 	stopCmd = &cobra.Command{
 		Use:   "stop",
 		Short: "stop jail",
@@ -341,7 +343,7 @@ func init() {
 	listCmd.Flags().StringVarP(&gFilterJails, "filter", "f", "none", "Only display jails with these values. Ex: \"gocage list -f Config.Boot=1\" will only list started on boot jails")
 	listCmd.Flags().StringVarP(&gSortJailFields, "sort", "s", "none", "Display jails sorted by field values. Ex: \"gocage list -s +Name,-Config.Priority\" will sort jails by their decreasing name, then increasing start priority. 3 critera max supported.")
 	
-//	destroyCmd.Flags().BoolVarP(&gForce, "force", "f", false, "Force stop jail if running")
+	destroyCmd.Flags().BoolVarP(&gForce, "force", "f", false, "Force stop jail if running")
 
 	snapshotListCmd.Flags().StringVarP(&gDisplaySColumns, "outcol", "o", "Jailname,Name,Creation,Referenced,Used", "Show these columns in output")
 	snapshotListCmd.Flags().BoolVarP(&gNoSnapLineSep, "nolinesep", "l", false, "Do not display line separator between snapshots")
@@ -379,7 +381,7 @@ func init() {
 	rootCmd.AddCommand(stopCmd)
 	rootCmd.AddCommand(startCmd)
 	rootCmd.AddCommand(restartCmd)
-//	rootCmd.AddCommand(destroyCmd)
+	rootCmd.AddCommand(destroyCmd)
 	rootCmd.AddCommand(shellCmd)
 	rootCmd.AddCommand(getCmd)
 	rootCmd.AddCommand(setCmd)

cmd/start.go

@@ -476,12 +476,17 @@ func genNatIpv4(jail *Jail) ([]string, error) {
 	return ippair, nil
 }
 
-func buildDevfsRuleSet(jail *Jail) (error, int) {
+// FIXME : Must lock this function so parallel start do not 
+func buildDevfsRuleSet(jail *Jail, m *sync.Mutex) (error, int) {
 	rulesets := []int{}
 	
+	m.Lock()
+	//defer m.Unlock()
+
 	// Get known rulesets
 	out, err := executeCommand("devfs rule showsets")
 	if err != nil {
+		m.Unlock()
 		return errors.New(fmt.Sprintf("Error executing command \"devfs rule showsets\": %v; command returned: %s\n", err, out)), 0
 	}
 	srs := strings.Split(out, "\n")
@@ -509,19 +514,23 @@ func buildDevfsRuleSet(jail *Jail) (error, int) {
 	// UPDATE: We don't need this as every jail have a default Devfs_ruleset value
 	/*ds, err := getDatastoreFromArray(jail.Datastore, gDatastores)
 	if err != nil {
+		m.Unlock()
 		return errors.New(fmt.Sprintf("Error getting datastore %s for jail %s", jail.Datastore, jail.Name)), 0
 	}
 	defaultrs, err := strconv.ParseInt(ds.DefaultJailConfig.Devfs_ruleset, 10, 64)
 	if err != nil {
+		m.Unlock()
 		return errors.New(fmt.Sprintf("Error parsing default devfs_ruleset for datastore %s", jail.Datastore)), 0
 	}*/
 	
 	// Clone configured devfs_ruleset to a dynamic ruleset
 	if false == isStringInArray(srs, jail.Config.Devfs_ruleset) {
+		m.Unlock()
 		return errors.New(fmt.Sprintf("Unknown ruleset: %s", jail.Config.Devfs_ruleset)), 0
 	}
 	rs, _ := strconv.Atoi(jail.Config.Devfs_ruleset)
 	err = copyDevfsRuleset(ruleset, rs)
+	m.Unlock()
 	if err != nil {
 		return err, 0
 	}
@@ -1167,7 +1176,7 @@ func StartJail(args []string) {
 			continue
 		}
 		
-		fmt.Printf("> Starting jail %s\n", a)
+		fmt.Printf("> Starting jail %s\n", cj.Name)
 		
 		// Set InternalName as it is used by some of these
 		cj.InternalName = fmt.Sprintf("ioc-%s", cj.Name)
@@ -1343,7 +1352,7 @@ func StartJail(args []string) {
 			net = append(net,  strings.Split(cj.Config.Vnet_interfaces, " ")...)
 		}
 		
-		err, dynrs := buildDevfsRuleSet(cj)
+		err, dynrs := buildDevfsRuleSet(cj, &gMdevfs)
 		if err != nil {
 			fmt.Printf("%s\n", err.Error())
 			return

cmd/utils.go

@@ -568,7 +568,7 @@ func doZfsDatasetExist(dataset string) (bool, error) {
 }
 
 // Create ZFS dataset. mountpoint can be "none", then the dataset won't be mounted
-func createZfsDataset(dataset, mountpoint, compression string) error {
+func zfsCreateDataset(dataset, mountpoint, compression string) error {
 	cmd := fmt.Sprintf("zfs create -o mountpoint=%s -o compression=%s %s", mountpoint, compression, dataset)
 	out, err := executeCommand(cmd)
 	if err != nil {
@@ -576,6 +576,26 @@ func createZfsDataset(dataset, mountpoint, compression string) error {
 	}
 	return nil
 }
+// Return dataset name for a given mountpoint
+func zfsGetDatasetByMountpoint(mountpoint string) (string, error) {
+	cmd := fmt.Sprintf("zfs list -p -r -H -o name %s", mountpoint)
+	out, err := executeCommand(cmd)
+	if err != nil {
+		return "", errors.New(fmt.Sprintf("%v; command returned \"%s\"", err, out))
+	}
+
+	return strings.TrimSuffix(out, "\n"), nil
+}
+
+// Delete a ZFS Dataset by name
+func zfsDestroy(dataset string) error {
+	cmd := fmt.Sprintf("zfs destroy -r %s", dataset)
+	out, err := executeCommand(cmd)
+	if err != nil {
+		return errors.New(fmt.Sprintf("%v; command returned \"%s\"", err, out))
+	}
+	return nil
+}
 
 /*****************************************************************************
  *
@@ -772,7 +792,8 @@ func getJailFromArray(name string, jarray []Jail) (*Jail, error) {
 	}
 		
 	for i, j := range jarray {
-		if jail == j.Name {
+		//if jail == j.Name {
+		if strings.HasPrefix(j.Name, jail) {
 			if len(ds) > 0 {
 				if strings.EqualFold(ds, j.Datastore) {
 					return &jarray[i], nil
@@ -786,7 +807,7 @@ func getJailFromArray(name string, jarray []Jail) (*Jail, error) {
 	}
 	if len(jails) > 0 {
 		if len(jails) > 1 {
-			return &Jail{}, errors.New("More than one jail found with this name, please use datastore/jail format")
+			return &Jail{}, errors.New("More than one jail matching, please use datastore/jail format or full name")
 		} else {
 			return &jails[0], nil
 		}