From 93b6adbf65f7bf315d1383149cee514e580daf7b Mon Sep 17 00:00:00 2001 From: zhanglistar Date: Thu, 9 Apr 2020 11:04:02 +0800 Subject: [PATCH] 1. modify unprotectedGenerateResizeJob to return early iif resizing job not null --- cluster.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster.go b/cluster.go index e723de58e..272c3aaac 100644 --- a/cluster.go +++ b/cluster.go @@ -1195,6 +1195,9 @@ func (c *cluster) listenForJoins() { // for future lookup by JobID. func (c *cluster) unprotectedGenerateResizeJob(nodeAction nodeAction) (*resizeJob, error) { c.logger.Printf("generateResizeJob: %v", nodeAction) + if c.currentJob != nil { + return nil, fmt.Errorf("there is currently a resize job running") + } j, err := c.unprotectedGenerateResizeJobByAction(nodeAction) if err != nil { @@ -1206,9 +1209,6 @@ func (c *cluster) unprotectedGenerateResizeJob(nodeAction nodeAction) (*resizeJo c.jobs[j.ID] = j // Set job as currentJob. - if c.currentJob != nil { - return nil, fmt.Errorf("there is currently a resize job running") - } c.currentJob = j return j, nil