Merge remote-tracking branch 'origin/master' into feature/jobs_plugin

# Conflicts:
#	pkg/worker_watcher/interface.go

1 files changed, 7 insertions, 0 deletions

diff --git a/pkg/worker/sync_worker.go b/pkg/worker/sync_worker.go
index 38f44461..380bfff7 100755
--- a/pkg/worker/sync_worker.go
+++ b/pkg/worker/sync_worker.go
@@ -60,6 +60,13 @@ func (tw *SyncWorkerImpl) Exec(p payload.Payload) (payload.Payload, error) {
 		return payload.Payload{}, errors.E(op, err)
 	}
 
+	// supervisor may set state of the worker during the work
+	// in this case we should not re-write the worker state
+	if tw.process.State().Value() != StateWorking {
+		tw.process.State().RegisterExec()
+		return rsp, nil
+	}
+
 	tw.process.State().Set(StateReady)
 	tw.process.State().RegisterExec()