Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add redis queue & async message strategy #615

Merged
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
a5365b6
add redis queue & async message strategy
yanjiaxin534 Jan 21, 2025
80e5456
fix bug
yanjiaxin534 Jan 21, 2025
68dacdf
fix ut
yanjiaxin534 Jan 21, 2025
7ede3d8
add redis queue to provider factory
yanjiaxin534 Jan 21, 2025
c09bb82
use shared lock
yanjiaxin534 Jan 21, 2025
9196770
upsert plan state bug fix
yanjiaxin534 Jan 21, 2025
ed90696
upsert with metadata
yanjiaxin534 Jan 21, 2025
1e4466b
lock -global
yanjiaxin534 Jan 21, 2025
5e44338
refine lock
yanjiaxin534 Jan 21, 2025
0228214
global init by keylock as point
yanjiaxin534 Jan 21, 2025
ddd6541
add shared
yanjiaxin534 Jan 21, 2025
55f857a
add log
yanjiaxin534 Jan 21, 2025
1ada571
save planstate
yanjiaxin534 Jan 21, 2025
ce7837e
add log
yanjiaxin534 Jan 21, 2025
22f9a00
store deepcopy
yanjiaxin534 Jan 22, 2025
c6ec625
planState store object not copy
yanjiaxin534 Jan 22, 2025
6ed095f
fix stepid
yanjiaxin534 Jan 22, 2025
b60a3af
update plan state before each step
yanjiaxin534 Jan 22, 2025
2eeaa43
check store result
yanjiaxin534 Jan 22, 2025
0e40e83
upsert plan state log
yanjiaxin534 Jan 22, 2025
690924e
remove point
yanjiaxin534 Jan 22, 2025
1a493dc
remove no use code
yanjiaxin534 Jan 22, 2025
d91296e
delete save summary
yanjiaxin534 Jan 22, 2025
c0c5746
add upsert log
yanjiaxin534 Jan 22, 2025
0e1d16a
add try lock result log& check job id before execute step
yanjiaxin534 Jan 22, 2025
931ec0a
remove no use log
yanjiaxin534 Jan 22, 2025
465bdf5
collect crash log
yanjiaxin534 Jan 22, 2025
085b772
remove some log
yanjiaxin534 Jan 22, 2025
d6ab83f
remove lock in check id
yanjiaxin534 Jan 23, 2025
d30414a
refine log &remove conclude summary in vendor
yanjiaxin534 Jan 23, 2025
50593b4
get operation with namespace &check job id before each step execute
yanjiaxin534 Jan 23, 2025
6c88455
replace unmarshal json
yanjiaxin534 Jan 23, 2025
204f6c8
re add conclude summary
yanjiaxin534 Jan 23, 2025
7c0bed0
extract async reconcile strategy to solution-manager
yanjiaxin534 Jan 23, 2025
502140a
remove no use function
yanjiaxin534 Jan 23, 2025
fd06e26
paging response change to interface{}
yanjiaxin534 Jan 23, 2025
035a0d2
remove no use code
yanjiaxin534 Jan 23, 2025
cfba40a
remove no use code
yanjiaxin534 Jan 23, 2025
4b8db3f
remove no use pkg
yanjiaxin534 Jan 23, 2025
e4332db
fix message type
yanjiaxin534 Jan 23, 2025
59cc036
combine planstate and summary
yanjiaxin534 Jan 23, 2025
6069123
fix type issue
yanjiaxin534 Jan 23, 2025
881cf88
remove remove param in planstate
yanjiaxin534 Jan 23, 2025
e9ebcc5
remove no ouse code
yanjiaxin534 Jan 23, 2025
bd99160
init queue in solution manager
yanjiaxin534 Jan 23, 2025
ed49b08
multi get
yanjiaxin534 Jan 23, 2025
754b5a3
fix test
yanjiaxin534 Jan 23, 2025
1d5919d
add queue provider in ut
yanjiaxin534 Jan 23, 2025
8533ffe
add queue in test fact
yanjiaxin534 Jan 23, 2025
32ebdd8
fix message id bug
yanjiaxin534 Jan 23, 2025
76a9921
save summary one by one
yanjiaxin534 Jan 23, 2025
382b25a
reuse json unmarshal in get result
yanjiaxin534 Jan 23, 2025
03bdb49
fix queue bug
yanjiaxin534 Jan 23, 2025
e7e1e1e
use new unmarshal
yanjiaxin534 Jan 23, 2025
e138572
change planstate to message type
yanjiaxin534 Jan 25, 2025
0142738
fix type issue
yanjiaxin534 Jan 26, 2025
39bacaf
merge apply &get
yanjiaxin534 Jan 26, 2025
89d52f8
refine code
yanjiaxin534 Jan 26, 2025
b702c8c
refine code
yanjiaxin534 Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,7 @@ func NewDeploymentState(deployment model.DeploymentSpec) (model.DeploymentState,

return ret, nil
}
func MergeDeploymentStates(previous *model.DeploymentState, current model.DeploymentState) model.DeploymentState {
if previous == nil {
return current
}
yanjiaxin534 marked this conversation as resolved.
Show resolved Hide resolved
func MergeDeploymentStates(previous model.DeploymentState, current model.DeploymentState) model.DeploymentState {
// merge components
for _, c := range previous.Components {
found := false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ func TestMergeStateAddAComponent(t *testing.T) {
},
})
assert.Nil(t, err)
state := MergeDeploymentStates(&state1, state2)
state := MergeDeploymentStates(state1, state2)
assert.Equal(t, 3, len(state.Components))
assert.Equal(t, 1, len(state.Targets))
assert.Equal(t, "instance", state.TargetComponent["a::T1"])
Expand Down Expand Up @@ -307,7 +307,7 @@ func TestMergeStateRemoveAComponent(t *testing.T) {
},
})
assert.Nil(t, err)
state := MergeDeploymentStates(&state1, state2)
state := MergeDeploymentStates(state1, state2)
assert.Equal(t, 3, len(state.Components))
assert.Equal(t, 1, len(state.Targets))
assert.Equal(t, "instance", state.TargetComponent["a::T1"])
Expand Down Expand Up @@ -367,7 +367,7 @@ func TestMergeStateProviderChange(t *testing.T) {
},
})
assert.Nil(t, err)
state := MergeDeploymentStates(&state1, state2)
state := MergeDeploymentStates(state1, state2)
assert.Equal(t, 3, len(state.Components))
assert.Equal(t, 2, len(state.Targets))
assert.Equal(t, "-instance", state.TargetComponent["a::T1"])
Expand Down Expand Up @@ -427,7 +427,7 @@ func TestMergeStateUnrelated(t *testing.T) {
},
})
assert.Nil(t, err)
state := MergeDeploymentStates(&state1, state2)
state := MergeDeploymentStates(state1, state2)
assert.Equal(t, 5, len(state.Components))
assert.Equal(t, 2, len(state.Targets))
assert.Equal(t, "-instance", state.TargetComponent["a::T1"])
Expand Down Expand Up @@ -493,7 +493,7 @@ func TestMergeStateAddProvider(t *testing.T) {
},
})
assert.Nil(t, err)
state := MergeDeploymentStates(&state1, state2)
state := MergeDeploymentStates(state1, state2)
assert.Equal(t, 3, len(state.Components))
assert.Equal(t, 2, len(state.Targets))
assert.Equal(t, 5, len(state.TargetComponent))
Expand Down
Loading
Loading