From 464c6976fdd29c7782d68617076c50497f26cd76 Mon Sep 17 00:00:00 2001 From: shlomi-noach Date: Thu, 19 Nov 2015 14:10:28 +0100 Subject: [PATCH] Relaxed constraints on relocating up from a binlog server --- build.sh | 2 +- go/inst/instance_topology.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 41e4172e..8c5aa331 100755 --- 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 index 639fa339..6867a0c6 100644 --- 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