Relaxed constraints on relocating up from a binlog server

outbrain-inc · Nov 19, 2015 · 464c697 · 464c697
1 parent 834873d
commit 464c697
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.sh b/build.sh
@@ -6,7 +6,7 @@
 #
 set -e
 
-RELEASE_VERSION="1.4.531"
+RELEASE_VERSION="1.4.532"
 TOPDIR=/tmp/orchestrator-release
 export RELEASE_VERSION TOPDIR
 

diff --git a/go/inst/instance_topology.go b/go/inst/instance_topology.go
@@ -2154,7 +2154,7 @@ func relocateBelowInternal(instance, other *Instance) (*Instance, error) {
 	}
 	if instanceMaster.MasterKey.Equals(&other.Key) && instanceMaster.IsBinlogServer() {
 		// Moving to grandparent via binlog server
-		return MoveUp(&instance.Key)
+		return Repoint(&instance.Key, &instanceMaster.MasterKey, GTIDHintDeny)
 	}
 	if other.IsBinlogServer() {
 		// Relocate to its master, then repoint to the binlog server