Merge pull request #129 from mcarmonaa/fix/remove-tmp-siva-on-error

pga-create: fix clean temp siva files on indexer error

Author: jfontan

PublicGitArchive/pga-create/process.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"runtime"
+	"runtime/debug"
 	"sort"
 	"strings"
 	"sync"
@@ -139,7 +139,7 @@ func processRepos(
 	rs *model.RepositoryResultSet,
 	stars map[string]uint32,
 ) <-chan *repositoryData {
-	logrus.WithField("workers", runtime.NumCPU()).Info("start processing repos")
+	logrus.WithField("workers", workers).Info("start processing repos")
 	start := time.Now()
 	defer func() {
 		logrus.WithField("elapsed", time.Since(start)).Debug("finished processing repos")
@@ -240,27 +240,34 @@ func (p *processor) process() (*repositoryData, error) {
 
 	mut := p.locker.lock(head.String())
 	mut.Lock()
-	tx, err := p.txer.Begin(context.TODO(), plumbing.NewHash(head.String()))
-	if err != nil {
-		mut.Unlock()
-		return nil, fmt.Errorf("can't start transaction: %s", err)
-	}
 
-	p.repo, err = git.Open(tx.Storer(), nil)
-	if err != nil {
-		mut.Unlock()
-		return nil, fmt.Errorf("can't open git repo: %s", err)
-	}
+	var data *repositoryData
+	err := func() error {
+		defer mut.Unlock()
+
+		tx, err := p.txer.Begin(context.TODO(), plumbing.NewHash(head.String()))
+		if err != nil {
+			return fmt.Errorf("can't start transaction: %s", err)
+		}
+		defer tx.Rollback()
+
+		p.repo, err = git.Open(tx.Storer(), nil)
+		if err != nil {
+			return fmt.Errorf("can't open git repo: %s", err)
+		}
+
+		data, err = p.data()
+		if err != nil {
+			return fmt.Errorf("unable to get repo data: %s", err)
+		}
+
+		return nil
+	}()
 
-	data, err := p.data()
 	if err != nil {
-		mut.Unlock()
-		return nil, fmt.Errorf("unable to get repo data: %s", err)
+		return nil, err
 	}
 
-	mut.Unlock()
-	_ = tx.Rollback()
-
 	log = log.WithField("url", data.URL)
 	var sumOfSivaSizes int64
 	for init := range inits {
@@ -333,6 +340,7 @@ func (p *processor) process() (*repositoryData, error) {
 	data.SivaFiles = sivaFiles(inits)
 	data.Size = sumOfSivaSizes
 
+	debug.FreeOSMemory()
 	return data, nil
 }