mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-10232 wait for inactive on migration commit, not DONE

Browse Source
This commit is contained in:
Greg Studer 2013-11-18 17:30:06 -05:00
parent 272b6607b6
commit b303efd6b2
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mongo/s/d_migrate.cpp
View File

@ -2036,20 +2036,30 @@ namespace mongo {
}
bool startCommit() {
if ( state != STEADY )
return false;
state = COMMIT_START;
Timer t;
// we wait for the commit to succeed before giving up
while ( t.seconds() <= 30 ) {
log() << "Waiting for commit to finish" << endl;
sleepmillis(1);
if ( state == DONE )
return true;
boost::xtime xt;
boost::xtime_get(&xt, MONGO_BOOST_TIME_UTC);
xt.sec += 30;
scoped_lock lock(m_active);
while ( active ) {
if ( ! isActiveCV.timed_wait( lock.boost(), xt ) ){
// TIMEOUT
state = FAIL;
log() << "startCommit never finished!" << migrateLog;
return false;
}
}
state = FAIL;
log() << "startCommit never finished!" << migrateLog;
if ( state == DONE ) {
return true;
}
log() << "startCommit failed, final data failed to transfer" << migrateLog;
return false;
}
@ -2059,10 +2069,15 @@ namespace mongo {
}
bool getActive() const { scoped_lock l(m_active); return active; }
void setActive( bool b ) { scoped_lock l(m_active); active = b; }
void setActive( bool b ) {
scoped_lock l(m_active);
active = b;
isActiveCV.notify_all();
}
mutable mongo::mutex m_active;
bool active;
boost::condition isActiveCV;
string ns;
string from;