Also take care to stop waiting if someone clears retry bit.
Signed-off-by: NPeng Tao <tao.peng@primarydata.com>