make more robust to etcd failure
v1.1.0