From d221b9cf4b39467e6db2f10fa4f3d75b64f6c846 Mon Sep 17 00:00:00 2001 From: deepthi Date: Fri, 23 Aug 2019 10:28:17 -0700 Subject: [PATCH 1/2] healthcheck after backup should be run only for offline backups Signed-off-by: deepthi --- go/vt/vttablet/tabletmanager/rpc_backup.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/go/vt/vttablet/tabletmanager/rpc_backup.go b/go/vt/vttablet/tabletmanager/rpc_backup.go index b2ffffd3933..d7387b7c941 100644 --- a/go/vt/vttablet/tabletmanager/rpc_backup.go +++ b/go/vt/vttablet/tabletmanager/rpc_backup.go @@ -122,9 +122,10 @@ func (agent *ActionAgent) Backup(ctx context.Context, concurrency int, logger lo if err := agent.refreshTablet(bgCtx, "after backup"); err != nil { return err } + // and re-run health check to be sure to capture any replication delay + // not needed for online backups because it will continue to run per schedule + agent.runHealthCheckLocked() } - // and re-run health check to be sure to capture any replication delay - agent.runHealthCheckLocked() return returnErr } From 0c48deece6d30691842a994f8c96b51c56255184 Mon Sep 17 00:00:00 2001 From: deepthi Date: Fri, 23 Aug 2019 11:37:26 -0700 Subject: [PATCH 2/2] check that actionMutex is locked before running healthcheck Signed-off-by: deepthi --- go/vt/vttablet/tabletmanager/healthcheck.go | 1 + 1 file changed, 1 insertion(+) diff --git a/go/vt/vttablet/tabletmanager/healthcheck.go b/go/vt/vttablet/tabletmanager/healthcheck.go index cf187767741..cfc2a48ae9d 100644 --- a/go/vt/vttablet/tabletmanager/healthcheck.go +++ b/go/vt/vttablet/tabletmanager/healthcheck.go @@ -180,6 +180,7 @@ func (agent *ActionAgent) runHealthCheck() { } func (agent *ActionAgent) runHealthCheckLocked() { + agent.checkLock() // read the current tablet record and tablet control agent.mutex.Lock() tablet := proto.Clone(agent._tablet).(*topodatapb.Tablet)