Merge branch 'master' into feat/diff-in-gtid-info

yandex · Jun 25, 2024 · 5415176 · 5415176
2 parents 890c8a4 + eff3563
commit 5415176
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -758,9 +758,11 @@ func (app *App) stateManager() appState {
 		app.logger.Errorf("failed to update active nodes in dcs: %v", err)
 	}
 
-	err = app.updateReplMonTS(master)
-	if err != nil {
-		app.logger.Errorf("failed to update repl_mon timestamp: %v", err)
+	if app.config.ReplMon {
+		err = app.updateReplMonTS(master)
+		if err != nil {
+			app.logger.Errorf("failed to update repl_mon timestamp: %v", err)
+		}
 	}
 
 	return stateManager

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -224,5 +224,8 @@ func (cfg *Config) Validate() error {
 	if cfg.SemiSync && cfg.ASync {
 		return fmt.Errorf("can't run in both semisync and async mode")
 	}
+	if cfg.ASync && !cfg.ReplMon {
+		return fmt.Errorf("repl mon must be enabled to run mysync in async mode")
+	}
 	return nil
 }