X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fsync.go;h=bee0133e4fd4326ef1610325fc6ae8649147da29;hb=fd97e8019e2ab166d9475ed59782c86247d8430b;hp=09ffe854e1e7491727882f963a894ff9c801994e;hpb=f2f2bc47e8729548f3c10117f7f008b547c4afc5;p=safcm%2Fsafcm.git diff --git a/cmd/safcm/sync.go b/cmd/safcm/sync.go index 09ffe85..bee0133 100644 --- a/cmd/safcm/sync.go +++ b/cmd/safcm/sync.go @@ -20,8 +20,11 @@ package main import ( "flag" "fmt" + "io/fs" "log" "os" + "os/signal" + "runtime" "sort" "strings" "sync" @@ -71,8 +74,12 @@ func MainSync(args []string) error { optionDryRun := flag.Bool("n", false, "dry-run, show diff but don't perform any changes") + optionQuiet := flag.Bool("q", false, + "hide successful, non-trigger commands with no output from host changes listing") optionLog := flag.String("log", "info", "set log `level`; "+ "levels: error, info, verbose, debug, debug2, debug3") + optionSshConfig := flag.String("sshconfig", "", + "`path` to ssh configuration file; used for tests") flag.CommandLine.Parse(args[2:]) @@ -100,12 +107,18 @@ func MainSync(args []string) error { os.Exit(1) } + if runtime.GOOS == "windows" { + log.Print("WARNING: Windows support is experimental!") + } + cfg, allHosts, allGroups, err := LoadBaseFiles() if err != nil { return err } cfg.DryRun = *optionDryRun + cfg.Quiet = *optionQuiet cfg.LogLevel = level + cfg.SshConfig = *optionSshConfig toSync, err := hostsToSync(names, allHosts, allGroups) if err != nil { @@ -115,7 +128,8 @@ func MainSync(args []string) error { return fmt.Errorf("no hosts found") } - isTTY := term.IsTerminal(int(os.Stdout.Fd())) + isTTY := term.IsTerminal(int(os.Stdout.Fd())) && + term.IsTerminal(int(os.Stderr.Fd())) done := make(chan bool) // Collect events from all hosts and print them @@ -132,6 +146,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 { @@ -157,6 +203,10 @@ func MainSync(args []string) error { } } wg.Done() + + hostsLeftMutex.Lock() + defer hostsLeftMutex.Unlock() + delete(hostsLeft, x.Name) }() } @@ -183,25 +233,36 @@ func MainSync(args []string) error { func hostsToSync(names []string, allHosts *config.Hosts, allGroups map[string][]string) ([]*config.Host, error) { + detectedMap := config.TransitivelyDetectedGroups(allGroups) + + 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) - // To detect typos we must check all given names but only want to add - // each match once - hostMatched := make(map[string]bool) + // To detect typos we must check all given names but one host can be + // matched by multiple names (e.g. two groups with overlapping hosts) + hostAdded := make(map[string]bool) var res []*config.Host for _, host := range allHosts.List { if nameMap[host.Name] { res = append(res, host) - hostMatched[host.Name] = true + hostAdded[host.Name] = true 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 { @@ -209,9 +270,9 @@ func hostsToSync(names []string, allHosts *config.Hosts, } for _, x := range groups { if nameMap[x] { - if !hostMatched[host.Name] { + if !hostAdded[host.Name] { res = append(res, host) - hostMatched[host.Name] = true + hostAdded[host.Name] = true } nameMatched[x] = true } @@ -309,9 +370,25 @@ func (s *Sync) Host(wg *sync.WaitGroup) error { wg.Done() }() + helpers, err := fs.Sub(RemoteHelpers, "remote") + if err != nil { + conn.Kill() + return err + } + // Connect to remote host - err := conn.DialSSH(s.host.Name) + user := s.host.SshUser + if user == "" { + user = s.config.SshUser + } + err = conn.DialSSH(rpc.SSHConfig{ + Host: s.host.Name, + User: user, + SshConfig: s.config.SshConfig, + RemoteHelpers: helpers, + }) if err != nil { + conn.Kill() return err } defer conn.Kill() @@ -345,9 +422,7 @@ func (s *Sync) Host(wg *sync.WaitGroup) error { return nil } -func (s *Sync) logf(level safcm.LogLevel, escaped bool, - format string, a ...interface{}) { - +func (s *Sync) log(level safcm.LogLevel, escaped bool, msg string) { if s.config.LogLevel < level { return } @@ -355,16 +430,16 @@ func (s *Sync) logf(level safcm.LogLevel, escaped bool, Host: s.host, Log: Log{ Level: level, - Text: fmt.Sprintf(format, a...), + Text: msg, }, Escaped: escaped, } } func (s *Sync) logDebugf(format string, a ...interface{}) { - s.logf(safcm.LogDebug, false, format, a...) + s.log(safcm.LogDebug, false, fmt.Sprintf(format, a...)) } func (s *Sync) logVerbosef(format string, a ...interface{}) { - s.logf(safcm.LogVerbose, false, format, a...) + s.log(safcm.LogVerbose, false, fmt.Sprintf(format, a...)) } // sendRecv sends a message over conn and waits for the response. Any MsgLog @@ -382,7 +457,7 @@ func (s *Sync) sendRecv(conn *rpc.Conn, msg safcm.Msg) (safcm.Msg, error) { } log, ok := x.(safcm.MsgLog) if ok { - s.logf(log.Level, false, "%s", log.Text) + s.log(log.Level, false, log.Text) continue } return x, nil