etcdserver: check err before check other returns
etcdserver: stubWait -> waitRecorder
etcdserver: check id for wait