christoph/fail
1
Fork 0
Code Releases Activity

properly deal with clients that talked to another campaign server before

Browse Source 
A campaign server now tells all clients a unique run ID (the UNIX timestamp
when it was started).  This allows us to ignore results from "old" clients
that talked to another server before, and to tell them to die.

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1677 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-09-23 17:28:07 +00:00
parent 8c7f8f62d0
commit 7513dacad1
5 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/cpn/JobServer.cc
View File

@ -199,10 +199,23 @@ void CommThread::operator()()
switch (ctrlmsg.command()) {
case FailControlMessage_Command_NEED_WORK:
// let old clients die
if (!ctrlmsg.has_run_id() || (ctrlmsg.run_id() != 0 && ctrlmsg.run_id() != m_js.m_runid)) {
cout << "!![Server] telling old client to die" << endl;
ctrlmsg.Clear();
ctrlmsg.set_command(FailControlMessage_Command_DIE);
ctrlmsg.set_build_id(42);
SocketComm::sendMsg(minion.getSocketDescriptor(), ctrlmsg);
}
// give minion something to do..
sendPendingExperimentData(minion);
break;
case FailControlMessage_Command_RESULT_FOLLOWS:
// ignore old client's results
if (!ctrlmsg.has_run_id() || (ctrlmsg.run_id() != 0 && ctrlmsg.run_id() != m_js.m_runid)) {
cout << "!![Server] ignoring old client's results" << endl;
break;
}
// get results and put to done queue.
receiveExperimentResults(minion, ctrlmsg.workloadid());
break;

7
src/core/cpn/JobServer.hpp
View File

@ -8,6 +8,7 @@
#include "config/FailConfig.hpp"
#include <list>
#include <ctime>
#ifndef __puma
#include <boost/thread.hpp>
@ -37,7 +38,7 @@ private:
unsigned m_maxThreads;
//! the maximal timeout per communication thread
int m_threadtimeout;
//! A of spawned threads
//! list of spawned threads
#ifndef __puma
typedef std::list<boost::thread*> Tthreadlist;
Tthreadlist m_threadlist;
@ -45,6 +46,9 @@ private:
boost::thread* m_serverThread;
#endif // puma
//! unique server run ID
uint64_t m_runid;
#ifdef SERVER_PERFORMANCE_MEASURE
static volatile unsigned m_DoneCount; //! the number of finished jobs
#ifndef __puma
@ -75,6 +79,7 @@ public:
JobServer(int port = SERVER_COMM_TCP_PORT) : m_port(port), m_finish(false), m_noMoreExps(false),
m_maxThreads(128), m_threadtimeout(0)
{
m_runid = std::time(0);
#ifndef __puma
m_serverThread = new boost::thread(&JobServer::run, this); // run operator()() in a thread.
#ifdef SERVER_PERFORMANCE_MEASURE