fix deadlock in full drain mode on config update (#1776)

fix deadlock in full drain mode on config update (#1776) #4206