[#1800] Don't drop /ipns/persistentcache records from datastore cache

Author: placer14

repo/migrations/Migration026.go

@@ -2,6 +2,7 @@ package migrations
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/ipfs/go-ipfs/repo/fsrepo"
 	ds "gx/ipfs/QmUadX5EcvrBmxAV9sE7wUWtWSqxns5K84qKJBixmcT1w9/go-datastore"
@@ -49,6 +50,9 @@ func (cleanIPNSRecordsFromDatastore) Up(repoPath, databasePassword string, testn
 
 	log.Debugf("found %d IPNS records to cull...", len(results))
 	for _, rawResult := range results {
+		if strings.HasPrefix(rawResult.Key, "/ipns/persistentcache") {
+			continue
+		}
 		rec := new(ipnspb.IpnsEntry)
 		if err = proto.Unmarshal(rawResult.Value, rec); err != nil {
 			log.Warningf("failed unmarshaling record (%s): %s", rawResult.Key, err.Error())

repo/migrations/Migration026_test.go

@@ -12,10 +12,11 @@ import (
 
 func TestCleanIPNSRecordsMigration(t *testing.T) {
 	var (
-		basePath  = schema.GenerateTempPath()
-		ipnsKey   = "/ipns/shoulddelete"
-		otherKey  = "/ipfs/shouldNOTdelete"
-		migration = cleanIPNSRecordsFromDatastore{}
+		basePath             = schema.GenerateTempPath()
+		ipnsKey              = "/ipns/shoulddelete"
+		ipnsFalsePositiveKey = "/ipns/persistentcache/shouldNOTdelete"
+		otherKey             = "/ipfs/shouldNOTdelete"
+		migration            = cleanIPNSRecordsFromDatastore{}
 
 		testRepoPath, err = schema.OpenbazaarPathTransform(basePath, true)
 	)
@@ -46,6 +47,10 @@ func TestCleanIPNSRecordsMigration(t *testing.T) {
 	if err != nil {
 		t.Fatal("unable to put ipns record")
 	}
+	err = r.Datastore().Put(ds.NewKey(ipnsFalsePositiveKey), []byte("randomdata"))
+	if err != nil {
+		t.Fatal("unable to put other record")
+	}
 	err = r.Datastore().Put(ds.NewKey(otherKey), []byte("randomdata"))
 	if err != nil {
 		t.Fatal("unable to put other record")
@@ -60,6 +65,13 @@ func TestCleanIPNSRecordsMigration(t *testing.T) {
 	if _, err := r.Datastore().Get(ds.NewKey(ipnsKey)); err != ds.ErrNotFound {
 		t.Errorf("expected the IPNS record to be removed, but was not")
 	}
+	if val, err := r.Datastore().Get(ds.NewKey(ipnsFalsePositiveKey)); err != nil {
+		t.Errorf("expected the false-positive record to be present, but was not")
+	} else {
+		if !bytes.Equal([]byte("randomdata"), val) {
+			t.Errorf("expected the false-positive record data to be intact, but was not")
+		}
+	}
 	if val, err := r.Datastore().Get(ds.NewKey(otherKey)); err != nil {
 		t.Errorf("expected the other record to be present, but was not")
 	} else {