More deadlock protection during reindex