remove useless code

Author: siscia

daemon/lib/garbage_collection.go

@@ -2,7 +2,6 @@ package lib
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -13,36 +12,6 @@ import (
 	da "github.com/cvmfs/docker-graphdriver/daemon/docker-api"
 )
 
-func getAllLayers() []string {
-	path := filepath.Join("/", "cvmfs", "*", subDirInsideRepo, "*")
-	paths, _ := filepath.Glob(path)
-	return paths
-}
-
-// this function is based on an "homegrow" implementation of a set intersection, go, since it does not provide generics, does not provides also generic datastructures like sets
-func findToRemoveLayers(all_layers, needed_layers []string) (removes []string) {
-	all := map[string]bool{}
-	needed := map[string]bool{}
-	to_remove := map[string]bool{}
-
-	for _, layer := range all_layers {
-		all[layer] = true
-	}
-	for _, layer := range needed_layers {
-		needed[layer] = true
-	}
-	for layer, _ := range all {
-		_, isNeeded := needed[layer]
-		if !isNeeded {
-			to_remove[layer] = true
-		}
-	}
-	for layer := range to_remove {
-		removes = append(removes, layer)
-	}
-	return
-}
-
 func FindImageToGarbageCollect(CVMFSRepo string) ([]da.Manifest, error) {
 	removeSchedulePath := RemoveScheduleLocation(CVMFSRepo)
 	llog := func(l *log.Entry) *log.Entry {
@@ -157,38 +126,3 @@ func GarbageCollectSingleLayer(CVMFSRepo, image, layer string) error {
 		return err
 	}
 }
-
-func RemoveUselessLayers() error {
-	all_layers := getAllLayers()
-	needed_layers, err := GetAllNeededLayers()
-	if err != nil {
-		return err
-	}
-	to_remove := findToRemoveLayers(all_layers, needed_layers)
-	// to_remove is now a slice of paths that we wish to remove from the
-	// repository.
-	// However those paths are "complete":
-	// `/cvmfs/$repo.name/layers/fffbbbaaa`
-	// we need to group them by the repository they belong to, and then
-	// extract only the last part of the path we care about:
-	// `layers/fffbbbaaa`
-	paths := map[string][]string{}
-	for _, path := range to_remove {
-		pathSplitted := strings.Split(path, "/")
-		repoName := pathSplitted[2]
-		paths[repoName] = append(paths[repoName], strings.Join(pathSplitted[3:], "/"))
-	}
-	fmt.Println(paths)
-	// possible optimization
-	// batch the delete of layers, not all together that it will lock the repo for quite too long
-	// but few of them like 10 or 20 together is something very reasonable.
-	for repoName, layers := range paths {
-		for _, layer := range layers {
-			err = ExecCommand("cvmfs_server", "ingest", "--delete", layer, repoName).Start()
-			if err != nil {
-				LogE(err).Warning("Error in deleting the layer")
-			}
-		}
-	}
-	return nil
-}

daemon/lib/sql.go

@@ -2,7 +2,6 @@ package lib
 
 import (
 	"database/sql"
-	"fmt"
 	"os/user"
 	"path"
 
@@ -491,11 +490,12 @@ converted.wish = wish.id AND
 wish.input_image = i.id;
 `
 
+/*
 var getAllNeededLayers = fmt.Sprintf(`
-SELECT DISTINCT( 
+SELECT DISTINCT(
 	'/cvmfs/' || wish.cvmfs_repo || '/'|| '%s' || '/' || substr(json_extract(layers.value, '$.Digest'), 8)
-	) 
-FROM 
+	)
+FROM
 converted, wish, json_each(converted.manifest, '$.Layers') as layers WHERE
 converted.wish = wish.id;
 `, subDirInsideRepo)
@@ -525,3 +525,4 @@ func GetAllNeededLayers() ([]string, error) {
 	}
 	return layers, nil
 }
+*/