Merge pull request #281 from akshaychhajed/tungsten-check

Shlomi Noach · web-flow · commit 1a76c044bf8c · 2016-10-19T21:00:31.000+02:00
Modified slave update check to test tungsten flag
diff --git a/go/logic/inspect.go b/go/logic/inspect.go
@@ -327,7 +327,7 @@ func (this *Inspector) validateLogSlaveUpdates() error {
 	if err := this.db.QueryRow(query).Scan(&logSlaveUpdates); err != nil {
 		return err
 	}
-	if !logSlaveUpdates && !this.migrationContext.InspectorIsAlsoApplier() {
+	if !logSlaveUpdates && !this.migrationContext.InspectorIsAlsoApplier() && !this.migrationContext.IsTungsten {
 		return fmt.Errorf("%s:%d must have log_slave_updates enabled", this.connectionConfig.Key.Hostname, this.connectionConfig.Key.Port)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ func (this *Inspector) validateLogSlaveUpdates() error {`
`327`	`327`	`if err := this.db.QueryRow(query).Scan(&logSlaveUpdates); err != nil {`
`328`	`328`	`return err`
`329`	`329`	`}`
`330`		`- if !logSlaveUpdates && !this.migrationContext.InspectorIsAlsoApplier() {`
	`330`	`+ if !logSlaveUpdates && !this.migrationContext.InspectorIsAlsoApplier() && !this.migrationContext.IsTungsten {`
`331`	`331`	`return fmt.Errorf("%s:%d must have log_slave_updates enabled", this.connectionConfig.Key.Hostname, this.connectionConfig.Key.Port)`
`332`	`332`	`}`
`333`	`333`