isolate: manage lifetime of checker and uploader in main.

client/cmd/isolate/exp_archive.go

 // Copyright 2015 The LUCI Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 80 matching lines @@
 
         // Set up a checker and uploader. We limit the uploader to one concurrent
         // upload, since the uploads are all coming from disk (with the exception of
         // the isolated JSON itself) and we only want a single goroutine reading from
         // disk at once.
         checker := NewChecker(ctx, client)
         uploader := NewUploader(ctx, client, 1)
         archiver := NewTarringArchiver(checker, uploader)
 
         isolSummary, err := archiver.Archive(archiveOpts)
+
+        // Make sure that all pending items have been checked.
+        if err := checker.Close(); err != nil {
+                return err
+        }
+
+        // Make sure that all the uploads have completed successfully.
+        if err := uploader.Close(); err != nil {
+                return err
+        }
+
         printSummary(isolSummary)
         if c.dumpJSON != "" {
                 f, err := os.OpenFile(c.dumpJSON, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
                 if err != nil {
                         return err
                 }
                 writeSummaryJSON(f, isolSummary)
                 f.Close()
         }
 
@@ skipping 59 matching lines @@
 }
 
 func hashFile(path string) (isolated.HexDigest, error) {
         f, err := os.Open(path)
         if err != nil {
                 return "", err
         }
         defer f.Close()
         return isolated.Hash(f)
 }