optimize retry-delete and retry-rename