Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-13615. libhdfs++ SaslProtocol hanging while accessing invalid lock. Contributed by Mitchell Tracy

Browse Source
This commit is contained in:
James Clampffer 2018-06-07 16:02:57 -04:00
parent c4bbcd5634
commit 7969cc4667
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/sasl_protocol.cc
View File

@ -91,8 +91,10 @@ void SaslProtocol::Authenticate(std::function<void(const Status & status, const
std::shared_ptr<RpcSaslProto> resp_msg = std::make_shared<RpcSaslProto>(); std::shared_ptr<RpcSaslProto> resp_msg = std::make_shared<RpcSaslProto>();
auto self(shared_from_this()); auto self(shared_from_this());
connection->AsyncRpc_locked(SASL_METHOD_NAME, req_msg.get(), resp_msg, connection->AsyncRpc_locked(SASL_METHOD_NAME, req_msg.get(), resp_msg,
[self, req_msg, resp_msg] (const Status & status) { [self, req_msg, resp_msg, connection] (const Status & status) {
self->OnServerResponse(status, resp_msg.get()); } ); assert(connection);
self->OnServerResponse(status, resp_msg.get());
});
} // authenticate() method } // authenticate() method
AuthInfo::AuthMethod ParseMethod(const std::string & method) AuthInfo::AuthMethod ParseMethod(const std::string & method)
@ -340,9 +342,10 @@ bool SaslProtocol::SendSaslMessage(RpcSaslProto & message)
std::shared_ptr<RpcSaslProto> resp_msg = std::make_shared<RpcSaslProto>(); std::shared_ptr<RpcSaslProto> resp_msg = std::make_shared<RpcSaslProto>();
auto self(shared_from_this()); auto self(shared_from_this());
connection->AsyncRpc(SASL_METHOD_NAME, &message, resp_msg, connection->AsyncRpc(SASL_METHOD_NAME, &message, resp_msg,
[self, resp_msg] (const Status & status) { [self, resp_msg, connection] (const Status & status) {
self->OnServerResponse(status, resp_msg.get()); assert(connection);
} ); self->OnServerResponse(status, resp_msg.get());
});
return true; return true;
} // SendSaslMessage() method } // SendSaslMessage() method
@ -370,7 +373,9 @@ bool SaslProtocol::AuthComplete(const Status & status, const AuthInfo & auth_inf
void SaslProtocol::OnServerResponse(const Status & status, const hadoop::common::RpcSaslProto * response) void SaslProtocol::OnServerResponse(const Status & status, const hadoop::common::RpcSaslProto * response)
{ {
std::lock_guard<std::mutex> state_lock(sasl_state_lock_); std::lock_guard<std::mutex> state_lock(sasl_state_lock_);
LOG_TRACE(kRPC, << "Received SASL response: " << status.ToString()); LOG_TRACE(kRPC, << "Received SASL response: " << status.ToString());
if (status.ok()) { if (status.ok()) {