acl: acl replication routine to report the last error message #10612
Conversation
|
|
acl_endpoint_test.go:507:
Error Trace: acl_endpoint_test.go:507
retry.go:148
retry.go:149
retry.go:103
acl_endpoint_test.go:504
Error: Received unexpected error:
codec.decoder: decodeValue: Cannot decode non-nil codec value into nil error (1 methods)
Test: TestACLEndpoint_ReplicationStatus
There was a problem hiding this comment.
Thank you for the PR! This looks really good. I left a couple comments below for a couple small improvements.
It would also be great to include a changelog entry. A changelog entry can be added in a file named .changelog/10612.txt (named using the PR number). You can see some other examples in that directory for the exact syntax to use.
agent/consul/acl_replication.go
Outdated
| @@ -484,11 +484,12 @@ func (s *Server) IsACLReplicationEnabled() bool { | |||
| s.config.ACLTokenReplication | |||
| } | |||
|
|
|||
| func (s *Server) updateACLReplicationStatusError() { | |||
| func (s *Server) updateACLReplicationStatusError(errorMsg error) { | |||
There was a problem hiding this comment.
Since we are already doing a err != nil check in the caller, we were thinking it would be safer to accept a string here instead of an error. That way no new callers can accidentally pass a nil error.
| func (s *Server) updateACLReplicationStatusError(errorMsg error) { | |
| func (s *Server) updateACLReplicationStatusError(errorMsg string) { |
which I guess will requires a change to the line below that uses errorMsg.
dnephin
added
the
waiting-reply
dnephin
removed
the
waiting-reply
|
🍒 If backport labels were added before merging, cherry-picking will start automatically. To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/423688. |
This PR adds the new field
LastErrorMessageto theACLReplicationStatusendpoint. Whenever the Goroutine executing therunACLReplicatorencounters an error, bothLastErrorandLastErrorMessagefield in the endpoint are updated.Test
TestACLReplication_TokensRedactedis updated to check also theLastErrorMessagefield.Fixes #10521.