Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Storage proxy: protect against infinite recursion in query_partition_…
…key_range_concurrent A recent fix to #3767 limited the amount of ranges that can return from query_ranges_to_vnodes_generator. This with the combination of a large amount of token ranges can lead to an infinite recursion. The algorithm multiplies by factor of 2 (actualy a shift left by one) the amount of requested tokens in each recursion iteration. As long as the requested number of ranges is greater than 0, the recursion is implicit, and each call is scheduled separately since the call is inside a continuation of a map reduce. But if the amount of iterations is large enough (~32) the counter for requested ranges zeros out and from that moment on two things will happen: 1. The counter will remain 0 forever (0*2 == 0) 2. The map reduce future will be immediately available and this will result in the continuation being invoked immediately. The latter causes the recursive call to be a "regular" recursive call thus, through the stack and not the task queue of the scheduler, and the former causes this recursion to be infinite. The combination creates a stack that keeps growing and eventually overflows resulting in undefined behavior (due to memory overrun). This patch prevent the problem from happening, it limits the growth of the concurrency counter beyond twice the last amount of tokens returned by the query_ranges_to_vnodes_generator.And also makes sure it is not get stuck at zero. Testing: * Unit test in dev mode. * Modified add 50 dtest that reproduce the problem Fixes #4944 Signed-off-by: Eliran Sinvani <eliransin@scylladb.com> Message-Id: <20190922072838.14957-1-eliransin@scylladb.com> (cherry picked from commit 280715a)
- Loading branch information