diff options
| -rw-r--r-- | dump.go | 9 | ||||
| -rw-r--r-- | poll.go | 5 |
2 files changed, 12 insertions, 2 deletions
@@ -49,6 +49,8 @@ func dumpDroplets(w http.ResponseWriter) { // status of the hypervisors func dumpHypervisors(w http.ResponseWriter) { + var totalDroplets int + var totalUnknownDroplets int for _, h := range me.hypers { // lastpoll time.Time // the last time the hypervisor polled dur := time.Since(h.lastpoll) @@ -57,12 +59,19 @@ func dumpHypervisors(w http.ResponseWriter) { for name, t := range h.lastDroplets { dur := time.Since(t) tmp := shell.FormatDuration(dur) + totalDroplets += 1 d := findDroplet(name) if d == nil { + totalUnknownDroplets += 1 fmt.Fprintln(w, "\t", h.pb.Hostname, "name =", name, "lastpoll:", tmp) } else { fmt.Fprintln(w, "\t", h.pb.Hostname, "name =", name, "lastpoll:", tmp, d.CurrentState) } } } + if totalUnknownDroplets == 0 { + fmt.Fprintln(w, "\tTotal Droplets", totalDroplets) + } else { + fmt.Fprintln(w, "\tTotal Droplets", totalDroplets, "total libvirt only droplets =", totalUnknownDroplets) + } } @@ -194,15 +194,16 @@ func uptimeCheck() (bool, string) { summary += "(killcount=" + fmt.Sprintf("%d", me.killcount) + ")" } last := time.Since(me.unstable) + s := strings.TrimSpace(shell.FormatDuration(last)) if last > me.clusterStableDuration { // the cluster has not been stable for 10 seconds - s := strings.TrimSpace(shell.FormatDuration(last)) summary += "(stable=" + s + ")" + } else { + summary += "(unstable=" + s + ")" } for _, d := range missing { summary += fmt.Sprint("\nmissing droplet: ", d.Hostname, " current state ", d.CurrentState) } - summary += fmt.Sprint("\ngrid stable for: ", shell.FormatDuration(time.Since(me.unstable))) if good { return good, "GOOD=true " + summary } |