github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

defer setting the state before returning to avoid stuck in `INITIALIZING` state (#10630) 

* defer setting the state before returning to avoid being stuck in `INITIALIZING` state

* add changelog

* move comment with the right if statement

* ca: report state transition error from setSTate

* update comment to reflect state transition

Co-authored-by: Daniel Nephin <dnephin@hashicorp.com>
pull/10798/head
Dhia Ayachi 2021-08-05 14:51:19 -04:00 committed by hc-github-team-consul-core
parent e3f751b87b
commit fe1a2f5d9b
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/10630.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
ca: fixed a bug when ca provider fail and provider state is stuck in `INITIALIZING` state.
```

24
agent/consul/leader_connect_ca.go
View File

@ -97,7 +97,7 @@ func (c *CAManager) reset() {
// setState attempts to update the CA state to the given state. // setState attempts to update the CA state to the given state.
// Valid state transitions are: // Valid state transitions are:
// //
// caStateInitialized -> <any state> // caStateInitialized -> <any state except caStateInitializing>
// caStateUninitialized -> caStateInitializing // caStateUninitialized -> caStateInitializing
// caStateUninitialized -> caStateReconfig // caStateUninitialized -> caStateReconfig
// //
@ -110,16 +110,24 @@ func (c *CAManager) setState(newState caState, validateState bool) (caState, err
state := c.state state := c.state
if !validateState || if !validateState ||
state == caStateInitialized || (state == caStateInitialized && newState != caStateInitializing) ||
(state == caStateUninitialized && newState == caStateInitializing) || (state == caStateUninitialized && newState == caStateInitializing) ||
(state == caStateUninitialized && newState == caStateReconfig) { (state == caStateUninitialized && newState == caStateReconfig) {
c.state = newState c.state = newState
} else { } else {
return state, fmt.Errorf("CA is already in state %q", state) return state, &caStateError{Current: state}
} }
return state, nil return state, nil
} }
type caStateError struct {
Current caState
}
func (e *caStateError) Error() string {
return fmt.Sprintf("CA is already in state %q", e.Current)
}
// setPrimaryRoots updates the most recently seen roots from the primary. // setPrimaryRoots updates the most recently seen roots from the primary.
func (c *CAManager) setPrimaryRoots(newRoots structs.IndexedCARoots) error { func (c *CAManager) setPrimaryRoots(newRoots structs.IndexedCARoots) error {
c.stateLock.Lock() c.stateLock.Lock()
@ -309,12 +317,12 @@ func (c *CAManager) InitializeCA() (reterr error) {
} }
// Update the state before doing anything else. // Update the state before doing anything else.
oldState, err := c.setState(caStateInitializing, true) _, err := c.setState(caStateInitializing, true)
// if we were already in the initialized state then there is nothing to be done. var errCaState *caStateError
if oldState == caStateInitialized { switch {
case errors.As(err, &errCaState) && errCaState.Current == caStateInitialized:
return nil return nil
} case err != nil:
if err != nil {
return err return err
} }