fix(provider): purge keystore datastore after reset

core/commands/commands_test.go

@@ -79,6 +79,7 @@ func TestCommands(t *testing.T) {
 		"/diag/datastore",
 		"/diag/datastore/count",
 		"/diag/datastore/get",
+		"/diag/datastore/put",
 		"/diag/profile",
 		"/diag/sys",
 		"/files",

core/commands/diag.go

@@ -7,9 +7,11 @@ import (
 	"io"
 
 	"github.com/ipfs/go-datastore"
+	"github.com/ipfs/go-datastore/mount"
 	"github.com/ipfs/go-datastore/query"
 	cmds "github.com/ipfs/go-ipfs-cmds"
 	oldcmds "github.com/ipfs/kubo/commands"
+	node "github.com/ipfs/kubo/core/node"
 	fsrepo "github.com/ipfs/kubo/repo/fsrepo"
 )
 
@@ -41,7 +43,11 @@ in production workflows. The datastore format may change between versions.
 
 The daemon must not be running when calling these commands.
 
-EXAMPLE
+When the provider keystore datastores exist on disk (nodes with
+Provide.DHT.SweepEnabled=true), they are automatically mounted into the
+datastore view under /provider/keystore/0/ and /provider/keystore/1/.
+
+EXAMPLES
 
 Inspecting pubsub seqno validator state:
 
@@ -51,10 +57,20 @@ Inspecting pubsub seqno validator state:
   Key: /pubsub/seqno/12D3KooW...
   Hex Dump:
   00000000  18 81 81 c8 91 c0 ea f6  |........|
+
+Writing a test key (debugging only):
+
+  $ ipfs diag datastore put /test/mykey "hello"
+
+Inspecting provider keystore (requires SweepEnabled):
+
+  $ ipfs diag datastore count /provider/keystore/0/
+  $ ipfs diag datastore count /provider/keystore/1/
 `,
 	},
 	Subcommands: map[string]*cmds.Command{
 		"get":   diagDatastoreGetCmd,
+		"put":   diagDatastorePutCmd,
 		"count": diagDatastoreCountCmd,
 	},
 }
@@ -67,6 +83,36 @@ type diagDatastoreGetResult struct {
 	HexDump string `json:"hex_dump,omitempty"`
 }
 
+// openDiagDatastore opens the repo datastore and conditionally mounts any
+// provider keystore datastores that exist on disk. It returns the composite
+// datastore and a cleanup function that must be called when done.
+func openDiagDatastore(env cmds.Environment) (datastore.Datastore, func(), error) {
+	cctx := env.(*oldcmds.Context)
+	repo, err := fsrepo.Open(cctx.ConfigRoot)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to open repo: %w", err)
+	}
+
+	extraMounts, extraCloser, err := node.MountKeystoreDatastores(repo)
+	if err != nil {
+		repo.Close()
+		return nil, nil, err
+	}
+
+	closer := func() {
+		extraCloser()
+		repo.Close()
+	}
+
+	if len(extraMounts) == 0 {
+		return repo.Datastore(), closer, nil
+	}
+
+	mounts := []mount.Mount{{Prefix: datastore.NewKey("/"), Datastore: repo.Datastore()}}
+	mounts = append(mounts, extraMounts...)
+	return mount.New(mounts), closer, nil
+}
+
 var diagDatastoreGetCmd = &cmds.Command{
 	Status: cmds.Experimental,
 	Helptext: cmds.HelpText{
@@ -89,16 +135,14 @@ WARNING: FOR DEBUGGING/TESTING ONLY
 	NoRemote: true,
 	PreRun:   DaemonNotRunning,
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
-		cctx := env.(*oldcmds.Context)
-		repo, err := fsrepo.Open(cctx.ConfigRoot)
+		ds, closer, err := openDiagDatastore(env)
 		if err != nil {
-			return fmt.Errorf("failed to open repo: %w", err)
+			return err
 		}
-		defer repo.Close()
+		defer closer()
 
 		keyStr := req.Arguments[0]
 		key := datastore.NewKey(keyStr)
-		ds := repo.Datastore()
 
 		val, err := ds.Get(req.Context, key)
 		if err != nil {
@@ -133,6 +177,42 @@ WARNING: FOR DEBUGGING/TESTING ONLY
 	},
 }
 
+var diagDatastorePutCmd = &cmds.Command{
+	Status: cmds.Experimental,
+	Helptext: cmds.HelpText{
+		Tagline: "Write a raw key-value pair to the datastore.",
+		ShortDescription: `
+Stores the given value at the specified datastore key.
+
+The daemon must not be running when using this command.
+
+WARNING: FOR DEBUGGING/TESTING ONLY
+`,
+	},
+	Arguments: []cmds.Argument{
+		cmds.StringArg("key", true, false, "Datastore key (e.g., /test/mykey)"),
+		cmds.StringArg("value", true, false, "Value to store (as a string)"),
+	},
+	NoRemote: true,
+	PreRun:   DaemonNotRunning,
+	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
+		ds, closer, err := openDiagDatastore(env)
+		if err != nil {
+			return err
+		}
+		defer closer()
+
+		key := datastore.NewKey(req.Arguments[0])
+		if err := ds.Put(req.Context, key, []byte(req.Arguments[1])); err != nil {
+			return fmt.Errorf("failed to put key: %w", err)
+		}
+		if err := ds.Sync(req.Context, key); err != nil {
+			return fmt.Errorf("failed to sync: %w", err)
+		}
+		return nil
+	},
+}
+
 type diagDatastoreCountResult struct {
 	Prefix string `json:"prefix"`
 	Count  int64  `json:"count"`
@@ -156,15 +236,13 @@ WARNING: FOR DEBUGGING/TESTING ONLY
 	NoRemote: true,
 	PreRun:   DaemonNotRunning,
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
-		cctx := env.(*oldcmds.Context)
-		repo, err := fsrepo.Open(cctx.ConfigRoot)
+		ds, closer, err := openDiagDatastore(env)
 		if err != nil {
-			return fmt.Errorf("failed to open repo: %w", err)
+			return err
 		}
-		defer repo.Close()
+		defer closer()
 
 		prefix := req.Arguments[0]
-		ds := repo.Datastore()
 
 		q := query.Query{
 			Prefix:   prefix,