add legacy retry and delete file

legacy/legacy-dataset.go

@@ -89,6 +89,7 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
@@ -235,10 +236,12 @@ func LoadGeoliteDataset(filename string, bucketname string) (*GeoIP, error) {
 	if err != nil {
 		return nil, err
 	}
-	// TODO - looks like this sometimes fails.  Perhaps should retry.
+	defer os.Remove(dataFileName)
+
 	gi, err := Open(dataFileName, filename)
 	if err != nil {
 		log.Println("Could not open GeoIP database.  Retrying.")
+		// TODO - looks like this retry ALWAYS fails.  Look into why.
 		gi, err = Open(dataFileName, filename)
 		if err != nil {
 			return nil, errors.New("could not open GeoIP database")

loader/loader.go

@@ -67,6 +67,7 @@ func FindFile(fn string, zrdr *zip.Reader) (io.ReadCloser, error) {
 }
 
 // UncompressGzFile reads a .gz file from GCS and write it to a local file.
+// Consumer should delete the file when finished.
 func UncompressGzFile(ctx context.Context, bucketName string, fileName string, outputFile string) error {
 	ctx = context.Background()
 	client, err := storage.NewClient(ctx)
@@ -90,6 +91,7 @@ func UncompressGzFile(ctx context.Context, bucketName string, fileName string, o
 		log.Println(err)
 		return err
 	}
+	// TODO - this could be done incrementally, to use less memory.
 	data, err := ioutil.ReadAll(gzr)
 	if err != nil {
 		return err