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

HDFS-11767: libhdfs++: SASL events should be scoped closer to usage. Contributed by James Clampffer

This commit is contained in:
James 2017-05-11 12:34:35 -04:00 committed by James Clampffer
parent b584e34f2f
commit 57cdad73de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,14 +65,12 @@ SaslProtocol::SaslProtocol(const std::string & cluster_name,
SaslProtocol::~SaslProtocol()
{
std::lock_guard<std::mutex> state_lock(sasl_state_lock_);
event_handlers_->call("SASL End", cluster_name_.c_str(), 0);
assert(state_ != kNegotiate);
}
void SaslProtocol::SetEventHandlers(std::shared_ptr<LibhdfsEvents> event_handlers) {
std::lock_guard<std::mutex> state_lock(sasl_state_lock_);
event_handlers_ = event_handlers;
event_handlers_->call("SASL Start", cluster_name_.c_str(), 0);
} // SetEventHandlers() method
void SaslProtocol::Authenticate(std::function<void(const Status & status, const AuthInfo new_auth_info)> callback)
@ -81,6 +79,7 @@ void SaslProtocol::Authenticate(std::function<void(const Status & status, const
callback_ = callback;
state_ = kNegotiate;
event_handlers_->call("SASL Start", cluster_name_.c_str(), 0);
std::shared_ptr<RpcSaslProto> req_msg = std::make_shared<RpcSaslProto>();
req_msg->set_state(RpcSaslProto_SaslState_NEGOTIATE);
@ -353,6 +352,8 @@ bool SaslProtocol::SendSaslMessage(RpcSaslProto & message)
bool SaslProtocol::AuthComplete(const Status & status, const AuthInfo & auth_info)
{
assert(lock_held(sasl_state_lock_)); // Must be holding lock before calling
state_ = kComplete;
event_handlers_->call("SASL End", cluster_name_.c_str(), 0);
// RpcConnection might have been freed when we weren't looking. Lock it
// to make sure it's there long enough for us

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

@ -56,7 +56,6 @@ private:
enum State {
kUnstarted,
kNegotiate,
kAuthenticate,
kComplete
};