CDH high-availability support