See race explanation in the linked BF. We should serialize the initial rename attempt -> undo initial rename -> retry rename so that the interleaving of undo fails (tolerated by the test) -> original succeeds -> retry fails because original already succeeded cannot happen.

Also, we can make some improvements to the test setup so that it checks the thread exit code rather than waiting indefinitely and timing out if the operation being run int the thread fails.