-
Notifications
You must be signed in to change notification settings - Fork 287
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
feature: add saga persistence layer #649
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
560829c
feat: add round robin in remote module (#622)
xjlgod a65247f
feature: add saga persistence layer
1eb7d80
optimize: remove generic interface Serializer
38cae2e
Merge remote-tracking branch 'origin/master' into feature/saga-db
2277140
Merge remote-tracking branch 'upstream/feature/saga' into feature/sag…
3a4581a
chore: move constants to new location
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package loadbalance | ||
|
||
import ( | ||
"math" | ||
"sort" | ||
"sync" | ||
"sync/atomic" | ||
|
||
getty "github.com/apache/dubbo-getty" | ||
) | ||
|
||
var sequence int32 | ||
|
||
func RoundRobinLoadBalance(sessions *sync.Map, s string) getty.Session { | ||
// collect sync.Map adderToSession | ||
// filter out closed session instance | ||
adderToSession := make(map[string]getty.Session, 0) | ||
// map has no sequence, we should sort it to make sure the sequence is always the same | ||
adders := make([]string, 0) | ||
sessions.Range(func(key, value interface{}) bool { | ||
session := key.(getty.Session) | ||
if session.IsClosed() { | ||
sessions.Delete(key) | ||
} else { | ||
adderToSession[session.RemoteAddr()] = session | ||
adders = append(adders, session.RemoteAddr()) | ||
} | ||
return true | ||
}) | ||
sort.Strings(adders) | ||
// adderToSession eq 0 means there are no available session | ||
if len(adderToSession) == 0 { | ||
return nil | ||
} | ||
index := getPositiveSequence() % len(adderToSession) | ||
return adderToSession[adders[index]] | ||
} | ||
|
||
func getPositiveSequence() int { | ||
for { | ||
current := atomic.LoadInt32(&sequence) | ||
var next int32 | ||
if current == math.MaxInt32 { | ||
next = 0 | ||
} else { | ||
next = current + 1 | ||
} | ||
if atomic.CompareAndSwapInt32(&sequence, current, next) { | ||
return int(current) | ||
} | ||
} | ||
} |
100 changes: 100 additions & 0 deletions
100
pkg/remoting/loadbalance/round_robin_loadbalance_test.go
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package loadbalance | ||
|
||
import ( | ||
"fmt" | ||
"math" | ||
"sync" | ||
"testing" | ||
|
||
"github.com/golang/mock/gomock" | ||
"github.com/stretchr/testify/assert" | ||
|
||
"github.com/seata/seata-go/pkg/remoting/mock" | ||
) | ||
|
||
func TestRoundRobinLoadBalance_Normal(t *testing.T) { | ||
ctrl := gomock.NewController(t) | ||
sessions := &sync.Map{} | ||
|
||
for i := 0; i < 10; i++ { | ||
session := mock.NewMockTestSession(ctrl) | ||
session.EXPECT().IsClosed().Return(i == 2).AnyTimes() | ||
session.EXPECT().RemoteAddr().Return(fmt.Sprintf("%d", i)).AnyTimes() | ||
sessions.Store(session, fmt.Sprintf("session-%d", i+1)) | ||
} | ||
|
||
for i := 0; i < 10; i++ { | ||
if i == 2 { | ||
continue | ||
} | ||
result := RoundRobinLoadBalance(sessions, "some_xid") | ||
assert.Equal(t, fmt.Sprintf("%d", i), result.RemoteAddr()) | ||
assert.NotNil(t, result) | ||
assert.False(t, result.IsClosed()) | ||
} | ||
} | ||
|
||
func TestRoundRobinLoadBalance_OverSequence(t *testing.T) { | ||
ctrl := gomock.NewController(t) | ||
sessions := &sync.Map{} | ||
sequence = math.MaxInt32 | ||
|
||
for i := 0; i < 10; i++ { | ||
session := mock.NewMockTestSession(ctrl) | ||
session.EXPECT().IsClosed().Return(false).AnyTimes() | ||
session.EXPECT().RemoteAddr().Return(fmt.Sprintf("%d", i)).AnyTimes() | ||
sessions.Store(session, fmt.Sprintf("session-%d", i+1)) | ||
} | ||
|
||
for i := 0; i < 10; i++ { | ||
// over sequence here | ||
if i == 0 { | ||
result := RoundRobinLoadBalance(sessions, "some_xid") | ||
assert.Equal(t, "7", result.RemoteAddr()) | ||
assert.NotNil(t, result) | ||
assert.False(t, result.IsClosed()) | ||
continue | ||
} | ||
result := RoundRobinLoadBalance(sessions, "some_xid") | ||
assert.Equal(t, fmt.Sprintf("%d", i-1), result.RemoteAddr()) | ||
assert.NotNil(t, result) | ||
assert.False(t, result.IsClosed()) | ||
} | ||
} | ||
|
||
func TestRoundRobinLoadBalance_All_Closed(t *testing.T) { | ||
ctrl := gomock.NewController(t) | ||
sessions := &sync.Map{} | ||
for i := 0; i < 10; i++ { | ||
session := mock.NewMockTestSession(ctrl) | ||
session.EXPECT().IsClosed().Return(true).AnyTimes() | ||
sessions.Store(session, fmt.Sprintf("session-%d", i+1)) | ||
} | ||
if result := RoundRobinLoadBalance(sessions, "some_xid"); result != nil { | ||
t.Errorf("Expected nil, actual got %+v", result) | ||
} | ||
} | ||
|
||
func TestRoundRobinLoadBalance_Empty(t *testing.T) { | ||
sessions := &sync.Map{} | ||
if result := RoundRobinLoadBalance(sessions, "some_xid"); result != nil { | ||
t.Errorf("Expected nil, actual got %+v", result) | ||
} | ||
} |
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
package serializer | ||
|
||
import ( | ||
"bytes" | ||
"encoding/gob" | ||
"encoding/json" | ||
"github.com/pkg/errors" | ||
) | ||
|
||
type ParamsSerializer struct{} | ||
|
||
func (ParamsSerializer) Serialize(object any) (string, error) { | ||
result, err := json.Marshal(object) | ||
return string(result), err | ||
} | ||
|
||
func (ParamsSerializer) Deserialize(object string) (any, error) { | ||
var result any | ||
err := json.Unmarshal([]byte(object), &result) | ||
return result, err | ||
} | ||
|
||
type ErrorSerializer struct{} | ||
|
||
func (ErrorSerializer) Serialize(object error) ([]byte, error) { | ||
var buffer bytes.Buffer | ||
encoder := gob.NewEncoder(&buffer) | ||
if object != nil { | ||
err := encoder.Encode(object.Error()) | ||
return buffer.Bytes(), err | ||
} | ||
return nil, nil | ||
} | ||
|
||
func (ErrorSerializer) Deserialize(object []byte) (error, error) { | ||
var errorMsg string | ||
buffer := bytes.NewReader(object) | ||
encoder := gob.NewDecoder(buffer) | ||
err := encoder.Decode(&errorMsg) | ||
|
||
return errors.New(errorMsg), err | ||
} |
17 changes: 17 additions & 0 deletions
17
pkg/saga/statemachine/engine/serializer/serializer_test.go
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package serializer | ||
|
||
import ( | ||
"github.com/pkg/errors" | ||
"github.com/stretchr/testify/assert" | ||
"testing" | ||
) | ||
|
||
func TestErrorSerializer(t *testing.T) { | ||
serializer := ErrorSerializer{} | ||
expected := errors.New("This is a test error") | ||
serialized, err := serializer.Serialize(expected) | ||
assert.Nil(t, err) | ||
actual, err := serializer.Deserialize(serialized) | ||
assert.Nil(t, err) | ||
assert.Equal(t, expected.Error(), actual.Error()) | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
package db | ||
|
||
import ( | ||
"database/sql" | ||
"github.com/pkg/errors" | ||
"github.com/seata/seata-go/pkg/util/log" | ||
) | ||
|
||
const TimeLayout = "2006-01-02 15:04:05.999999999-07:00" | ||
|
||
type ExecStatement[T any] func(obj T, stmt *sql.Stmt) (int64, error) | ||
|
||
type ScanRows[T any] func(rows *sql.Rows) (T, error) | ||
|
||
type Store struct { | ||
db *sql.DB | ||
} | ||
|
||
func SelectOne[T any](db *sql.DB, sql string, fn ScanRows[T], args ...any) (T, error) { | ||
var result T | ||
log.Debugf("Preparing SQL: %s", sql) | ||
stmt, err := db.Prepare(sql) | ||
defer stmt.Close() | ||
if err != nil { | ||
return result, err | ||
} | ||
|
||
log.Debugf("setting params to Stmt: %v", args) | ||
rows, err := stmt.Query(args...) | ||
defer rows.Close() | ||
if err != nil { | ||
return result, nil | ||
} | ||
|
||
if rows.Next() { | ||
return fn(rows) | ||
} | ||
return result, errors.New("no target selected") | ||
} | ||
|
||
func SelectList[T any](db *sql.DB, sql string, fn ScanRows[T], args ...any) ([]T, error) { | ||
result := make([]T, 0) | ||
|
||
log.Debugf("Preparing SQL: %s", sql) | ||
stmt, err := db.Prepare(sql) | ||
defer stmt.Close() | ||
if err != nil { | ||
return result, err | ||
} | ||
|
||
log.Debugf("setting params to Stmt: %v", args) | ||
rows, err := stmt.Query(args...) | ||
defer rows.Close() | ||
if err != nil { | ||
return result, err | ||
} | ||
|
||
for rows.Next() { | ||
obj, err := fn(rows) | ||
if err != nil { | ||
return result, err | ||
} | ||
result = append(result, obj) | ||
} | ||
|
||
return result, nil | ||
} | ||
|
||
func ExecuteUpdate[T any](db *sql.DB, sql string, fn ExecStatement[T], obj T) (int64, error) { | ||
log.Debugf("Preparing SQL: %s", sql) | ||
stmt, err := db.Prepare(sql) | ||
defer stmt.Close() | ||
if err != nil { | ||
return 0, err | ||
} | ||
|
||
log.Debugf("setting params to Stmt: %v", obj) | ||
|
||
rowsAffected, err := fn(obj, stmt) | ||
if err != nil { | ||
return rowsAffected, err | ||
} | ||
|
||
return rowsAffected, nil | ||
} | ||
|
||
func ExecuteUpdateArgs(db *sql.DB, sql string, args ...any) (int64, error) { | ||
log.Debugf("Preparing SQL: %s", sql) | ||
stmt, err := db.Prepare(sql) | ||
defer stmt.Close() | ||
if err != nil { | ||
return 0, err | ||
} | ||
|
||
log.Debugf("setting params to Stmt: %v", args) | ||
|
||
result, err := stmt.Exec(args...) | ||
if err != nil { | ||
return 0, err | ||
} | ||
return result.RowsAffected() | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generics are also used here, need to remove them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suggest we can keep this generic function. It maps the
Rows
to arbitrary typeT
, which I think it is a good abstract in my POV. If not using generics, we can only change the return type tointerface{}
, and use type conversiondb.SelectOne(...).(StateMachineInstance)
at the invocation.