From e7d01654c2e0c8f3e35ee6de3e0a3d643d1c2aae Mon Sep 17 00:00:00 2001 From: Violet Hynes Date: Thu, 28 Nov 2024 15:22:11 -0500 Subject: [PATCH] Seal and cleanup cluster before test teardown for TestRaftHA_Recover_Cluster (#29057) * Seal and cleanup cluster before test teardown for TestRaftHA_Recover_Cluster * Remove old cleanup --- vault/external_tests/raftha/raft_ha_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vault/external_tests/raftha/raft_ha_test.go b/vault/external_tests/raftha/raft_ha_test.go index bbeb78eb39..75b1ff9c24 100644 --- a/vault/external_tests/raftha/raft_ha_test.go +++ b/vault/external_tests/raftha/raft_ha_test.go @@ -177,9 +177,6 @@ func testRaftHARecoverCluster(t *testing.T, physBundle *vault.PhysicalBackendBun _, err = leaderClient.Logical().Write("kv/data/test_known_data", kvData) require.NoError(t, err) - // We delete the current cluster. We keep the storage backend so we can recover the cluster - cluster.Cleanup() - // We now have a raft HA cluster with a KVv2 backend enabled and a test data. // We're now going to delete the cluster and create a new raft HA cluster with the same backend storage // and ensure we can recover to a working vault cluster and don't lose the data from the backend storage. @@ -219,6 +216,11 @@ func testRaftHARecoverCluster(t *testing.T, physBundle *vault.PhysicalBackendBun dataAsMap := data.(map[string]interface{}) require.NotNil(t, dataAsMap) require.Equal(t, "awesome", dataAsMap["kittens"]) + + // Ensure no writes are happening before we try to clean it up, to prevent + // issues deleting the files. + clusterRestored.EnsureCoresSealed(t) + clusterRestored.Cleanup() } func TestRaft_HA_ExistingCluster(t *testing.T) {