Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Override default tsa in instance config #722

Merged
merged 1 commit into from
Jul 17, 2024
+15 −7
Merged

Override default tsa in instance config #722

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/worldmock/worldmock.go
View file
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ func (w *WorldMock) Run() error {
}

func (w *WorldMock) serv(netconn net.Conn) error {
cl := client.NewPsqlClient(netconn, port.DefaultRouterPortType, "", false)
cl := client.NewPsqlClient(netconn, port.DefaultRouterPortType, "", false, "")

err := cl.Init(nil)

2 changes: 1 addition & 1 deletion coordinator/provider/coordinator.go
View file
Original file line number Diff line number Diff line change
@@ -1129,7 +1129,7 @@ func (qc *qdbCoordinator) RemoveTaskGroup(ctx context.Context) error {

// TODO : unit tests
func (qc *qdbCoordinator) PrepareClient(nconn net.Conn, pt port.RouterPortType) (CoordinatorClient, error) {
cl := psqlclient.NewPsqlClient(nconn, pt, "", false)
cl := psqlclient.NewPsqlClient(nconn, pt, "", false, "")

tlsconfig := qc.tlsconfig
if pt == port.UnixSocketPortType {
3 changes: 3 additions & 0 deletions pkg/config/router.go
View file
Original file line number Diff line number Diff line change
@@ -57,6 +57,9 @@ type Router struct {
UseInitSQL bool `json:"use_init_sql" toml:"use_init_sql" yaml:"use_init_sql"`
UseCoordinatorInit bool `json:"use_coordinator_init" toml:"use_coordinator_init" yaml:"use_coordinator_init"`

/* default */
DefaultTSA string `json:"default_target_session_attrs" toml:"default_target_session_attrs" yaml:"default_target_session_attrs"`

MemqdbBackupPath string `json:"memqdb_backup_path" toml:"memqdb_backup_path" yaml:"memqdb_backup_path"`
MemqdbPersistent bool `json:"memqdb_persistent" toml:"memqdb_persistent" yaml:"memqdb_persistent"`
RouterMode string `json:"router_mode" toml:"router_mode" yaml:"router_mode"`
9 changes: 7 additions & 2 deletions router/client/client.go
View file
Original file line number Diff line number Diff line change
@@ -215,8 +215,13 @@ func (cl *PsqlClient) SetRouteHint(rh routehint.RouteHint) {
cl.activeRh = rh
}

func NewPsqlClient(pgconn conn.RawConn, pt port.RouterPortType, defaultRouteBehaviour string, showNoticeMessages bool) *PsqlClient {
tsa := config.TargetSessionAttrsRW
func NewPsqlClient(pgconn conn.RawConn, pt port.RouterPortType, defaultRouteBehaviour string, showNoticeMessages bool, intanseDefaultTsa string) *PsqlClient {
var tsa string
if intanseDefaultTsa != "" {
tsa = intanseDefaultTsa
} else {
tsa = config.TargetSessionAttrsRW
}

// enforce default port behaviour
if pt == port.RORouterPortType {
4 changes: 2 additions & 2 deletions router/client/client_test.go
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ func TestCancel(t *testing.T) {
return 12, nil
}).Times(1)

client := client.NewPsqlClient(rconn, port.DefaultRouterPortType, "BLOCK", false)
client := client.NewPsqlClient(rconn, port.DefaultRouterPortType, "BLOCK", false, "")

err := client.Init(nil)
assert.Equal(uint32(7), client.CancelMsg().ProcessID)
@@ -85,7 +85,7 @@ func TestNoGSSAPI(t *testing.T) {
return 4, nil
}).Times(1)

client := client.NewPsqlClient(rconn, port.DefaultRouterPortType, "BLOCK", false)
client := client.NewPsqlClient(rconn, port.DefaultRouterPortType, "BLOCK", false, "")

err := client.Init(nil)
assert.Equal(exprErr, err)
2 changes: 1 addition & 1 deletion router/rulerouter/rulerouter.go
View file
Original file line number Diff line number Diff line change
@@ -170,7 +170,7 @@ func NewRouter(tlsconfig *tls.Config, rcfg *config.Router, notifier *notifier.No

// TODO : unit tests
func (r *RuleRouterImpl) PreRoute(conn net.Conn, pt port.RouterPortType) (rclient.RouterClient, error) {
cl := rclient.NewPsqlClient(conn, pt, r.Config().Qr.DefaultRouteBehaviour, r.Config().ShowNoticeMessages)
cl := rclient.NewPsqlClient(conn, pt, r.Config().Qr.DefaultRouteBehaviour, r.Config().ShowNoticeMessages, r.Config().DefaultTSA)

tlsConfig := r.tlsconfig
if pt == port.UnixSocketPortType {
Loading