Merge pull request #812 from github/prefer-not-gtid-errant

all things equal, prefer promoting instance without errant GTID
openark · Feb 20, 2019 · 33bcd5c · 33bcd5c
2 parents 36f055a + 5237794
commit 33bcd5c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/go/inst/instance_topology_test.go b/go/inst/instance_topology_test.go
@@ -102,6 +102,17 @@ func TestSortInstancesDataCenterHint(t *testing.T) {
 	test.S(t).ExpectEquals(instances[0].Key, i810Key)
 }
 
+func TestSortInstancesGtidErrant(t *testing.T) {
+	instances, instancesMap := generateTestInstances()
+	for _, instance := range instances {
+		instance.ExecBinlogCoordinates = instances[0].ExecBinlogCoordinates
+		instance.GtidErrant = "00020192-1111-1111-1111-111111111111:1"
+	}
+	instancesMap[i810Key.StringCode()].GtidErrant = ""
+	sortInstances(instances)
+	test.S(t).ExpectEquals(instances[0].Key, i810Key)
+}
+
 func TestGetPriorityMajorVersionForCandidate(t *testing.T) {
 	{
 		instances, instancesMap := generateTestInstances()

diff --git a/go/inst/instance_utils.go b/go/inst/instance_utils.go
@@ -141,6 +141,10 @@ func (this *InstancesSorterByExec) Less(i, j int) bool {
 		if this.instances[j].DataCenter == this.dataCenter && this.instances[i].DataCenter != this.dataCenter {
 			return true
 		}
+		// Prefer if not having errant GTID
+		if this.instances[j].GtidErrant == "" && this.instances[i].GtidErrant != "" {
+			return true
+		}
 		// Prefer candidates:
 		if this.instances[j].PromotionRule.SmallerThan(this.instances[i].PromotionRule) {
 			return true