Merge pull request #28902 from tchaikov/wip-fix-crimson-test-build

test/crimson: fix FTBFS

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Kefu Chai 2019-07-06 01:52:01 +08:00 committed by GitHub
commit 73746f3807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,7 +49,7 @@ struct Server {
return m->get_type() == CEPH_MSG_PING;
}
void ms_fast_dispatch(Message* m) override {
m->get_connection()->send_message(make_message<MPing>());
m->get_connection()->send_message(new MPing);
m->put();
{
std::lock_guard lock{mutex};
@ -132,7 +132,7 @@ struct Client {
auto conn = msgr->connect_to(peer.name.type(),
entity_addrvec_t{peer.addr});
replied = false;
conn->send_message(make_message<MPing>());
conn->send_message(new MPing);
std::unique_lock lock{mutex};
return on_reply.wait_for(lock, 500ms, [&] {
return replied;