eventstore: fix migrations annoyingly rerunning.
This commit is contained in:
@@ -20,7 +20,7 @@ func (b *BoltBackend) migrate() error {
|
|||||||
val := bucket.Get([]byte("version"))
|
val := bucket.Get([]byte("version"))
|
||||||
|
|
||||||
var version uint16 = target
|
var version uint16 = target
|
||||||
if val == nil {
|
if val != nil {
|
||||||
version = binary.BigEndian.Uint16(val)
|
version = binary.BigEndian.Uint16(val)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ const (
|
|||||||
DB_VERSION byte = 'v'
|
DB_VERSION byte = 'v'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const target = 2
|
||||||
|
|
||||||
func (b *LMDBBackend) migrate() error {
|
func (b *LMDBBackend) migrate() error {
|
||||||
return b.lmdbEnv.Update(func(txn *lmdb.Txn) error {
|
return b.lmdbEnv.Update(func(txn *lmdb.Txn) error {
|
||||||
val, err := txn.Get(b.settingsStore, []byte("version"))
|
val, err := txn.Get(b.settingsStore, []byte("version"))
|
||||||
@@ -21,13 +23,11 @@ func (b *LMDBBackend) migrate() error {
|
|||||||
return fmt.Errorf("failed to get db version: %w", err)
|
return fmt.Errorf("failed to get db version: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var version uint16 = 1
|
var version uint16 = target
|
||||||
if err == nil {
|
if err == nil {
|
||||||
version = binary.BigEndian.Uint16(val)
|
version = binary.BigEndian.Uint16(val)
|
||||||
}
|
}
|
||||||
|
|
||||||
const target = 2
|
|
||||||
|
|
||||||
// do the migrations in increasing steps (there is no rollback)
|
// do the migrations in increasing steps (there is no rollback)
|
||||||
if version < target {
|
if version < target {
|
||||||
log.Printf("[lmdb] migration %d: reindex everything\n", target)
|
log.Printf("[lmdb] migration %d: reindex everything\n", target)
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import (
|
|||||||
"github.com/PowerDNS/lmdb-go/lmdb"
|
"github.com/PowerDNS/lmdb-go/lmdb"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const target = 2
|
||||||
|
|
||||||
func (il *IndexingLayer) migrate() error {
|
func (il *IndexingLayer) migrate() error {
|
||||||
return il.lmdbEnv.Update(func(txn *lmdb.Txn) error {
|
return il.lmdbEnv.Update(func(txn *lmdb.Txn) error {
|
||||||
val, err := txn.Get(il.settings, []byte("version"))
|
val, err := txn.Get(il.settings, []byte("version"))
|
||||||
@@ -16,13 +18,11 @@ func (il *IndexingLayer) migrate() error {
|
|||||||
return fmt.Errorf("failed to get db version: %w", err)
|
return fmt.Errorf("failed to get db version: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var version uint16 = 1
|
var version uint16 = target
|
||||||
if err == nil {
|
if err == nil {
|
||||||
version = binary.BigEndian.Uint16(val)
|
version = binary.BigEndian.Uint16(val)
|
||||||
}
|
}
|
||||||
|
|
||||||
const target = 2
|
|
||||||
|
|
||||||
// do the migrations in increasing steps (there is no rollback)
|
// do the migrations in increasing steps (there is no rollback)
|
||||||
if version < target {
|
if version < target {
|
||||||
log.Printf("[mmm/%s] migration %d: reindex everything\n", il.name, target)
|
log.Printf("[mmm/%s] migration %d: reindex everything\n", il.name, target)
|
||||||
|
|||||||
Reference in New Issue
Block a user