Errant trx printed when replication is up to date #540

Author: svaroqui

cluster/cluster_chk.go

@@ -708,10 +708,14 @@ func (cluster *Cluster) IsNotHavingMySQLErrantTransaction() bool {
 	if !(cluster.GetMaster().HasMySQLGTID()) {
 		return true
 	}
+	if !cluster.Conf.RplCheckErrantTrx {
+		return true
+	}
 	for _, s := range cluster.slaves {
 		if s.IsFailed() || s.IsIgnored() {
 			continue
 		}
+
 		hasErrantTrx, _, _ := dbhelper.HaveErrantTransactions(s.Conn, cluster.master.Variables["GTID_EXECUTED"], s.Variables["GTID_EXECUTED"])
 		if hasErrantTrx {
 			cluster.SetState("WARN0091", state.State{ErrType: LvlWarn, ErrDesc: fmt.Sprintf(clusterError["WARN0091"], s.URL), ErrFrom: "MON", ServerUrl: s.URL})

config/config.go

@@ -217,6 +217,7 @@ type Config struct {
 	CheckBinFilter                            bool                   `mapstructure:"check-binlog-filters" toml:"check-binlog-filters" json:"checkBinlogFilters"`
 	CheckGrants                               bool                   `mapstructure:"check-grants" toml:"check-grants" json:"checkGrants"`
 	RplChecks                                 bool                   `mapstructure:"check-replication-state" toml:"check-replication-state" json:"checkReplicationState"`
+	RplCheckErrantTrx                         bool                   `mapstructure:"check-replication-errant-trx" toml:"check-replication-errant-trx" json:"checkReplicationErrantTrx"`
 	ForceSlaveHeartbeat                       bool                   `mapstructure:"force-slave-heartbeat" toml:"force-slave-heartbeat" json:"forceSlaveHeartbeat"`
 	ForceSlaveHeartbeatTime                   int                    `mapstructure:"force-slave-heartbeat-time" toml:"force-slave-heartbeat-time" json:"forceSlaveHeartbeatTime"`
 	ForceSlaveHeartbeatRetry                  int                    `mapstructure:"force-slave-heartbeat-retry" toml:"force-slave-heartbeat-retry" json:"forceSlaveHeartbeatRetry"`

server/server.go

@@ -379,6 +379,7 @@ func (repman *ReplicationManager) AddFlags(flags *pflag.FlagSet, conf *config.Co
 	flags.BoolVar(&conf.CheckBinFilter, "check-binlog-filters", true, "Check that possible master have equal binlog filters")
 	flags.BoolVar(&conf.CheckGrants, "check-grants", true, "Check that possible master have equal grants")
 	flags.BoolVar(&conf.RplChecks, "check-replication-state", true, "Check replication status when electing master server")
+	flags.BoolVar(&conf.RplCheckErrantTrx, "check-replication-errant-trx", true, "Check replication have no errant transaction in MySQL GTID")
 
 	flags.StringVar(&conf.APIPort, "api-port", "10005", "Rest API listen port")
 	flags.StringVar(&conf.APIUsers, "api-credentials", "admin:repman", "Rest API user list user:password,..")

utils/dbhelper/mysql.go

@@ -9,7 +9,7 @@ import (
 func HaveErrantTransactions(db *sqlx.DB, gtidMaster string, gtidSlave string) (bool, string, error) {
 
 	count := 0
-	query := "select gtid_subset('" + gtidMaster + "','" + gtidSlave + "') as slave_is_subset"
+	query := "select gtid_subset('" + gtidSlave + "','" + gtidMaster + "') as slave_is_subset"
 
 	err := db.QueryRowx(query).Scan(&count)
 	if err != nil {