@xiangli-cmu I made a change in 00d1098 to grab the last index and term before verifying that the server is still the leader. It's not quite atomic but it's better than what was there.