Use default schema reload config values when config file is empty (#1…

…6393) Signed-off-by: Matt Lord <[email protected]>
vitessio · Jul 16, 2024 · 6bae50f · 6bae50f
1 parent 6a9bb31
commit 6bae50f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/go/vt/vttablet/tabletserver/tabletenv/config.go b/go/vt/vttablet/tabletserver/tabletenv/config.go
@@ -414,8 +414,6 @@ func (cfg *TabletConfig) UnmarshalJSON(data []byte) (err error) {
 		if err != nil {
 			return err
 		}
-	} else {
-		cfg.SchemaReloadInterval = 0
 	}
 
 	if tmp.SignalSchemaChangeReloadInterval != "" {
@@ -432,8 +430,6 @@ func (cfg *TabletConfig) UnmarshalJSON(data []byte) (err error) {
 		if err != nil {
 			return err
 		}
-	} else {
-		cfg.SchemaChangeReloadTimeout = 0
 	}
 
 	return nil

diff --git a/go/vt/vttablet/tabletserver/tabletenv/config_test.go b/go/vt/vttablet/tabletserver/tabletenv/config_test.go
@@ -56,6 +56,8 @@ func TestConfigParse(t *testing.T) {
 			MaxInnoDBTrxHistLen: 1000,
 			MaxMySQLReplLagSecs: 400,
 		},
+		SchemaChangeReloadTimeout: 30 * time.Second,
+		SchemaReloadInterval:      30 * time.Minute,
 	}
 
 	gotBytes, err := yaml2.Marshal(&cfg)
@@ -91,6 +93,8 @@ replicationTracker: {}
 rowStreamer:
   maxInnoDBTrxHistLen: 1000
   maxMySQLReplLagSecs: 400
+schemaChangeReloadTimeout: 30s
+schemaReloadIntervalSeconds: 30m0s
 txPool: {}
 `
 	assert.Equal(t, wantBytes, string(gotBytes))