cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-06 08:03:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dashboard: update the coordinator for new watchers

Browse Source 
New default repo, restart watchers on failure, etc.

Change-Id: Idb2e8e6f65debd07d2fa04d998b8036a00260683
Reviewed-on: https://go-review.googlesource.com/1366
Reviewed-by: Andrew Gerrand <adg@golang.org>
This commit is contained in:
Brad Fitzpatrick 2014-12-11 18:19:15 -08:00
parent 8c1a5674dd
commit a3a1a20bcc
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dashboard/coordinator/main.go
View File

@ -70,7 +70,7 @@ type buildConfig struct {
} }
type watchConfig struct { type watchConfig struct {
repo string // "https://code.google.com/p/go" repo string // "https://go.googlesource.com/go"
dash string // "https://build.golang.org/" (must end in /) dash string // "https://build.golang.org/" (must end in /)
interval time.Duration // Polling interval interval time.Duration // Polling interval
} }
@ -104,8 +104,9 @@ func main() {
addBuilder(buildConfig{name: "linux-386-clang", image: "gobuilders/linux-x86-clang"}) addBuilder(buildConfig{name: "linux-386-clang", image: "gobuilders/linux-x86-clang"})
addBuilder(buildConfig{name: "linux-amd64-clang", image: "gobuilders/linux-x86-clang"}) addBuilder(buildConfig{name: "linux-amd64-clang", image: "gobuilders/linux-x86-clang"})
addWatcher(watchConfig{repo: "https://code.google.com/p/go", dash: "https://build.golang.org/"}) addWatcher(watchConfig{repo: "https://go.googlesource.com/go", dash: "https://build.golang.org/"})
addWatcher(watchConfig{repo: "https://code.google.com/p/gofrontend", dash: "https://build.golang.org/gccgo/"}) // TODO(adg,cmang): fix gccgo watcher
// addWatcher(watchConfig{repo: "https://code.google.com/p/gofrontend", dash: "https://build.golang.org/gccgo/"})
if (*just != "") != (*rev != "") { if (*just != "") != (*rev != "") {
log.Fatalf("--just and --rev must be used together") log.Fatalf("--just and --rev must be used together")
@ -349,14 +350,18 @@ func addBuilder(c buildConfig) {
// returns the part after "docker run" // returns the part after "docker run"
func (conf watchConfig) dockerRunArgs() (args []string) { func (conf watchConfig) dockerRunArgs() (args []string) {
if key := builderKey("watcher"); key != "" { log.Printf("Running watcher with master key %q", masterKey())
if key := masterKey(); len(key) > 0 {
tmpKey := "/tmp/watcher.buildkey" tmpKey := "/tmp/watcher.buildkey"
if _, err := os.Stat(tmpKey); err != nil { if _, err := os.Stat(tmpKey); err != nil {
if err := ioutil.WriteFile(tmpKey, []byte(key), 0600); err != nil { if err := ioutil.WriteFile(tmpKey, key, 0600); err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }
// Images may look for .gobuildkey in / or /root, so provide both.
// TODO(adg): fix images that look in the wrong place.
args = append(args, "-v", tmpKey+":/.gobuildkey") args = append(args, "-v", tmpKey+":/.gobuildkey")
args = append(args, "-v", tmpKey+":/root/.gobuildkey")
} }
args = append(args, args = append(args,
"go-commit-watcher", "go-commit-watcher",
@ -370,7 +375,7 @@ func (conf watchConfig) dockerRunArgs() (args []string) {
func addWatcher(c watchConfig) { func addWatcher(c watchConfig) {
if c.repo == "" { if c.repo == "" {
c.repo = "https://code.google.com/p/go" c.repo = "https://go.googlesource.com/go"
} }
if c.dash == "" { if c.dash == "" {
c.dash = "https://build.golang.org/" c.dash = "https://build.golang.org/"
@ -473,7 +478,13 @@ type buildStatus struct {
// ... // ...
} }
func startWatching(conf watchConfig) error { func startWatching(conf watchConfig) (err error) {
defer func() {
if err != nil {
restartWatcherSoon(conf)
}
}()
log.Printf("Starting watcher for %v", conf.repo)
if err := condUpdateImage("go-commit-watcher"); err != nil { if err := condUpdateImage("go-commit-watcher"); err != nil {
log.Printf("Failed to setup container for commit watcher: %v", err) log.Printf("Failed to setup container for commit watcher: %v", err)
return err return err
@ -481,8 +492,25 @@ func startWatching(conf watchConfig) error {
cmd := exec.Command("docker", append([]string{"run", "-d"}, conf.dockerRunArgs()...)...) cmd := exec.Command("docker", append([]string{"run", "-d"}, conf.dockerRunArgs()...)...)
all, err := cmd.CombinedOutput() all, err := cmd.CombinedOutput()
if err != nil {
log.Printf("Docker run for commit watcher = err:%v, output: %s", err, all) log.Printf("Docker run for commit watcher = err:%v, output: %s", err, all)
return err return err
}
container := strings.TrimSpace(string(all))
// Start a goroutine to wait for the watcher to die.
go func() {
exec.Command("docker", "wait", container).Run()
exec.Command("docker", "rm", "-v", container).Run()
log.Printf("Watcher crashed. Restarting soon.")
restartWatcherSoon(conf)
}()
return nil
}
func restartWatcherSoon(conf watchConfig) {
time.AfterFunc(30*time.Second, func() {
startWatching(conf)
})
} }
func builderKey(builder string) string { func builderKey(builder string) string {