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

HDFS-10222. libhdfs++: Shutdown sockets to avoid 'Connection reset by peer'. Contributed by James Clampffer

This commit is contained in:
James 2016-03-30 15:33:48 -04:00 committed by James Clampffer
parent 427edae365
commit 015d93a715
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/connection/datanodeconnection.cc
View File

@ -55,9 +55,7 @@ void DataNodeConnectionImpl::Connect(
}
void DataNodeConnectionImpl::Cancel() {
// best to do a shutdown() first for portability
conn_->shutdown(asio::ip::tcp::socket::shutdown_both);
conn_->close();
conn_.reset();
}

31
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/connection/datanodeconnection.h
View File

@ -22,9 +22,12 @@
#include "common/async_stream.h"
#include "ClientNamenodeProtocol.pb.h"
#include "common/libhdfs_events_impl.h"
#include "common/logging.h"
#include "asio.hpp"
#include <exception>
namespace hdfs {
class DataNodeConnection : public AsyncStream {
@ -38,9 +41,35 @@ public:
};
struct SocketDeleter {
inline void operator()(asio::ip::tcp::socket *sock) {
if(sock->is_open()) {
/**
* Even though we just checked that the socket is open it's possible
* it isn't in a state where it can properly send or receive. If that's
* the case asio will turn the underlying error codes from shutdown()
* and close() into unhelpfully named std::exceptions. Due to the
* relatively innocuous nature of most of these error codes it's better
* to just catch, give a warning, and move on with life.
**/
try {
sock->shutdown(asio::ip::tcp::socket::shutdown_both);
} catch (const std::exception &e) {
LOG_WARN(kBlockReader, << "Error calling socket->shutdown");
}
try {
sock->close();
} catch (const std::exception &e) {
LOG_WARN(kBlockReader, << "Error calling socket->close");
}
}
delete sock;
}
};
class DataNodeConnectionImpl : public DataNodeConnection, public std::enable_shared_from_this<DataNodeConnectionImpl>{
public:
std::unique_ptr<asio::ip::tcp::socket> conn_;
std::unique_ptr<asio::ip::tcp::socket, SocketDeleter> conn_;
std::array<asio::ip::tcp::endpoint, 1> endpoints_;
std::string uuid_;
LibhdfsEvents *event_handlers_;