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

consolidate replset config parsing

Browse Source
This commit is contained in:
Eliot Horowitz 2010-07-14 13:34:01 -04:00
parent 6cebdef81d
commit 9c035c3627
3 changed files with 11 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
db/repl/rs.cpp
View File

@ -112,13 +112,12 @@ namespace mongo {
}
*/
void parseReplsetCmdLine(string cfgString, string& setname, vector<HostAndPort>& seeds) {
void parseReplsetCmdLine(string cfgString, string& setname, vector<HostAndPort>& seeds, set<HostAndPort>& seedSet ) {
const char *p = cfgString.c_str();
const char *slash = strchr(p, '/');
uassert(13093, "bad --replSet config string format is: <setname>/<seedhost1>,<seedhost2>[,...]", slash != 0 && p != slash);
setname = string(p, slash-p);
set<HostAndPort> seedSet;
p = slash + 1;
while( 1 ) {
const char *comma = strchr(p, ',');
@ -152,47 +151,14 @@ namespace mongo {
_self(0),
mgr( new Manager(this) )
{
// todo: call parseReplSetCmdLine here instead of this redundant code
h = 0;
_myState = STARTUP;
_currentPrimary = 0;
const char *p = cfgString.c_str();
const char *slash = strchr(p, '/');
uassert(13093, "bad --replSet config string format is: <setname>/<seedhost1>,<seedhost2>[,...]", slash != 0 && p != slash);
_name = string(p, slash-p);
log() << "replSet startup " << cfgString << rsLog;
set<HostAndPort> seedSet;
vector<HostAndPort> *seeds = new vector<HostAndPort>;
p = slash + 1;
while( 1 ) {
const char *comma = strchr(p, ',');
if( comma == 0 ) comma = strchr(p,0);
if( p == comma )
break;
//uassert(13094, "bad --replSet config string", p != comma);
{
HostAndPort m;
try {
m = HostAndPort( string(p, comma-p) );
}
catch(...) {
uassert(13114, "bad --replSet seed hostname", false);
}
uassert(13096, "bad --replSet config string - dups?", seedSet.count(m) == 0 );
seedSet.insert(m);
uassert(13101, "can't use localhost in replset host list", !m.isLocalHost());
if( m.isSelf() )
log() << "replSet ignoring seed " << m.toString() << " (=self)" << rsLog;
else
seeds->push_back(m);
if( *comma == 0 )
break;
p = comma + 1;
}
}
set<HostAndPort> seedSet;
parseReplsetCmdLine( cfgString , _name ,*seeds , seedSet );
_seeds = seeds;
//for( vector<HostAndPort>::iterator i = seeds->begin(); i != seeds->end(); i++ )

4
db/repl/rs.h
View File

@ -276,7 +276,11 @@ namespace mongo {
return true;
}
};
/** helpers ----------------- */
void parseReplsetCmdLine(string cfgString, string& setname, vector<HostAndPort>& seeds, set<HostAndPort>& seedSet );
/** inlines ----------------- */
inline Member::Member(HostAndPort h, unsigned ord, const ReplSetConfig::MemberCfg *c) :

7
db/repl/rs_initiate.cpp
View File

@ -87,8 +87,6 @@ namespace mongo {
}
}
void parseReplsetCmdLine(string cfgString, string& setname, vector<HostAndPort>& seeds);
class CmdReplSetInitiate : public ReplSetCommand {
public:
virtual LockType locktype() const { return NONE; }
@ -152,13 +150,14 @@ namespace mongo {
string name;
vector<HostAndPort> seeds;
parseReplsetCmdLine(cmdLine.replSet, name, seeds); // may throw...
set<HostAndPort> seedSet;
parseReplsetCmdLine(cmdLine.replSet, name, seeds, seedSet); // may throw...
bob b;
b.append("_id", name);
bob members;
members.append("0", BSON( "_id" << 0 << "host" << HostAndPort::me().toString() ));
for( int i = 0; i < seeds.size(); i++ )
for( unsigned i = 0; i < seeds.size(); i++ )
members.append(bob::numStr(i), BSON( "_id" << i << "host" << seeds[i].toString()));
b.appendArray("members", members.obj());
configObj = b.obj();