Fixes a bug in lease action when grpc timeout is set
Signed-off-by: Tao He <sighingnow@gmail.com>
This commit is contained in:
parent
d27f0b9e81
commit
3ae4e290a5
|
|
@ -146,14 +146,14 @@ etcd::Response etcdv3::AsyncLeaseKeepAliveAction::Refresh()
|
|||
break;
|
||||
}
|
||||
case CompletionQueue::NextStatus::GOT_EVENT: {
|
||||
if (!ok || got_tag != (void *)etcdv3::KEEPALIVE_READ) {
|
||||
return etcd::Response(grpc::StatusCode::ABORTED, "Failed to create a lease keep-alive connection: read not ok or invalid tag");
|
||||
if (ok && got_tag == (void *)etcdv3::KEEPALIVE_READ) {
|
||||
return etcd::Response(ParseResponse(), etcd::detail::duration_till_now(start_timepoint));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
this->CancelKeepAlive();
|
||||
return etcd::Response(ParseResponse(), etcd::detail::duration_till_now(start_timepoint));
|
||||
return etcd::Response(grpc::StatusCode::ABORTED, "Failed to create a lease keep-alive connection: read not ok or invalid tag");
|
||||
} else {
|
||||
stream->Write(leasekeepalive_request, (void *)etcdv3::KEEPALIVE_WRITE);
|
||||
// wait write finish
|
||||
|
|
@ -165,7 +165,7 @@ etcd::Response etcdv3::AsyncLeaseKeepAliveAction::Refresh()
|
|||
}
|
||||
}
|
||||
this->CancelKeepAlive();
|
||||
return etcd::Response(grpc::StatusCode::ABORTED, "Failed to create a lease keep-alive connection");
|
||||
return etcd::Response(grpc::StatusCode::ABORTED, "Failed to create a lease keep-alive connection: read not ok or invalid tag");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue