Skip to content

Fix issue with tablet_template_url in HealthCheck #3959

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
michael-berlin merged 2 commits into from
May 22, 2018
Merged

Fix issue with tablet_template_url in HealthCheck #3959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a850f00
Make template loader public so it can be called when starting vtgate
May 22, 2018
e202ec7
Rename function and add comments for clarity.
May 22, 2018
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: 2 additions & 0 deletions go/cmd/vtgate/vtgate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ func main() {
vtg := vtgate.Init(context.Background(), healthCheck, resilientServer, *cell, *retryCount, tabletTypes)

servenv.OnRun(func() {
// Flags are parsed now. Parse the template using the actual flag value and overwrite the current template.
discovery.ParseTabletURLTemplateFromFlag()
addStatusParts(vtg)
})
servenv.RunDefault()
Expand Down
8 changes: 4 additions & 4 deletions go/vt/discovery/healthcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ const (
)

func init() {
loadTabletURLTemplate()
// Flags are not parsed at this point and the default value of the flag (just the hostname) will be used.
ParseTabletURLTemplateFromFlag()
}

// loadTabletURLTemplate loads or reloads the URL template.
// Should only be used independently for testing.
func loadTabletURLTemplate() {
// ParseTabletURLTemplateFromFlag loads or reloads the URL template.
func ParseTabletURLTemplateFromFlag() {
tabletURLTemplate = template.New("")
_, err := tabletURLTemplate.Parse(*tabletURLTemplateString)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion go/vt/discovery/healthcheck_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ func TestTemplate(t *testing.T) {

func TestDebugURLFormatting(t *testing.T) {
flag.Set("tablet_url_template", "https://{{.GetHostNameLevel 0}}.bastion.{{.Tablet.Alias.Cell}}.corp")
loadTabletURLTemplate()
ParseTabletURLTemplateFromFlag()

tablet := topo.NewTablet(0, "cell", "host.dc.domain")
ts := []*TabletStats{
Expand Down