ENG-5515, fix deadlock setting repair algo from a new thread