luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

keyring: fix flake in replication-after-election test (#13749) 

The test for simulating a key rotation across leader elections was
flaky because we weren't waiting for a leader election and was
checking the server configs rather than raft for which server was
currently the leader. Fixing the flake revealed a bug in the test that
we weren't ensuring the new leader was running its own replication, so
it wouldn't pick up the key material from the previous follower.
This commit is contained in:
Tim Gross 2022-07-15 11:09:09 -04:00 committed by GitHub
parent aa15e0fe7e
commit 05cd91155d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nomad/encrypter_test.go
View File

@ -189,15 +189,11 @@ func TestKeyringReplicator(t *testing.T) {
checkReplicationFn := func(keyID string) func() bool {
return func() bool {
for _, srv := range servers {
if srv == leader {
continue
}
keyPath := filepath.Join(srv.GetConfig().DataDir, "keystore",
keyID+nomadKeystoreExtension)
if _, err := os.Stat(keyPath); err != nil {
return false
}
}
return true
}
@ -245,9 +241,6 @@ func TestKeyringReplicator(t *testing.T) {
// key, and triggering a leader election.
for _, srv := range servers {
if srv == leader {
continue
}
srv.keyringReplicator.stop()
}
@ -258,14 +251,17 @@ func TestKeyringReplicator(t *testing.T) {
err = leader.leadershipTransfer()
require.NoError(t, err)
testutil.WaitForLeader(t, leader.RPC)
for _, srv := range servers {
if ok, _ := srv.getLeader(); !ok {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
go srv.keyringReplicator.run(ctx)
} else {
if ok, _ := srv.getLeader(); ok {
t.Logf("new leader is %s", srv.config.NodeName)
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
t.Logf("replicating on %s", srv.config.NodeName)
go srv.keyringReplicator.run(ctx)
}
require.Eventually(t, checkReplicationFn(keyID3),