Skip to content

HDFS-15928. Replace RAND_pseudo_bytes in rpc_engine.cc #2825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2021
Merged

HDFS-15928. Replace RAND_pseudo_bytes in rpc_engine.cc #2825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/request.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,19 @@ static void SetRequestHeader(std::weak_ptr<LockFreeRpcEngine> weak_engine, int c
return;
}

const auto& client_id = counted_engine->client_id();
if (client_id == nullptr) {
LOG_ERROR(kRPC, << "Failed to generate client ID");
return;
}

rpc_header->set_rpckind(RPC_PROTOCOL_BUFFER);
rpc_header->set_rpcop(RpcRequestHeaderProto::RPC_FINAL_PACKET);
rpc_header->set_callid(call_id);
if (retry_count != kNoRetry) {
rpc_header->set_retrycount(retry_count);
}
rpc_header->set_clientid(counted_engine->client_id());
rpc_header->set_clientid(*client_id);
req_header->set_methodname(method_name);
req_header->set_declaringclassprotocolname(counted_engine->protocol_name());
req_header->set_clientprotocolversion(counted_engine->protocol_version());
Expand Down
15 changes: 11 additions & 4 deletions ...op-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@
#include "common/optional_wrapper.h"

#include <algorithm>
#include <memory>

#include <boost/date_time/posix_time/posix_time_duration.hpp>
#include <openssl/rand.h>
#include <openssl/err.h>

namespace hdfs {

Expand Down Expand Up @@ -111,8 +114,7 @@ std::unique_ptr<const RetryPolicy> RpcEngine::MakeRetryPolicy(const Options &opt
}
}

std::string RpcEngine::getRandomClientId()
{
std::unique_ptr<std::string> RpcEngine::getRandomClientId() {
/**
* The server is requesting a 16-byte UUID:
* https://github.com/c9n/hadoop/blob/master/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ClientId.java
Expand All @@ -121,14 +123,19 @@ std::string RpcEngine::getRandomClientId()
* https://en.wikipedia.org/wiki/Universally_unique_identifier#Version_4_.28random.29
**/
std::vector<unsigned char>buf(16);
RAND_pseudo_bytes(&buf[0], buf.size());
if (RAND_bytes(&buf[0], static_cast<int>(buf.size())) != 1) {
const auto *error = ERR_reason_error_string(ERR_get_error());
LOG_ERROR(kRPC, << "Unable to generate random client ID, err : " << error);
return nullptr;
}

//clear the first four bits of byte 6 then set the second bit
buf[6] = (buf[6] & 0x0f) | 0x40;

//clear the second bit of byte 8 and set the first bit
buf[8] = (buf[8] & 0xbf) | 0x80;
return std::string(reinterpret_cast<const char*>(&buf[0]), buf.size());
return std::unique_ptr<std::string>(
new std::string(reinterpret_cast<const char *>(&buf[0]), buf.size()));
}


Expand Down
8 changes: 4 additions & 4 deletions hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class LockFreeRpcEngine {
virtual int NextCallId() = 0;

virtual const std::string &client_name() = 0;
virtual const std::string &client_id() = 0;
virtual const std::unique_ptr<std::string> &client_id() = 0;
virtual const std::string &user_name() = 0;
virtual const std::string &protocol_name() = 0;
virtual int protocol_version() = 0;
Expand Down Expand Up @@ -142,7 +142,7 @@ class RpcEngine : public LockFreeRpcEngine, public std::enable_shared_from_this<
std::unique_ptr<const RetryPolicy> TEST_GenerateRetryPolicyUsingOptions();

const std::string &client_name() override { return client_name_; }
const std::string &client_id() override { return client_id_; }
const std::unique_ptr<std::string> &client_id() override { return client_id_; }
const std::string &user_name() override { return auth_info_.getUser(); }
const std::string &protocol_name() override { return protocol_name_; }
int protocol_version() override { return protocol_version_; }
Expand All @@ -157,7 +157,7 @@ class RpcEngine : public LockFreeRpcEngine, public std::enable_shared_from_this<
virtual std::shared_ptr<RpcConnection> NewConnection();
virtual std::unique_ptr<const RetryPolicy> MakeRetryPolicy(const Options &options);

static std::string getRandomClientId();
static std::unique_ptr<std::string> getRandomClientId();

// Remember all of the last endpoints in case we need to reconnect and retry
std::vector<boost::asio::ip::tcp::endpoint> last_endpoints_;
Expand All @@ -166,7 +166,7 @@ class RpcEngine : public LockFreeRpcEngine, public std::enable_shared_from_this<
mutable std::shared_ptr<IoService> io_service_;
const Options options_;
const std::string client_name_;
const std::string client_id_;
const std::unique_ptr<std::string> client_id_;
const std::string protocol_name_;
const int protocol_version_;
std::unique_ptr<const RetryPolicy> retry_policy_; //null --> no retry
Expand Down