scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 19:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't copy HA lock file during migration (#5503)

Browse Source
This commit is contained in:
Jim Kalafut
2018-10-12 09:29:15 -07:00
committed by GitHub
parent ab29c4230a
commit 46ccb88184
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
command/operator_migrate.go
View File

@@ -16,6 +16,7 @@ import (
"github.com/hashicorp/vault/command/server"
"github.com/hashicorp/vault/helper/logging"
"github.com/hashicorp/vault/physical"
"github.com/hashicorp/vault/vault"
"github.com/mitchellh/cli"
"github.com/pkg/errors"
"github.com/posener/complete"
@@ -196,7 +197,7 @@ func (c *OperatorMigrateCommand) migrate(config *migratorConfig) error {
// migrateAll copies all keys in lexicographic order.
func (c *OperatorMigrateCommand) migrateAll(ctx context.Context, from physical.Backend, to physical.Backend) error {
return dfsScan(ctx, from, func(ctx context.Context, path string) error {
if path < c.flagStart || path == migrationLock {
if path < c.flagStart || path == migrationLock || path == vault.CoreLockPath {
return nil
}