Milo: Clean up builds that are no longer current.

milo/appengine/buildbot/pubsub.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package buildbot
 
 import (
         "bytes"
         "compress/gzip"
         "compress/zlib"
@@ skipping 162 matching lines @@
         // Extract OS and OS Family
         if v, ok := hostInfo["os family"]; ok {
                 family = v
         }
         if v, ok := hostInfo["os version"]; ok {
                 version = v
         }
         return
 }
 
+// Marks a build as finished and expired.
+func expireBuild(c context.Context, b *buildbotBuild) error {
+        finished := float64(clock.Now(c).Unix())
+        if b.TimeStamp != nil {
+                finished = float64(*b.TimeStamp)
+        }
+        results := int(2)
+        b.Times[1] = &finished
+        b.Finished = true
+        b.Results = &results
+        return ds.Put(c, b)
+}
+
 // PubSubHandler is a webhook that stores the builds coming in from pubsub.
 func PubSubHandler(ctx *router.Context) {
         c, h, r := ctx.Context, ctx.Writer, ctx.Request
 
         msg := pubSubSubscription{}
         defer r.Body.Close()
         dec := json.NewDecoder(r.Body)
         if err := dec.Decode(&msg); err != nil {
                 logging.WithError(err).Errorf(
                         c, "Could not decode message.  %s", err)
@@ skipping 83 matching lines @@
                 if buildExists {
                         buildCounter.Add(
                                 c, 1, false, build.Master, build.Buildername, build.Finished, "Replaced")
                 } else {
                         buildCounter.Add(
                                 c, 1, false, build.Master, build.Buildername, build.Finished, "New")
                 }
 
         }
         if master != nil {
+                // Store the master json into the datastore.
                 err = putDSMasterJSON(c, master, internal)
                 if err != nil {
                         logging.WithError(err).Errorf(
                                 c, "Could not save master in datastore %s", err)
                         // This is transient, we do want PubSub to retry.
                         h.WriteHeader(500)
                         return
                 }
+
+                // Extract current builds data out of the master json, and use it to

[estaab, 2016/10/20 03:30:39]

This function is pretty long by this point. Is there another logical block you
can take out of it?

[hinoka, 2016/10/26 01:28:04]

Done.

+                // clean up expired builds.
+                q := ds.NewQuery("buildbotBuild").
+                        Eq("finished", false).
+                        Eq("master", master.Name)
+                builds := []*buildbotBuild{}
+                err := ds.GetAll(c, q, &builds)
+                if err != nil {
+                        logging.WithError(err).Errorf(c, "Could not load current builds from master %s",
+                                master.Name)
+                        h.WriteHeader(500)
+                        return
+                }
+                for _, b := range builds {
+                        builder, ok := master.Builders[b.Buildername]
+                        if !ok {
+                                // Mark this build due to builder being removed.
+                                logging.Infof(c, "Expiring %s/%s/%d due to builder being removed",
+                                        master.Name, b.Buildername, b.Number)
+                                err = expireBuild(c, b)
+                                if err != nil {
+                                        logging.WithError(err).Errorf(c, "Could not expire build")
+                                        h.WriteHeader(500)
+                                        return
+                                }
+                        }
+
+                        found := false
+                        for _, bnum := range builder.CurrentBuilds {
+                                if b.Number == bnum {
+                                        found = true
+                                        break
+                                }
+                        }
+                        if !found {
+                                // Mark this build due to build not current anymore.
+                                logging.Infof(c, "Expiring %s/%s/%d due to build not current",
+                                        master.Name, b.Buildername, b.Number)
+                                err = expireBuild(c, b)
+                                if err != nil {
+                                        logging.WithError(err).Errorf(c, "Could not expire build")
+                                        h.WriteHeader(500)
+                                        return
+                                }
+                        }
+                }
         }
         h.WriteHeader(200)
 }