Support recovery re-run on recovery failure