post workers: Cleanup, tests

node/repo/memrepo.go

@@ -3,12 +3,13 @@ package repo
 import (
 	"context"
 	"encoding/json"
+	"github.com/filecoin-project/lotus/node/config"
+	"github.com/google/uuid"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sync"
 
-	"github.com/google/uuid"
 	"github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/namespace"
 	dssync "github.com/ipfs/go-datastore/sync"
@@ -19,7 +20,6 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
 	"github.com/filecoin-project/lotus/extern/sector-storage/stores"
-	"github.com/filecoin-project/lotus/node/config"
 )
 
 type MemRepo struct {
@@ -36,6 +36,9 @@ type MemRepo struct {
 	keystore   map[string]types.KeyInfo
 	blockstore blockstore.Blockstore
 
+	sc      *stores.StorageConfig
+	tempDir string
+
 	// given a repo type, produce the default config
 	configF func(t RepoType) interface{}
 
@@ -51,9 +54,7 @@ type lockedMemRepo struct {
 	t   RepoType
 	sync.RWMutex
 
-	tempDir string
-	token   *byte
-	sc      *stores.StorageConfig
+	token *byte
 }
 
 func (lmem *lockedMemRepo) GetStorage() (stores.StorageConfig, error) {
@@ -61,13 +62,13 @@ func (lmem *lockedMemRepo) GetStorage() (stores.StorageConfig, error) {
 		return stores.StorageConfig{}, err
 	}
 
-	if lmem.sc == nil {
-		lmem.sc = &stores.StorageConfig{StoragePaths: []stores.LocalPath{
+	if lmem.mem.sc == nil {
+		lmem.mem.sc = &stores.StorageConfig{StoragePaths: []stores.LocalPath{
 			{Path: lmem.Path()},
 		}}
 	}
 
-	return *lmem.sc, nil
+	return *lmem.mem.sc, nil
 }
 
 func (lmem *lockedMemRepo) SetStorage(c func(*stores.StorageConfig)) error {
@@ -77,7 +78,7 @@ func (lmem *lockedMemRepo) SetStorage(c func(*stores.StorageConfig)) error {
 
 	_, _ = lmem.GetStorage()
 
-	c(lmem.sc)
+	c(lmem.mem.sc)
 	return nil
 }
 
@@ -97,8 +98,8 @@ func (lmem *lockedMemRepo) Path() string {
 	lmem.Lock()
 	defer lmem.Unlock()
 
-	if lmem.tempDir != "" {
-		return lmem.tempDir
+	if lmem.mem.tempDir != "" {
+		return lmem.mem.tempDir
 	}
 
 	t, err := ioutil.TempDir(os.TempDir(), "lotus-memrepo-temp-")
@@ -113,32 +114,38 @@ func (lmem *lockedMemRepo) Path() string {
 		if err := os.MkdirAll(filepath.Join(t, "deal-staging"), 0755); err != nil {
 			panic(err)
 		}
-		if err := config.WriteStorageFile(filepath.Join(t, fsStorageConfig), stores.StorageConfig{
-			StoragePaths: []stores.LocalPath{
-				{Path: t},
-			}}); err != nil {
-			panic(err)
-		}
-
-		b, err := json.MarshalIndent(&stores.LocalStorageMeta{
-			ID:       stores.ID(uuid.New().String()),
-			Weight:   10,
-			CanSeal:  true,
-			CanStore: true,
-		}, "", "  ")
-		if err != nil {
-			panic(err)
-		}
-
-		if err := ioutil.WriteFile(filepath.Join(t, "sectorstore.json"), b, 0644); err != nil {
-			panic(err)
-		}
+	}
+	if lmem.t == StorageMiner || lmem.t == Worker {
+		lmem.initSectorStore(t)
 	}
 
-	lmem.tempDir = t
+	lmem.mem.tempDir = t
 	return t
 }
 
+func (lmem *lockedMemRepo) initSectorStore(t string) {
+	if err := config.WriteStorageFile(filepath.Join(t, fsStorageConfig), stores.StorageConfig{
+		StoragePaths: []stores.LocalPath{
+			{Path: t},
+		}}); err != nil {
+		panic(err)
+	}
+
+	b, err := json.MarshalIndent(&stores.LocalStorageMeta{
+		ID:       stores.ID(uuid.New().String()),
+		Weight:   10,
+		CanSeal:  true,
+		CanStore: true,
+	}, "", "  ")
+	if err != nil {
+		panic(err)
+	}
+
+	if err := ioutil.WriteFile(filepath.Join(t, "sectorstore.json"), b, 0644); err != nil {
+		panic(err)
+	}
+}
+
 var _ Repo = &MemRepo{}
 
 // MemRepoOptions contains options for memory repo
@@ -207,6 +214,18 @@ func (mem *MemRepo) Lock(t RepoType) (LockedRepo, error) {
 	}, nil
 }
 
+func (mem *MemRepo) Cleanup() {
+	mem.api.Lock()
+	defer mem.api.Unlock()
+
+	if mem.tempDir != "" {
+		if err := os.RemoveAll(mem.tempDir); err != nil {
+			log.Errorw("cleanup test memrepo", "error", err)
+		}
+		mem.tempDir = ""
+	}
+}
+
 func (lmem *lockedMemRepo) Readonly() bool {
 	return false
 }
@@ -231,20 +250,12 @@ func (lmem *lockedMemRepo) Close() error {
 		return ErrClosedRepo
 	}
 
-	if lmem.tempDir != "" {
-		if err := os.RemoveAll(lmem.tempDir); err != nil {
-			return err
-		}
-		lmem.tempDir = ""
-	}
-
 	lmem.mem.token = nil
 	lmem.mem.api.Lock()
 	lmem.mem.api.ma = nil
 	lmem.mem.api.Unlock()
 	<-lmem.mem.repoLock // unlock
 	return nil
-
 }
 
 func (lmem *lockedMemRepo) Datastore(_ context.Context, ns string) (datastore.Batching, error) {