Fix wait time based deadline calculation (#3120)

### Description of change

##### Checklist

- [x] Tested in playground or other setup
- [ ] Screenshot (Grafana) from playground added to PR for 15+ minute
run
- [ ] Documentation is changed or added
- [ ] Tests and/or benchmarks are included
- [ ] Breaking changes

pkg/dmap-funcs/concurrency-limiter/global-token-counter.go

@@ -410,9 +410,6 @@ func (gtc *GlobalTokenCounter) takeN(key string, stateBytes, argBytes []byte) ([
 	} else {
 		waitTime = MinimumWaitTime
 	}
-	if waitTime < MinimumWaitTime {
-		waitTime = MinimumWaitTime
-	}
 	if requestQueued != nil {
 		if requestQueued.NumRetries >= 5 {
 			// override wait time if the request has been retried more than 5 times
@@ -424,6 +421,12 @@ func (gtc *GlobalTokenCounter) takeN(key string, stateBytes, argBytes []byte) ([
 			waitTime = requestQueued.WaitFor.AsDuration() * 2
 		}
 	}
+	if waitTime < MinimumWaitTime {
+		waitTime = MinimumWaitTime
+	}
+	if waitTime > MaximumWaitTime {
+		waitTime = MaximumWaitTime
+	}
 
 	var requestsInflight []*tokencounterv1.Request
 	var tokensInflight float64