Merge pull request #9165 from filecoin-project/release1.17.1/detach-s…

…torage-on-worker-shutdown backport: 9153: detach storage on worker shutdown
filecoin-project · Aug 12, 2022 · 8ecf6f3 · 8ecf6f3
2 parents 98e1282 + a7e99bc
commit 8ecf6f3
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 0 deletions.
diff --git a/api/api_worker.go b/api/api_worker.go
@@ -62,6 +62,7 @@ type Worker interface {
 	StorageLocal(ctx context.Context) (map[storiface.ID]string, error)                   //perm:admin
 	StorageAddLocal(ctx context.Context, path string) error                              //perm:admin
 	StorageDetachLocal(ctx context.Context, path string) error                           //perm:admin
+	StorageDetachAll(ctx context.Context) error                                          //perm:admin
 	StorageRedeclareLocal(ctx context.Context, id *storiface.ID, dropMissing bool) error //perm:admin
 
 	// SetEnabled marks the worker as enabled/disabled. Not that this setting

diff --git a/api/proxy_gen.go b/api/proxy_gen.go
diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz
diff --git a/build/openrpc/gateway.json.gz b/build/openrpc/gateway.json.gz
diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz
diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz
diff --git a/cmd/lotus-worker/main.go b/cmd/lotus-worker/main.go
@@ -129,6 +129,13 @@ var stopCmd = &cli.Command{
 		defer closer()
 
 		ctx := lcli.ReqContext(cctx)
+
+		// Detach any storage associated with this worker
+		err = api.StorageDetachAll(ctx)
+		if err != nil {
+			return err
+		}
+
 		err = api.Shutdown(ctx)
 		if err != nil {
 			return err

diff --git a/cmd/lotus-worker/sealworker/rpc.go b/cmd/lotus-worker/sealworker/rpc.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/mitchellh/go-homedir"
 	"golang.org/x/xerrors"
 
@@ -23,6 +24,8 @@ import (
 	"github.com/filecoin-project/lotus/storage/sealer/storiface"
 )
 
+var log = logging.Logger("sealworker")
+
 func WorkerHandler(authv func(ctx context.Context, token string) ([]auth.Permission, error), remote http.HandlerFunc, a api.Worker, permissioned bool) http.Handler {
 	mux := mux.NewRouter()
 	readerHandler, readerServerOpt := rpcenc.ReaderParamDecoder()
@@ -146,6 +149,23 @@ func (w *Worker) StorageDetachLocal(ctx context.Context, path string) error {
 	return w.LocalStore.ClosePath(ctx, localPath.ID)
 }
 
+func (w *Worker) StorageDetachAll(ctx context.Context) error {
+
+	lps, err := w.LocalStore.Local(ctx)
+	if err != nil {
+		return xerrors.Errorf("getting local path list: %w", err)
+	}
+
+	for _, lp := range lps {
+		err = w.LocalStore.ClosePath(ctx, lp.ID)
+		if err != nil {
+			log.Warnf("unable to close path: %w", err)
+		}
+	}
+
+	return nil
+}
+
 func (w *Worker) StorageRedeclareLocal(ctx context.Context, id *storiface.ID, dropMissing bool) error {
 	return w.LocalStore.Redeclare(ctx, id, dropMissing)
 }

diff --git a/documentation/en/api-v0-methods-worker.md b/documentation/en/api-v0-methods-worker.md
@@ -39,6 +39,7 @@
   * [SetEnabled](#SetEnabled)
 * [Storage](#Storage)
   * [StorageAddLocal](#StorageAddLocal)
+  * [StorageDetachAll](#StorageDetachAll)
   * [StorageDetachLocal](#StorageDetachLocal)
   * [StorageLocal](#StorageLocal)
   * [StorageRedeclareLocal](#StorageRedeclareLocal)
@@ -2121,6 +2122,15 @@ Inputs:
 
 Response: `{}`
 
+### StorageDetachAll
+
+
+Perms: admin
+
+Inputs: `null`
+
+Response: `{}`
+
 ### StorageDetachLocal