Skip to content

dbconfigs: fix regression #4871

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.

Sign up for GitHub

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

Merged
rafael merged 1 commit into from
May 23, 2019
Merged

dbconfigs: fix regression #4871

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions go/vt/dbconfigs/dbconfigs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,12 @@ func Init(defaultSocketFile string) (*DBConfigs, error) {
uc.param.UnixSocket = defaultSocketFile
}

uc.param.Charset = baseConfig.Charset
uc.param.Flags = baseConfig.Flags
if baseConfig.Charset != "" {
Copy link
Copy Markdown
Member

@dasl- dasl- May 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems like the default baseConfig.Charset is utf8: https://github.com/planetscale/vitess/blob/65138f200afdf5d427e415dde9e22be5d5340f7d/go/vt/dbconfigs/dbconfigs.go#L97

Won't this only work if people override the baseConfig.Charset to be the empty string? I'd imagine most people who are using userconfig charsets are not overriding baseConfig.Charset to be the empty string?

uc.param.Charset = baseConfig.Charset
}
if baseConfig.Flags != 0 {
uc.param.Flags = baseConfig.Flags
}
if uc.useSSL {
uc.param.SslCa = baseConfig.SslCa
uc.param.SslCaPath = baseConfig.SslCaPath
Expand Down
127 changes: 115 additions & 12 deletions go/vt/dbconfigs/dbconfigs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,8 @@ import (
)

func TestRegisterFlagsWithSomeFlags(t *testing.T) {
savedDBConfig := dbConfigs
savedBaseConfig := baseConfig
defer func() {
dbConfigs = savedDBConfig
baseConfig = savedBaseConfig
}()
f := saveDBConfigs()
defer f()

dbConfigs = DBConfigs{userConfigs: make(map[string]*userConfig)}
RegisterFlags(Dba, Repl)
Expand All @@ -46,12 +42,8 @@ func TestRegisterFlagsWithSomeFlags(t *testing.T) {
}

func TestInit(t *testing.T) {
savedDBConfig := dbConfigs
savedBaseConfig := baseConfig
defer func() {
dbConfigs = savedDBConfig
baseConfig = savedBaseConfig
}()
f := saveDBConfigs()
defer f()

dbConfigs = DBConfigs{
userConfigs: map[string]*userConfig{
Expand Down Expand Up @@ -169,6 +161,100 @@ func TestInit(t *testing.T) {
if !reflect.DeepEqual(dbc.userConfigs[Dba].param, want.userConfigs[Dba].param) {
t.Errorf("dbc: \n%#v, want \n%#v", dbc.userConfigs[Dba].param, want.userConfigs[Dba].param)
}

// Test that baseConfig does not override Charset and Flag if they're
// not specified.
baseConfig = mysql.ConnParams{
Host: "a",
Port: 1,
Uname: "b",
Pass: "c",
DbName: "d",
UnixSocket: "e",
SslCa: "g",
SslCaPath: "h",
SslCert: "i",
SslKey: "j",
}
dbConfigs = DBConfigs{
userConfigs: map[string]*userConfig{
App: {
param: mysql.ConnParams{
Uname: "app",
Pass: "apppass",
UnixSocket: "socket",
Charset: "f",
},
},
AppDebug: {
useSSL: true,
},
Dba: {
useSSL: true,
param: mysql.ConnParams{
Uname: "dba",
Pass: "dbapass",
Host: "host",
Flags: 2,
},
},
},
}
dbc, err = Init("default")
if err != nil {
t.Fatal(err)
}
want = &DBConfigs{
userConfigs: map[string]*userConfig{
App: {
param: mysql.ConnParams{
Host: "a",
Port: 1,
Uname: "app",
Pass: "apppass",
UnixSocket: "e",
Charset: "f",
},
},
AppDebug: {
useSSL: true,
param: mysql.ConnParams{
Host: "a",
Port: 1,
UnixSocket: "e",
SslCa: "g",
SslCaPath: "h",
SslCert: "i",
SslKey: "j",
},
},
Dba: {
useSSL: true,
param: mysql.ConnParams{
Host: "a",
Port: 1,
Uname: "dba",
Pass: "dbapass",
UnixSocket: "e",
Flags: 2,
SslCa: "g",
SslCaPath: "h",
SslCert: "i",
SslKey: "j",
},
},
},
}
// Compare individually, otherwise the errors are not readable.
if !reflect.DeepEqual(dbc.userConfigs[App].param, want.userConfigs[App].param) {
t.Errorf("dbc: \n%#v, want \n%#v", dbc.userConfigs[App].param, want.userConfigs[App].param)
}
if !reflect.DeepEqual(dbc.userConfigs[AppDebug].param, want.userConfigs[AppDebug].param) {
t.Errorf("dbc: \n%#v, want \n%#v", dbc.userConfigs[AppDebug].param, want.userConfigs[AppDebug].param)
}
if !reflect.DeepEqual(dbc.userConfigs[Dba].param, want.userConfigs[Dba].param) {
t.Errorf("dbc: \n%#v, want \n%#v", dbc.userConfigs[Dba].param, want.userConfigs[Dba].param)
}
}

func TestAccessors(t *testing.T) {
Expand Down Expand Up @@ -266,3 +352,20 @@ func hupTest(t *testing.T, tmpFile *os.File, oldStr, newStr string) {
t.Fatalf("%s's Password should be '%s'", newStr, newStr)
}
}

func saveDBConfigs() (restore func()) {
savedDBConfigs := DBConfigs{
userConfigs: dbConfigs.userConfigs,
}
savedDBConfigs.DBName.Set(dbConfigs.DBName.Get())
savedDBConfigs.SidecarDBName.Set(dbConfigs.SidecarDBName.Get())
savedBaseConfig := baseConfig
return func() {
dbConfigs := DBConfigs{
userConfigs: savedDBConfigs.userConfigs,
}
dbConfigs.DBName.Set(savedDBConfigs.DBName.Get())
dbConfigs.SidecarDBName.Set(savedDBConfigs.SidecarDBName.Get())
baseConfig = savedBaseConfig
}
}