From 85317b7d01b0a7bb30acfce54b444e9d426c772e Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Tue, 10 Dec 2024 17:13:21 +0100 Subject: [PATCH] Start the moved process before old gets deleted --- cluster/leader.go | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/cluster/leader.go b/cluster/leader.go index 9d555f0e..1f4ed594 100644 --- a/cluster/leader.go +++ b/cluster/leader.go @@ -653,36 +653,36 @@ func (c *cluster) applyOp(op interface{}, logger log.Logger) processOpError { }).Log("Moving process, stopping process") } - err = c.manager.ProcessDelete(v.fromNodeid, v.config.ProcessID()) - if err != nil { - opErr = processOpError{ - processid: v.config.ProcessID(), - err: err, - } - logger.Info().WithError(err).WithFields(log.Fields{ - "processid": v.config.ProcessID(), - "fromnodeid": v.fromNodeid, - "tonodeid": v.toNodeid, - }).Log("Moving process, removing process") - break - } - if v.order == "start" { err = c.manager.ProcessCommand(v.toNodeid, v.config.ProcessID(), "start") if err != nil { - opErr = processOpError{ - processid: v.config.ProcessID(), - err: err, - } + //opErr = processOpError{ + // processid: v.config.ProcessID(), + // err: err, + //} logger.Info().WithError(err).WithFields(log.Fields{ "processid": v.config.ProcessID(), "fromnodeid": v.fromNodeid, "tonodeid": v.toNodeid, }).Log("Moving process, starting process") - break + // Continue in case the process couldn't start } } + err = c.manager.ProcessDelete(v.fromNodeid, v.config.ProcessID()) + if err != nil { + //opErr = processOpError{ + // processid: v.config.ProcessID(), + // err: err, + //} + logger.Info().WithError(err).WithFields(log.Fields{ + "processid": v.config.ProcessID(), + "fromnodeid": v.fromNodeid, + "tonodeid": v.toNodeid, + }).Log("Moving process, removing process") + // Continue in case the process couldn't be deleted (will be cleaned up later) + } + opErr = processOpError{ processid: v.config.ProcessID(), err: nil,