X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fsync.go;h=238ed62ae5e50f5f3516847817363a3bf894f8b7;hb=97641dde0b55b588bfd27817a6a9deac3b337513;hp=e8f643154851a5fd91cd6b5647c9da84d73ddb4a;hpb=30df06d9dc760f7adf8ce51f2443dedc773f1350;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/sync.go b/cmd/safcm/sync.go
index e8f6431..238ed62 100644
--- a/cmd/safcm/sync.go
+++ b/cmd/safcm/sync.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"os/signal"
 	"sort"
 	"strings"
 	"sync"
@@ -135,6 +136,38 @@ func MainSync(args []string) error {
 		done <- failed
 	}()
 
+	hostsLeft := make(map[string]bool)
+	for _, x := range toSync {
+		hostsLeft[x.Name] = true
+	}
+	var hostsLeftMutex sync.Mutex // protects hostsLeft
+
+	// Show unfinished hosts on Ctrl-C
+	sigint := make(chan os.Signal, 1)   // buffered for Notify()
+	signal.Notify(sigint, os.Interrupt) // = SIGINT = Ctrl-C
+	go func() {
+		// Running `ssh` processes get killed by SIGINT which is sent
+		// to all processes
+
+		<-sigint
+		log.Print("Received SIGINT, aborting ...")
+
+		// Print all queued events
+		events <- Event{} // poison pill
+		<-done
+		// "races" with <-done in the main function and will hang here
+		// if the other is faster. This is fine because then all hosts
+		// were synced successfully.
+
+		hostsLeftMutex.Lock()
+		var hosts []string
+		for x := range hostsLeft {
+			hosts = append(hosts, x)
+		}
+		sort.Strings(hosts)
+		log.Fatalf("Failed to sync %s", strings.Join(hosts, ", "))
+	}()
+
 	// Sync all hosts concurrently
 	var wg sync.WaitGroup
 	for _, x := range toSync {
@@ -160,6 +193,10 @@ func MainSync(args []string) error {
 				}
 			}
 			wg.Done()
+
+			hostsLeftMutex.Lock()
+			defer hostsLeftMutex.Unlock()
+			delete(hostsLeft, x.Name)
 		}()
 	}
 
@@ -186,8 +223,24 @@ func MainSync(args []string) error {
 func hostsToSync(names []string, allHosts *config.Hosts,
 	allGroups map[string][]string) ([]*config.Host, error) {
 
+	detectedMap := make(map[string]bool)
+	for _, x := range config.TransitivelyDetectedGroups(allGroups) {
+		detectedMap[x] = true
+	}
+
+	const detectedErr = `
+
+Groups depending on "detected" groups cannot be used to select hosts as these
+are only available after the hosts were contacted.
+`
+
 	nameMap := make(map[string]bool)
 	for _, x := range names {
+		if detectedMap[x] {
+			return nil, fmt.Errorf(
+				"group %q depends on \"detected\" groups%s",
+				x, detectedErr)
+		}
 		nameMap[x] = true
 	}
 	nameMatched := make(map[string]bool)
@@ -203,8 +256,6 @@ func hostsToSync(names []string, allHosts *config.Hosts,
 			nameMatched[host.Name] = true
 		}
 
-		// TODO: don't permit groups which contain "detected" groups
-		// because these are not available yet
 		groups, err := config.ResolveHostGroups(host.Name,
 			allGroups, nil)
 		if err != nil {