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

makes a bit easier to detect an aborted move in config.changelog

Browse Source
This commit is contained in:
Alberto Lerner 2010-12-28 18:49:39 -05:00
parent 8937f72ef7
commit 6da107cc62
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
s/d_migrate.cpp
View File

@ -55,20 +55,29 @@ namespace mongo {
class MoveTimingHelper {
public:
MoveTimingHelper( const string& where , const string& ns , BSONObj min , BSONObj max )
: _where( where ) , _ns( ns ){
_next = 1;
MoveTimingHelper( const string& where , const string& ns , BSONObj min , BSONObj max , int total )
: _where( where ) , _ns( ns ) , _next( 0 ) , _total( total ) {
_nextNote = 0;
_b.append( "min" , min );
_b.append( "max" , max );
}
~MoveTimingHelper(){
// even if logChange doesn't throw, bson does
// sigh
try {
if ( _next != _total ) {
note( "aborted" );
}
configServer.logChange( (string)"moveChunk." + _where , _ns, _b.obj() );
} catch ( const std::exception& e ) {
log( LL_WARNING ) << "couldn't record timing for moveChunk '" << _where << "': " << e.what() << endl;
}
}
void done( int step ){
assert( step == _next++ );
assert( step == ++_next );
assert( step <= _total );
stringstream ss;
ss << "step" << step;
@ -112,6 +121,7 @@ namespace mongo {
string _ns;
int _next;
int _total; // expected # of steps
int _nextNote;
BSONObjBuilder _b;
@ -646,7 +656,7 @@ namespace mongo {
configServer.init( configdb );
}
MoveTimingHelper timing( "from" , ns , min , max );
MoveTimingHelper timing( "from" , ns , min , max , 6 /* steps */);
Shard fromShard( from );
Shard toShard( to );
@ -1092,7 +1102,7 @@ namespace mongo {
assert( ! min.isEmpty() );
assert( ! max.isEmpty() );
MoveTimingHelper timing( "to" , ns , min , max );
MoveTimingHelper timing( "to" , ns , min , max , 5 /* steps */ );
ScopedDbConnection conn( from );
conn->getLastError(); // just test connection