3 files changed, 65 insertions, 73 deletions

diff --git a/pkg/worker_watcher/container/interface.go b/pkg/worker_watcher/container/interface.go
index 532bace9..0e648d34 100644
--- a/pkg/worker_watcher/container/interface.go
+++ b/pkg/worker_watcher/container/interface.go
@@ -1,6 +1,8 @@
 package container
 
-import "github.com/spiral/roadrunner/v2/pkg/worker"
+import (
+	"github.com/spiral/roadrunner/v2/pkg/worker"
+)
 
 // Vector interface represents vector container
 type Vector interface {
diff --git a/pkg/worker_watcher/container/vec.go b/pkg/worker_watcher/container/vec.go
index 565b1b69..1ab9d073 100644
--- a/pkg/worker_watcher/container/vec.go
+++ b/pkg/worker_watcher/container/vec.go
@@ -7,12 +7,14 @@ import (
 )
 
 type Vec struct {
+	wqLen   uint64
 	destroy uint64
 	workers chan worker.BaseProcess
 }
 
 func NewVector(initialNumOfWorkers uint64) Vector {
 	vec := &Vec{
+		wqLen:   0,
 		destroy: 0,
 		workers: make(chan worker.BaseProcess, initialNumOfWorkers),
 	}
@@ -21,6 +23,7 @@ func NewVector(initialNumOfWorkers uint64) Vector {
 }
 
 func (v *Vec) Enqueue(w worker.BaseProcess) {
+	atomic.AddUint64(&v.wqLen, 1)
 	v.workers <- w
 }
 
@@ -31,11 +34,17 @@ func (v *Vec) Dequeue() (worker.BaseProcess, bool) {
 			return true
 		}
 	*/
+
 	if atomic.CompareAndSwapUint64(&v.destroy, 1, 1) {
 		return nil, true
 	}
 
-	return <-v.workers, false
+	if num := atomic.LoadUint64(&v.wqLen); num > 0 {
+		atomic.AddUint64(&v.wqLen, ^uint64(0))
+		return <-v.workers, false
+	}
+
+	return nil, false
 }
 
 func (v *Vec) Destroy() {
diff --git a/pkg/worker_watcher/worker_watcher.go b/pkg/worker_watcher/worker_watcher.go
index 108756fc..9d66a75c 100755
--- a/pkg/worker_watcher/worker_watcher.go
+++ b/pkg/worker_watcher/worker_watcher.go
@@ -47,88 +47,69 @@ func (ww *workerWatcher) Watch(workers []worker.BaseProcess) error {
 	return nil
 }
 
-// return value from Get
-type get struct {
-	w   worker.BaseProcess
-	err error
-}
-
 // Get is not a thread safe operation
 func (ww *workerWatcher) Get(ctx context.Context) (worker.BaseProcess, error) {
-	c := make(chan get, 1)
 	const op = errors.Op("worker_watcher_get_free_worker")
-	go func() {
-		// FAST PATH
-		// thread safe operation
-		w, stop := ww.container.Dequeue()
-		if stop {
-			c <- get{
-				nil,
-				errors.E(op, errors.WatcherStopped),
-			}
-			return
-		}
 
-		// fast path, worker not nil and in the ReadyState
-		if w.State().Value() == worker.StateReady {
-			c <- get{
-				w,
-				nil,
-			}
-			return
-		}
-		// =========================================================
-		// SLOW PATH
-		_ = w.Kill() // how the worker get here???????
-		// no free workers in the container
-		// try to continuously get free one
-		for {
-			w, stop = ww.container.Dequeue()
+	for {
+		select {
+		case <-ctx.Done():
+			return nil, errors.E(op, errors.NoFreeWorkers)
+		default:
+			// thread safe operation
+			w, stop := ww.container.Dequeue()
 			if stop {
-				c <- get{
-					nil,
-					errors.E(op, errors.WatcherStopped),
-				}
+				return nil, errors.E(op, errors.WatcherStopped)
 			}
 
-			switch w.State().Value() {
-			// return only workers in the Ready state
-			// check first
-			case worker.StateReady:
-				c <- get{
-					w,
-					nil,
-				}
-				return
-			case worker.StateWorking: // how??
-				ww.container.Enqueue(w) // put it back, let worker finish the work
-				continue
-			case
-				// all the possible wrong states
-				worker.StateInactive,
-				worker.StateDestroyed,
-				worker.StateErrored,
-				worker.StateStopped,
-				worker.StateInvalid,
-				worker.StateKilling,
-				worker.StateStopping:
-				// worker doing no work because it in the container
-				// so we can safely kill it (inconsistent state)
-				_ = w.Kill()
-				// try to get new worker
+			if w == nil {
 				continue
 			}
-		}
-	}()
 
-	select {
-	case r := <-c:
-		if r.err != nil {
-			return nil, r.err
+			// fast path, worker not nil and in the ReadyState
+			if w.State().Value() == worker.StateReady {
+				return w, nil
+			}
+			// =========================================================
+			// SLOW PATH
+			_ = w.Kill() // how the worker get here???????
+			// no free workers in the container
+			// try to continuously get free one
+			for {
+				w, stop = ww.container.Dequeue()
+				if stop {
+					return nil, errors.E(op, errors.WatcherStopped)
+				}
+
+				if w == nil {
+					continue
+				}
+
+				switch w.State().Value() {
+				// return only workers in the Ready state
+				// check first
+				case worker.StateReady:
+					return w, nil
+				case worker.StateWorking: // how??
+					ww.container.Enqueue(w) // put it back, let worker finish the work
+					continue
+				case
+					// all the possible wrong states
+					worker.StateInactive,
+					worker.StateDestroyed,
+					worker.StateErrored,
+					worker.StateStopped,
+					worker.StateInvalid,
+					worker.StateKilling,
+					worker.StateStopping:
+					// worker doing no work because it in the container
+					// so we can safely kill it (inconsistent state)
+					_ = w.Kill()
+					// try to get new worker
+					continue
+				}
+			}
 		}
-		return r.w, nil
-	case <-ctx.Done():
-		return nil, errors.E(op, errors.NoFreeWorkers, errors.Str("no free workers in the container, timeout exceed"))
 	}
 }