fix: open datastores after migration (#255)

Otherwise they can mess up migrations

Author: achingbrain

.aegir.js

@@ -4,7 +4,10 @@ module.exports = {
   webpack: {
     node: {
       // this is needed until level stops using node buffers in browser code
-      Buffer: true
+      Buffer: true,
+
+      // needed by binary-parse-stream
+      stream: true
     }
   }
 }

package.json

@@ -64,7 +64,7 @@
     "debug": "^4.1.0",
     "err-code": "^2.0.0",
     "interface-datastore": "^2.0.0",
-    "ipfs-repo-migrations": "^5.0.1",
+    "ipfs-repo-migrations": "^5.0.2",
     "ipfs-utils": "^2.3.1",
     "ipld-block": "^0.10.0",
     "it-map": "^1.0.2",

src/constants.js

@@ -1,5 +1,5 @@
 'use strict'
 
 module.exports = {
-  repoVersion: 8
+  repoVersion: 9
 }

src/index.js

@@ -111,6 +111,17 @@ class IpfsRepo {
       await this._checkInitialized()
       this.lockfile = await this._openLock(this.path)
       log('acquired repo.lock')
+
+      const isCompatible = await this.version.check(constants.repoVersion)
+
+      if (!isCompatible) {
+        if (await this._isAutoMigrationEnabled()) {
+          await this._migrate(constants.repoVersion)
+        } else {
+          throw new ERRORS.InvalidRepoVersionError('Incompatible repo versions. Automatic migrations disabled. Please migrate the repo manually.')
+        }
+      }
+
       log('creating datastore')
       this.datastore = backends.create('datastore', pathJoin(this.path, 'datastore'), this.options)
       await this.datastore.open()
@@ -125,15 +136,6 @@ class IpfsRepo {
       this.pins = backends.create('pins', pathJoin(this.path, 'pins'), this.options)
       await this.pins.open()
 
-      const isCompatible = await this.version.check(constants.repoVersion)
-      if (!isCompatible) {
-        if (await this._isAutoMigrationEnabled()) {
-          await this._migrate(constants.repoVersion)
-        } else {
-          throw new ERRORS.InvalidRepoVersionError('Incompatible repo versions. Automatic migrations disabled. Please migrate the repo manually.')
-        }
-      }
-
       this.closed = false
       log('all opened')
     } catch (err) {

test/interop-test.js

@@ -29,11 +29,6 @@ module.exports = (repo) => {
       expect(values.map((value) => value.data.length)).to.eql([2659, 12783])
     })
 
-    it('reads pin set from the datastore', async () => {
-      const val = await repo.datastore.get(new Key('/local/pins'))
-      expect(mh.toB58String(val)).to.equal('QmYAuyf2LzMba65NnhxLtGJxixKNUev9qYSu4MYM88hdwK')
-    })
-
     it('reads DHT records from the datastore', async () => {
       const val = await repo.datastore.get(new Key('/AHE5I5B7TY'))
       expect(uint8ArrayToString(val, 'base16')).to.eql('0a0601c9d4743f9e12097465737476616c75651a2212201d22e2a5e140e5cd20d88fc59cd560f4887c7d9acf938ddb24d7207eac40fd2f')

test/repo-test.js

@@ -56,12 +56,12 @@ module.exports = (repo) => {
 
     describe('version', () => {
       afterEach(async () => {
-        await repo.version.set(8)
+        await repo.version.set(9)
       })
 
       it('get version', async () => {
         const version = await repo.version.get()
-        expect(version).to.equal(8)
+        expect(version).to.equal(9)
       })
 
       it('set version', async () => {