valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 18:58:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cpp: Fix for task completion notification deadlock under heavy server load

Browse Source 
Along with insuring that the event loop is able to see task completion
notifications, we need to process pending notifications as soon as they
are available to avoid filling the notification pipe (the pipe can hold
512 notifications).

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@920668 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Reiss 2010-03-09 05:19:34 +00:00
parent a0dbfefbf3
commit 83b8fdac0f
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/cpp/src/server/TNonblockingServer.cpp
View File

@ -570,12 +570,12 @@ void TNonblockingServer::handleEvent(int fd, short which) {
nTotalConnectionsDropped_++;
if (overloadAction_ == T_OVERLOAD_CLOSE_ON_ACCEPT) {
close(clientSocket);
continue;
return;
} else if (overloadAction_ == T_OVERLOAD_DRAIN_TASK_QUEUE) {
if (!drainPendingTask()) {
// Nothing left to discard, so we drop connection instead.
close(clientSocket);
continue;
return;
}
}
}
@ -718,6 +718,13 @@ void TNonblockingServer::createNotificationPipe() {
GlobalOutput.perror("TNonblockingServer::createNotificationPipe ", errno);
throw TException("can't create notification pipe");
}
int flags;
if ((flags = fcntl(notificationPipeFDs_[0], F_GETFL, 0)) < 0 ||
fcntl(notificationPipeFDs_[0], F_SETFL, flags | O_NONBLOCK) < 0) {
close(notificationPipeFDs_[0]);
close(notificationPipeFDs_[1]);
throw TException("TNonblockingServer::createNotificationPipe() O_NONBLOCK");
}
}
/**

16
lib/cpp/src/server/TNonblockingServer.h
View File

@ -722,13 +722,17 @@ class TConnection {
*/
static void taskHandler(int fd, short /* which */, void* /* v */) {
TConnection* connection;
if (read(fd, (void*)&connection, sizeof(TConnection*))
!= sizeof(TConnection*)) {
GlobalOutput.perror("TConnection::taskHandler read failed, resource leak", errno);
return;
ssize_t nBytes;
while ((nBytes = read(fd, (void*)&connection, sizeof(TConnection*)))
== sizeof(TConnection*)) {
connection->transition();
}
if (nBytes > 0) {
throw TException("TConnection::taskHandler unexpected partial read");
}
if (errno != EWOULDBLOCK && errno != EAGAIN) {
GlobalOutput.perror("TConnection::taskHandler read failed, resource leak", errno);
}
connection->transition();
}
/**