Skip to content

Commit 10605d1

Browse files
committed
Merge branch 'master' of github.com:Netflix/concurrency-limits into bugfix/noload_rtt_probing
# Conflicts: # concurrency-limits-core/src/main/java/com/netflix/concurrency/limits/limiter/ImmutableSample.java
2 parents a8da502 + f3e9427 commit 10605d1

File tree

1 file changed

+2
-3
lines changed
  • concurrency-limits-core/src/main/java/com/netflix/concurrency/limits/limiter

1 file changed

+2
-3
lines changed

concurrency-limits-core/src/main/java/com/netflix/concurrency/limits/limiter/DefaultLimiter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public Builder limit(Limit limit) {
7979
* Minimum window duration for sampling a new minRtt
8080
*/
8181
public Builder minWindowTime(long minWindowTime, TimeUnit units) {
82-
Preconditions.checkArgument(minWindowTime >= units.toMillis(100), "minWindowTime must be >= 100 ms");
82+
Preconditions.checkArgument(units.toMillis(minWindowTime) >= 100, "minWindowTime must be >= 100 ms");
8383
this.minWindowTime = units.toNanos(minWindowTime);
8484
return this;
8585
}
@@ -143,14 +143,13 @@ private DefaultLimiter(Builder builder, Strategy<ContextT> strategy) {
143143

144144
@Override
145145
public Optional<Listener> acquire(final ContextT context) {
146-
final long startTime = nanoClock.get();
147-
148146
// Did we exceed the limit
149147
final Token token = strategy.tryAcquire(context);
150148
if (!token.isAcquired()) {
151149
return Optional.empty();
152150
}
153151

152+
final long startTime = nanoClock.get();
154153
int currentMaxInFlight = inFlight.incrementAndGet();
155154

156155
return Optional.of(new Listener() {

0 commit comments

Comments
 (0)