Commits on Jun 3, 2021

1. kvserver: deflake TestMergeQueue …

   The test started flaking after ce73bc1. The issue was that there was a race
   between when the merge queue was enabled via an `Override()` call and when
   these tests assert that a given range actually got merged away. In other words,
   these tests were sometime getting to their assertion before the relevant server
   learned that the merge queue was enabled.
   
   This patch modifies the test to instead enable the merge queue via SQL and not
   through the `Override()` call.
   
   Resolves cockroachdb#64866
   Resolves cockroachdb#64056
   Resolves cockroachdb#63009
   
   Release note: None

   

   aayushshah15 committed Jun 3, 2021
   Configuration menu

   • View commit details
   • Copy full SHA for 6bdd149
   • Browse repository at this point

   Copy the full SHA

   6bdd149 View commit details

   Browse the repository at this point in the history