This repository has been archived by the owner on Mar 24, 2023. It is now read-only.
make the state manager safe to use in parallel #932
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
add a test that makes many updates to the state in parallel add a function to update and return updated state
![codeclimate[bot]](https://github.com/avatars/in/9403?s=60&v=4){kind=small}
dexhorthy
reviewed
May 9, 2019
dexhorthy
reviewed
May 9, 2019
| } | ||
|
|
||
| // SerializeNamespace serializes to disk the namespace to use for helm template | ||
| func (m *MManager) SerializeNamespace(namespace string) error { | ||
| debug := level.Debug(log.With(m.Logger, "method", "serializeHelmValues")) | ||
| debug := level.Debug(log.With(m.Logger, "method", "serializeNamespace")) |
dexhorthy
reviewed
May 9, 2019
| return nil | ||
| state.V1.Kustomize = kustomize | ||
| return state, nil | ||
| }) |
There was a problem hiding this comment.
I am loving all the code we get to remove as a side effect of this refactor 😄
dexhorthy
reviewed
May 9, 2019
dexhorthy
reviewed
May 9, 2019
| @@ -497,7 +493,7 @@ func TestMManager_ResetLifecycle(t *testing.T) { | |||
| t.Run(tt.name, func(t *testing.T) { | |||
| req := require.New(t) | |||
| m := &MManager{ | |||
| Logger: log.NewNopLogger(), | |||
| Logger: &logger.TestLogger{T: t}, | |||
there can never be too many tests
laverya
force-pushed
the
race-free-state-updates
branch
from
0b4b060
to
420b2bc
Compare
laverya
force-pushed
the
race-free-state-updates
branch
from
449faf6
to
0388f58
Compare
dexhorthy
approved these changes
May 9, 2019
dexhorthy
reviewed
May 10, 2019
pkg/state/manager.go
Outdated
| Name: metadata.Name, | ||
| updatedState, err := updater(currentState.Versioned()) | ||
| if err != nil { | ||
| return VersionedState{}, errors.Wrap(err, "run state update function in safe updater") |
There was a problem hiding this comment.
any reason not to return nil here?
There was a problem hiding this comment.
Oh is State not an interface?
There was a problem hiding this comment.
🤦♂
I wrote that when it returned VersionedState
There was a problem hiding this comment.
This compiles for me
diff --git a/pkg/state/manager.go b/pkg/state/manager.go
index e2842e5e..adee747a 100644
--- a/pkg/state/manager.go
+++ b/pkg/state/manager.go
@@ -92,7 +92,7 @@ func (m *MManager) StateUpdate(updater Update) (State, error) {
currentState, err := m.TryLoad()
if err != nil {
- return VersionedState{}, errors.Wrap(err, "tryLoad in safe updater")
+ return nil, errors.Wrap(err, "tryLoad in safe updater")
}
updatedState, err := updater(currentState.Versioned())There was a problem hiding this comment.
Yeah - thus the commit (made at the same time as your comment - 10:54 😆)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I Did
make the state manager safe to use in parallel
How I Did it
All state updates are now protected by locks.
How to verify it
Look at the unit test that attempts to create a race condition by hammering one field of the state in parallel
Description for the Changelog
Fixed a race condition in ship state updates
Picture of a Ship (not required but encouraged)