backport of commit e29842e49e807b574dccb8e87bc20947a6d21438 (#21712)
Co-authored-by: Steven Clark <steven.clark@hashicorp.com>
This commit is contained in:
parent
f881304cc5
commit
5772e81ae8
|
@ -496,6 +496,7 @@ func TestCertStorageMetrics(t *testing.T) {
|
||||||
}
|
}
|
||||||
cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
|
cluster := vault.NewTestCluster(t, coreConfig, &vault.TestClusterOptions{
|
||||||
HandlerFunc: vaulthttp.Handler,
|
HandlerFunc: vaulthttp.Handler,
|
||||||
|
NumCores: 1,
|
||||||
})
|
})
|
||||||
cluster.Start()
|
cluster.Start()
|
||||||
defer cluster.Cleanup()
|
defer cluster.Cleanup()
|
||||||
|
@ -577,9 +578,9 @@ func TestCertStorageMetrics(t *testing.T) {
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// Reload the Mount - Otherwise Stored Certificate Counts Will Not Be Populated
|
// Reload the Mount - Otherwise Stored Certificate Counts Will Not Be Populated
|
||||||
_, err = client.Logical().Write("/sys/plugins/reload/backend", map[string]interface{}{
|
// Sealing cores as plugin reload triggers the race detector - VAULT-13635
|
||||||
"plugin": "pki",
|
testhelpers.EnsureCoresSealed(t, cluster)
|
||||||
})
|
testhelpers.EnsureCoresUnsealed(t, cluster)
|
||||||
|
|
||||||
// By reading the auto-tidy endpoint, we ensure that initialize has completed (which has a write lock on auto-tidy)
|
// By reading the auto-tidy endpoint, we ensure that initialize has completed (which has a write lock on auto-tidy)
|
||||||
_, err = client.Logical().Read("/pki/config/auto-tidy")
|
_, err = client.Logical().Read("/pki/config/auto-tidy")
|
||||||
|
|
Loading…
Reference in New Issue