Close all storage paths on worker shutdown

filecoin-project · Aug 10, 2022 · f390c18 · f390c18
1 parent 3244969
commit f390c18
Show file tree

Hide file tree

Showing 9 changed files with 42 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,10 @@ var stopCmd = &cli.Command{
 		defer closer()
 
 		ctx := lcli.ReqContext(cctx)
+
+		// Detach any storage associated with this worker
+		api.StorageDetachAll(ctx)
+
 		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
@@ -146,6 +146,20 @@ 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 {
+		w.LocalStore.ClosePath(ctx, lp.ID)
+	}
+
+	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