Skip to content

Apply vttablet command line flags regardless of whether the tablet is… #4814

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
sougou merged 2 commits into from
Apr 17, 2019
Merged

Apply vttablet command line flags regardless of whether the tablet is… #4814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
068c5f8
Apply vttablet command line flags regardless of whether the tablet is…
dasl- Apr 16, 2019
f23777d
fix bug discovered by tests
dasl- Apr 17, 2019
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
30 changes: 13 additions & 17 deletions go/vt/dbconfigs/dbconfigs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,27 +237,23 @@ func HasConnectionParams() bool {
// is used to initialize the per-user conn params.
func Init(defaultSocketFile string) (*DBConfigs, error) {
// The new base configs, if set, supersede legacy settings.
if HasConnectionParams() {
for _, uc := range dbConfigs.userConfigs {
for _, uc := range dbConfigs.userConfigs {
if HasConnectionParams() {
uc.param.Host = baseConfig.Host
uc.param.Port = baseConfig.Port
uc.param.UnixSocket = baseConfig.UnixSocket
uc.param.Charset = baseConfig.Charset
uc.param.Flags = baseConfig.Flags
if uc.useSSL {
uc.param.SslCa = baseConfig.SslCa
uc.param.SslCaPath = baseConfig.SslCaPath
uc.param.SslCert = baseConfig.SslCert
uc.param.SslKey = baseConfig.SslKey
uc.param.ServerName = baseConfig.ServerName
}
} else if uc.param.UnixSocket == "" && uc.param.Host == "" {
uc.param.UnixSocket = defaultSocketFile
}
} else {
// Use supplied socket value if conn parameters are not specified.
for _, uc := range dbConfigs.userConfigs {
if uc.param.UnixSocket == "" && uc.param.Host == "" {
uc.param.UnixSocket = defaultSocketFile
}

uc.param.Charset = baseConfig.Charset
uc.param.Flags = baseConfig.Flags
if uc.useSSL {
Copy link
Copy Markdown
Collaborator

@deepthi deepthi Apr 17, 2019

Choose a reason for hiding this comment

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

I'm not sure whether these should be left out when using a socket. @sougou what do you think?

Copy link
Copy Markdown
Contributor

@sougou sougou Apr 17, 2019

Choose a reason for hiding this comment

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

It's not very useful to use SSL for sockets, but we don't care.

uc.param.SslCa = baseConfig.SslCa
uc.param.SslCaPath = baseConfig.SslCaPath
uc.param.SslCert = baseConfig.SslCert
uc.param.SslKey = baseConfig.SslKey
uc.param.ServerName = baseConfig.ServerName
}
}

Expand Down