Improve VTOrc config handling to support dynamic variables

changelog/22.0/22.0.0/summary.md

@@ -5,6 +5,7 @@
 - **[Major Changes](#major-changes)**
   - **[RPC Changes](#rpc-changes)**
   - **[Prefer not promoting a replica that is currently taking a backup](#reparents-prefer-not-backing-up)**
+  - **[VTOrc Config File Changes](#vtorc-config-file-changes)**
 
 
 ## <a id="major-changes"/>Major Changes</a>
@@ -25,4 +26,25 @@ For planned reparents, hosts taking backups with a backup engine other than `bui
 valid candidates. This means they will never get promoted - not even if there's no other candidates.
 
 Note that behavior for `builtin` backups remains unchanged: a replica that is currently taking a `builtin` backup will
-never be promoted, neither by planned nor by emergency reparents.
+never be promoted, neither by planned nor by emergency reparents.
+
+### <a id="vtorc-config-file-changes"/>VTOrc Config File Changes</a>
+
+The configuration file for VTOrc has been updated to now support dynamic fields. The old `--config` parameter has been removed. The alternative is to use the `--config-file` parameter. The configuration can now be provided in both json, yaml or any other format that [viper](https://github.com/spf13/viper) supports.
+
+The following fields can be dynamically changed - 
+1. `InstancePollTime`
+2. `PreventCrossCellFailover`
+3. `SnapshotTopologyInterval`
+4. `ReasonableReplicationLag`
+5. `AuditToBackend`
+6. `AuditToSyslog`
+7. `AuditPurgeDuration`
+8. `WaitReplicasTimeout`
+9. `TolerableReplicationLag`
+10. `TopoInformationRefreshDuration`
+11. `RecoveryPollDuration`
+12. `AllowEmergencyReparent`
+13. `ChangeTabletsWithErrantGtidToDrained`
+
+To upgrade to the newer version of the configuration file, first switch to using the flags in your current deployment before upgrading. Then you can switch to using the configuration file in the newer release.

examples/common/scripts/vtorc-up.sh

@@ -11,7 +11,9 @@ vtorc \
   $TOPOLOGY_FLAGS \
   --logtostderr \
   --alsologtostderr \
-  --config="${script_dir}/../vtorc/config.json" \
+  --config-path="${script_dir}/../vtorc/" \
+  --config-name="config.yaml" \
+  --config-type="yml" \
   --port $port \
   > "${log_dir}/vtorc.out" 2>&1 &
 

examples/common/vtorc/config.yaml

@@ -0,0 +1 @@
+InstancePollTime: 1s

go/cmd/vtorc/cli/cli.go

@@ -20,6 +20,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"vitess.io/vitess/go/acl"
+	"vitess.io/vitess/go/viperutil/debug"
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/vtorc/config"
@@ -29,8 +30,7 @@ import (
 )
 
 var (
-	configFile string
-	Main       = &cobra.Command{
+	Main = &cobra.Command{
 		Use:   "vtorc",
 		Short: "VTOrc is the automated fault detection and repair tool in Vitess.",
 		Example: `vtorc \
@@ -51,22 +51,16 @@ var (
 
 func run(cmd *cobra.Command, args []string) {
 	servenv.Init()
-	config.UpdateConfigValuesFromFlags()
 	inst.RegisterStats()
 
 	log.Info("starting vtorc")
-	if len(configFile) > 0 {
-		config.ForceRead(configFile)
-	} else {
-		config.Read("/etc/vtorc.conf.json", "conf/vtorc.conf.json", "vtorc.conf.json")
-	}
-	if config.Config.AuditToSyslog {
+	if config.GetAuditToSyslog() {
 		inst.EnableAuditSyslog()
 	}
 	config.MarkConfigurationLoaded()
 
 	// Log final config values to debug if something goes wrong.
-	config.LogConfigValues()
+	log.Infof("Running with Configuration - %v", debug.AllSettings())
 	server.StartVTOrcDiscovery()
 
 	server.RegisterVTOrcAPIEndpoints()
@@ -96,7 +90,5 @@ func init() {
 	servenv.MoveFlagsToCobraCommand(Main)
 
 	logic.RegisterFlags(Main.Flags())
-	config.RegisterFlags(Main.Flags())
 	acl.RegisterFlags(Main.Flags())
-	Main.Flags().StringVar(&configFile, "config", "", "config file name")
 }

go/flags/endtoend/vtorc.txt

@@ -25,7 +25,6 @@ Flags:
       --catch-sigpipe                                               catch and ignore SIGPIPE on stdout and stderr if specified
       --change-tablets-with-errant-gtid-to-drained                  Whether VTOrc should be changing the type of tablets with errant GTIDs to DRAINED
       --clusters_to_watch strings                                   Comma-separated list of keyspaces or keyspace/shards that this instance will monitor and repair. Defaults to all clusters in the topology. Example: "ks1,ks2/-80"
-      --config string                                               config file name
       --config-file string                                          Full path of the config file (with extension) to use. If set, --config-path, --config-type, and --config-name are ignored.
       --config-file-not-found-handling ConfigFileNotFoundHandling   Behavior when a config file is not found. (Options: error, exit, ignore, warn) (default warn)
       --config-name string                                          Name of the config file (without extension) to search for. (default "vtconfig")

go/test/endtoend/cluster/cluster_process.go

@@ -1301,7 +1301,6 @@ func (cluster *LocalProcessCluster) NewVTOrcProcess(config VTOrcConfiguration) *
 		VtctlProcess: *base,
 		LogDir:       cluster.TmpDirectory,
 		Config:       config,
-		WebPort:      cluster.GetAndReservePort(),
 		Port:         cluster.GetAndReservePort(),
 	}
 }

go/test/endtoend/cluster/vtorc_process.go

@@ -43,20 +43,28 @@ type VTOrcProcess struct {
 	ExtraArgs   []string
 	ConfigPath  string
 	Config      VTOrcConfiguration
-	WebPort     int
+	NoOverride  bool
 	proc        *exec.Cmd
 	exit        chan error
 }
 
 type VTOrcConfiguration struct {
-	Debug                                 bool
-	ListenAddress                         string
-	RecoveryPeriodBlockSeconds            int
-	TopologyRefreshSeconds                int    `json:",omitempty"`
-	PreventCrossDataCenterPrimaryFailover bool   `json:",omitempty"`
-	LockShardTimeoutSeconds               int    `json:",omitempty"`
-	ReplicationLagQuery                   string `json:",omitempty"`
-	FailPrimaryPromotionOnLagMinutes      int    `json:",omitempty"`
+	InstancePollTime                     string `json:"instance-poll-time,omitempty"`
+	SnapshotTopologyInterval             string `json:"snapshot-topology-interval,omitempty"`
+	PreventCrossCellFailover             bool   `json:"prevent-cross-cell-failover,omitempty"`
+	ReasonableReplicationLag             string `json:"reasonable-replication-lag,omitempty"`
+	AuditToBackend                       bool   `json:"audit-to-backend,omitempty"`
+	AuditToSyslog                        bool   `json:"audit-to-syslog,omitempty"`
+	AuditPurgeDuration                   string `json:"audit-purge-duration,omitempty"`
+	WaitReplicasTimeout                  string `json:"wait-replicas-timeout,omitempty"`
+	TolerableReplicationLag              string `json:"tolerable-replication-lag,omitempty"`
+	TopoInformationRefreshDuration       string `json:"topo-information-refresh-duration,omitempty"`
+	RecoveryPollDuration                 string `json:"recovery-poll-duration,omitempty"`
+	AllowEmergencyReparent               string `json:"allow-emergency-reparent,omitempty"`
+	ChangeTabletsWithErrantGtidToDrained bool   `json:"change-tablets-with-errant-gtid-to-drained,omitempty"`
+	LockShardTimeoutSeconds              int    `json:",omitempty"`
+	ReplicationLagQuery                  string `json:",omitempty"`
+	FailPrimaryPromotionOnLagMinutes     int    `json:",omitempty"`
 }
 
 // ToJSONString will marshal this configuration as JSON
@@ -65,12 +73,12 @@ func (config *VTOrcConfiguration) ToJSONString() string {
 	return string(b)
 }
 
-func (config *VTOrcConfiguration) AddDefaults(webPort int) {
-	config.Debug = true
-	if config.RecoveryPeriodBlockSeconds == 0 {
-		config.RecoveryPeriodBlockSeconds = 1
-	}
-	config.ListenAddress = fmt.Sprintf(":%d", webPort)
+func (config *VTOrcConfiguration) addValuesToCheckOverride() {
+	config.InstancePollTime = "10h"
+}
+
+func (orc *VTOrcProcess) RewriteConfiguration() error {
+	return os.WriteFile(orc.ConfigPath, []byte(orc.Config.ToJSONString()), 0644)
 }
 
 // Setup starts orc process with required arguements
@@ -91,7 +99,9 @@ func (orc *VTOrcProcess) Setup() (err error) {
 	orc.ConfigPath = configFile.Name()
 
 	// Add the default configurations and print them out
-	orc.Config.AddDefaults(orc.WebPort)
+	if !orc.NoOverride {
+		orc.Config.addValuesToCheckOverride()
+	}
 	log.Errorf("configuration - %v", orc.Config.ToJSONString())
 	_, err = configFile.WriteString(orc.Config.ToJSONString())
 	if err != nil {
@@ -111,15 +121,18 @@ func (orc *VTOrcProcess) Setup() (err error) {
 		"--topo_implementation", orc.TopoImplementation,
 		"--topo_global_server_address", orc.TopoGlobalAddress,
 		"--topo_global_root", orc.TopoGlobalRoot,
-		"--config", orc.ConfigPath,
+		"--config-file", orc.ConfigPath,
 		"--port", fmt.Sprintf("%d", orc.Port),
-		// This parameter is overriden from the config file, added here to just verify that we indeed use the config file paramter over the flag
-		"--recovery-period-block-duration", "10h",
-		"--instance-poll-time", "1s",
-		// Faster topo information refresh speeds up the tests. This doesn't add any significant load either
-		"--topo-information-refresh-duration", "3s",
 		"--bind-address", "127.0.0.1",
 	)
+	if !orc.NoOverride {
+		orc.proc.Args = append(orc.proc.Args,
+			// This parameter is overriden from the config file. This verifies that we indeed use the flag value over the config file.
+			"--instance-poll-time", "1s",
+			// Faster topo information refresh speeds up the tests. This doesn't add any significant load either.
+			"--topo-information-refresh-duration", "3s",
+		)
+	}
 
 	if *isCoverage {
 		orc.proc.Args = append(orc.proc.Args, "--test.coverprofile="+getCoveragePath("orc.out"))

go/test/endtoend/vtorc/api/api_test.go

@@ -35,8 +35,7 @@ import (
 func TestAPIEndpoints(t *testing.T) {
 	defer cluster.PanicHandler(t)
 	utils.SetupVttabletsAndVTOrcs(t, clusterInfo, 2, 1, nil, cluster.VTOrcConfiguration{
-		PreventCrossDataCenterPrimaryFailover: true,
-		RecoveryPeriodBlockSeconds:            5,
+		PreventCrossCellFailover: true,
 	}, 1, "")
 	keyspace := &clusterInfo.ClusterInstance.Keyspaces[0]
 	shard0 := &keyspace.Shards[0]