Fix key upgrade and raft tests (#6949)

hashicorp · Jun 21, 2019 · eb13427 · eb13427
1 parent 490bc0f
commit eb13427
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/vault/logical_system.go b/vault/logical_system.go
@@ -2380,8 +2380,9 @@ func (b *SystemBackend) handleRotate(ctx context.Context, req *logical.Request,
 		}
 
 		// Schedule the destroy of the upgrade path
-		time.AfterFunc(keyRotateGracePeriod, func() {
-			if err := b.Core.barrier.DestroyUpgrade(ctx, newTerm); err != nil {
+		time.AfterFunc(KeyRotateGracePeriod, func() {
+			b.Backend.Logger().Debug("cleaning up upgrade keys", "waited", KeyRotateGracePeriod)
+			if err := b.Core.barrier.DestroyUpgrade(b.Core.activeContext, newTerm); err != nil {
 				b.Backend.Logger().Error("failed to destroy upgrade", "term", newTerm, "error", err)
 			}
 		})

diff --git a/vault/testing.go b/vault/testing.go
@@ -1272,6 +1272,7 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 		coreConfig.DevLicenseDuration = base.DevLicenseDuration
 		coreConfig.DisableCache = base.DisableCache
 		coreConfig.LicensingConfig = base.LicensingConfig
+		coreConfig.DisablePerformanceStandby = base.DisablePerformanceStandby
 		if base.BuiltinRegistry != nil {
 			coreConfig.BuiltinRegistry = base.BuiltinRegistry
 		}