From e9206a74b2afa1ca38430637b490e93c7ad834fa Mon Sep 17 00:00:00 2001 From: iwilltry42 Date: Tue, 23 Apr 2019 11:22:59 +0200 Subject: [PATCH] make start/stop functions start/stop workers as well --- cli/commands.go | 110 +++++++++++++++++++++++++++++------------------- cli/config.go | 23 ---------- 2 files changed, 67 insertions(+), 66 deletions(-) diff --git a/cli/commands.go b/cli/commands.go index 597da8774..173e786e5 100644 --- a/cli/commands.go +++ b/cli/commands.go @@ -202,39 +202,50 @@ func DeleteCluster(c *cli.Context) error { // StopCluster stops a running cluster container (restartable) func StopCluster(c *cli.Context) error { - ctx := context.Background() - docker, err := client.NewEnvClient() - if err != nil { - return err - } - - clusterNames := []string{} - // operate on one or all clusters + clusters := make(map[string]cluster) if !c.Bool("all") { - clusterNames = append(clusterNames, c.String("name")) + cluster, err := getCluster(c.String("name")) + if err != nil { + return err + } + clusters[c.String("name")] = cluster } else { - clusterList, err := getClusterNames() + clusterMap, err := getClusters() if err != nil { return fmt.Errorf("ERROR: `--all` specified, but no clusters were found\n%+v", err) } - clusterNames = append(clusterNames, clusterList...) + // copy clusterMap + for k, v := range clusterMap { + clusters[k] = v + } } - // stop clusters one by one instead of appending all names to the docker command + ctx := context.Background() + docker, err := client.NewEnvClient() + if err != nil { + return fmt.Errorf("ERROR: couldn't create docker client\n%+v", err) + } + + // remove clusters one by one instead of appending all names to the docker command // this allows for more granular error handling and logging - for _, name := range clusterNames { - log.Printf("Stopping cluster [%s]", name) - cluster, err := getCluster(name) - if err != nil { - log.Printf("WARNING: couldn't get docker info for %s", name) - continue + for _, cluster := range clusters { + log.Printf("Stopping cluster [%s]", cluster.name) + if len(cluster.workers) > 0 { + log.Printf("...Stopping %d workers\n", len(cluster.workers)) + for _, worker := range cluster.workers { + if err := docker.ContainerStop(ctx, worker.ID, nil); err != nil { + log.Println(err) + continue + } + } } + log.Println("...Stopping server") if err := docker.ContainerStop(ctx, cluster.server.ID, nil); err != nil { - fmt.Printf("WARNING: couldn't stop cluster %s\n%+v", cluster.name, err) - continue + return fmt.Errorf("ERROR: Couldn't stop server for cluster %s\n%+v", cluster.name, err) } - log.Printf("SUCCESS: stopped cluster [%s]", cluster.name) + + log.Printf("SUCCESS: Stopped cluster [%s]", cluster.name) } return nil @@ -242,39 +253,52 @@ func StopCluster(c *cli.Context) error { // StartCluster starts a stopped cluster container func StartCluster(c *cli.Context) error { - ctx := context.Background() - docker, err := client.NewEnvClient() - if err != nil { - return err - } - - clusterNames := []string{} - // operate on one or all clusters + clusters := make(map[string]cluster) if !c.Bool("all") { - clusterNames = append(clusterNames, c.String("name")) + cluster, err := getCluster(c.String("name")) + if err != nil { + return err + } + clusters[c.String("name")] = cluster } else { - clusterList, err := getClusterNames() + clusterMap, err := getClusters() if err != nil { return fmt.Errorf("ERROR: `--all` specified, but no clusters were found\n%+v", err) } - clusterNames = append(clusterNames, clusterList...) + // copy clusterMap + for k, v := range clusterMap { + clusters[k] = v + } } - // stop clusters one by one instead of appending all names to the docker command + ctx := context.Background() + docker, err := client.NewEnvClient() + if err != nil { + return fmt.Errorf("ERROR: couldn't create docker client\n%+v", err) + } + + // remove clusters one by one instead of appending all names to the docker command // this allows for more granular error handling and logging - for _, name := range clusterNames { - log.Printf("Starting cluster [%s]", name) - cluster, err := getCluster(name) - if err != nil { - log.Printf("WARNING: couldn't get docker info for %s", name) - continue - } + for _, cluster := range clusters { + log.Printf("Starting cluster [%s]", cluster.name) + + log.Println("...Starting server") if err := docker.ContainerStart(ctx, cluster.server.ID, types.ContainerStartOptions{}); err != nil { - fmt.Printf("WARNING: couldn't start cluster %s\n%+v", cluster.name, err) - continue + return fmt.Errorf("ERROR: Couldn't start server for cluster %s\n%+v", cluster.name, err) } - log.Printf("SUCCESS: started cluster [%s]", cluster.name) + + if len(cluster.workers) > 0 { + log.Printf("...Starting %d workers\n", len(cluster.workers)) + for _, worker := range cluster.workers { + if err := docker.ContainerStart(ctx, worker.ID, types.ContainerStartOptions{}); err != nil { + log.Println(err) + continue + } + } + } + + log.Printf("SUCCESS: Started cluster [%s]", cluster.name) } return nil diff --git a/cli/config.go b/cli/config.go index d751229c8..8656d0e34 100644 --- a/cli/config.go +++ b/cli/config.go @@ -3,7 +3,6 @@ package run import ( "context" "fmt" - "io/ioutil" "log" "os" "path" @@ -92,28 +91,6 @@ func printClusters(all bool) { table.Render() } -// getClusterNames returns a list of cluster names which are folder names in the config directory -func getClusterNames() ([]string, error) { - homeDir, err := homedir.Dir() - if err != nil { - log.Printf("ERROR: Couldn't get user's home directory") - return nil, err - } - configDir := path.Join(homeDir, ".config", "k3d") - files, err := ioutil.ReadDir(configDir) - if err != nil { - log.Printf("ERROR: Couldn't list files in [%s]", configDir) - return nil, err - } - clusters := []string{} - for _, file := range files { - if file.IsDir() { - clusters = append(clusters, file.Name()) - } - } - return clusters, nil -} - // getClusters uses the docker API to get existing clusters and compares that with the list of cluster directories func getClusters() (map[string]cluster, error) { ctx := context.Background()