Merge branch 'mas-i1765-tokenbucket' of https://github.com/basho/riak_kv

into mas-i1765-tokenbucket
basho · Aug 8, 2020 · 5d56912 · 5d56912
2 parents e135df6 + 69c774c
commit 5d56912
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/riak_kv_vnode.erl b/src/riak_kv_vnode.erl
@@ -1252,7 +1252,7 @@ handle_command(tictacaae_exchangepoke, _Sender, State) ->
         {_, SkipCount} ->
             lager:warning("Skipping a tick due to non_zero " ++
                             "skip_count=~w", [SkipCount]),
-            {noreply, State#state{tictac_skiptick = SkipCount - 1}}
+            {noreply, State#state{tictac_skiptick = max(0, SkipCount - 1)}}
     end;
 
 handle_command(tictacaae_rebuildpoke, _Sender, State=#state{tictac_startup=TS})