christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

jobclient: expect communication failures

Browse Source 
This change makes the JobClient act properly on communication aborts.

Change-Id: I0a76489f117e9721546215e3b627002605e25452
This commit is contained in:
Horst Schirmeier
2014-01-20 21:02:04 +01:00
parent 882d4f381b
commit 2c31bf79b0
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/efw/JobClient.cc
View File

@ -149,10 +149,16 @@ FailControlMessage_Command JobClient::tryToGetExperimentData(ExperimentData& exp
ExperimentData* temp_exp = new ExperimentData(exp.getMessage().New()); ExperimentData* temp_exp = new ExperimentData(exp.getMessage().New());
if (!SocketComm::rcvMsg(m_sockfd, temp_exp->getMessage())) { if (!SocketComm::rcvMsg(m_sockfd, temp_exp->getMessage())) {
// Failed to receive message? Retry. // looks like we won't receive more jobs now, cleanup
close(m_sockfd); delete &temp_exp->getMessage();
delete temp_exp; delete temp_exp;
return FailControlMessage::COME_AGAIN; // did a previous loop iteration succeed?
if (m_parameters.size() > 0) {
break;
} else {
// nothing to do now, retry later
return FailControlMessage::COME_AGAIN;
}
} }
temp_exp->setWorkloadID(ctrlmsg.workloadid(i)); //Store workload id of experiment data temp_exp->setWorkloadID(ctrlmsg.workloadid(i)); //Store workload id of experiment data
@ -262,10 +268,16 @@ bool JobClient::sendResultsToServer()
cout << "]"; cout << "]";
// TODO: Log-level? // TODO: Log-level?
SocketComm::sendMsg(m_sockfd, ctrlmsg); if (!SocketComm::sendMsg(m_sockfd, ctrlmsg)) {
close(m_sockfd);
return false;
}
for (i = 0; i < ctrlmsg.job_size() ; i++) { for (i = 0; i < ctrlmsg.job_size() ; i++) {
SocketComm::sendMsg(m_sockfd, m_results.front()->getMessage()); if (!SocketComm::sendMsg(m_sockfd, m_results.front()->getMessage())) {
close(m_sockfd);
return false;
}
delete &m_results.front()->getMessage(); delete &m_results.front()->getMessage();
delete m_results.front(); delete m_results.front();
m_results.pop_front(); m_results.pop_front();