Fix key upgrade and raft tests (#6949)

hashicorp · Jun 21, 2019 · 91b5300 · 91b5300
1 parent 430d9f9
commit 91b5300
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/vault/external_tests/raft/raft_test.go b/vault/external_tests/raft/raft_test.go
@@ -28,6 +28,8 @@ func TestRaft_ShamirUnseal(t *testing.T) {
 	})
 	coreConfig := &vault.CoreConfig{
 		Logger: logger,
+		// TODO: remove this later
+		DisablePerformanceStandby: true,
 	}
 	i := 0
 	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
@@ -66,6 +68,8 @@ func TestRaft_SnapshotAPI(t *testing.T) {
 	})
 	coreConfig := &vault.CoreConfig{
 		Logger: logger,
+		// TODO: remove this later
+		DisablePerformanceStandby: true,
 	}
 	i := 0
 	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
@@ -199,6 +203,8 @@ func TestRaft_SnapshotAPI_RekeyRotate_Backward(t *testing.T) {
 			})
 			coreConfig := &vault.CoreConfig{
 				Logger: logger,
+				// TODO: remove this later
+				DisablePerformanceStandby: true,
 			}
 			i := 0
 			cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
@@ -384,6 +390,8 @@ func TestRaft_SnapshotAPI_RekeyRotate_Forward(t *testing.T) {
 			})
 			coreConfig := &vault.CoreConfig{
 				Logger: logger,
+				// TODO: remove this later
+				DisablePerformanceStandby: true,
 			}
 			i := 0
 			cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
@@ -581,6 +589,8 @@ func TestRaft_SnapshotAPI_DifferentCluster(t *testing.T) {
 	})
 	coreConfig := &vault.CoreConfig{
 		Logger: logger,
+		// TODO: remove this later
+		DisablePerformanceStandby: true,
 	}
 	i := 0
 	cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{

diff --git a/vault/logical_system.go b/vault/logical_system.go
@@ -2389,7 +2389,8 @@ 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 {
+			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
@@ -1290,6 +1290,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
 		}