defensive

ice799 · Jul 17, 2011 · bf0e20d · bf0e20d
1 parent 1ab3f66
commit bf0e20d
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 5 deletions.
diff --git a/db/repl/rs_config.cpp b/db/repl/rs_config.cpp
@@ -440,7 +440,7 @@ namespace mongo {
 
                     for (set<MemberCfg *>::iterator cfg = (*sgs).second->m.begin();
                          !foundMe && cfg != (*sgs).second->m.end(); cfg++) {
-                        (*cfg)->groups.insert((*sgs).second);
+                        (*cfg)->groupsw(this).insert((*sgs).second);
                     }
                 }
 
@@ -575,6 +575,7 @@ namespace mongo {
     }
 
     ReplSetConfig::ReplSetConfig(BSONObj cfg, bool force) {
+        _constructed = false;
         clear();
         from(cfg);
         if( force ) {
@@ -584,9 +585,11 @@ namespace mongo {
         if( version < 1 )
             version = 1;
         _ok = true;
+        _constructed = true;
     }
 
     ReplSetConfig::ReplSetConfig(const HostAndPort& h) {
+        _constructed = false;
         clear();
         int level = 2;
         DEV level = 0;
@@ -662,6 +665,7 @@ namespace mongo {
         checkRsConfig();
         _ok = true;
         log(level) << "replSet load config ok from " << (h.isSelf() ? "self" : h.toString()) << rsLog;
+        _constructed = true;
     }
 
 }
diff --git a/db/repl/rs_config.h b/db/repl/rs_config.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include "../../util/net/hostandport.h"
+#include "../../util/concurrency/race.h"
 #include "health.h"
 
 namespace mongo {
@@ -29,7 +30,6 @@ namespace mongo {
 
     class ReplSetConfig {
         enum { EMPTYCONFIG = -2 };
-    private:
         struct TagSubgroup;
     public:
         /**
@@ -62,13 +62,21 @@ namespace mongo {
             bool hidden;          /* if set, don't advertise to drives in isMaster. for non-primaries (priority 0) */
             bool buildIndexes;    /* if false, do not create any non-_id indexes */
             set<string> tags;     /* tagging for data center, rack, etc. */
-            set<TagSubgroup*> groups; // the subgroups this member belongs to
-
+        private:
+            set<TagSubgroup*> _groups; // the subgroups this member belongs to
+        public:
+            const set<TagSubgroup*>& groups() const { 
+                return _groups;
+            }
+            set<TagSubgroup*>& groupsw(ReplSetConfig *c) { 
+                assert(!c->_constructed);
+                return _groups;
+            }
             void check() const;   /* check validity, assert if not. */
             BSONObj asBson() const;
             bool potentiallyHot() const { return !arbiterOnly && priority > 0; }
             void updateGroups(const OpTime& last) {
-                for (set<TagSubgroup*>::iterator it = groups.begin(); it != groups.end(); it++) {
+                for (set<TagSubgroup*>::iterator it = groups().begin(); it != groups().end(); it++) {
                     ((TagSubgroup*)(*it))->updateLast(last);
                 }
             }
@@ -107,6 +115,7 @@ namespace mongo {
 
         BSONObj asBson() const;
 
+        bool _constructed;
     private:
         bool _ok;
         void from(BSONObj);

diff --git a/util/concurrency/race.h b/util/concurrency/race.h
@@ -21,6 +21,38 @@ namespace mongo {
 
 #if defined(_DEBUG)
 
+    namespace race {
+
+        class CodePoint { 
+        public:
+            string lastName;
+            unsigned lastTid;
+            string file;
+            CodePoint(string f) : lastTid(0), file(f) { }
+        };
+        class Check {
+        public:
+            Check(CodePoint& p) {
+                unsigned t = GetCurrentThreadId();
+                if( p.lastTid == 0 ) {
+                    p.lastTid = t;
+                    p.lastName = getThreadName();
+                }
+                else if( t != p.lastTid ) { 
+                    log() << "\n\n\n\n\nRACE? error assert\n  " << p.file << '\n' 
+                        << "  " << p.lastName
+                        << "  " << getThreadName() << "\n\n" << endl;
+                    mongoAbort("racecheck");
+                }
+            };
+        };
+
+#define RACECHECK \
+        static race::CodePoint __cp(__FILE__); \
+        race::Check __ck(__cp);
+
+    }
+
     class CodeBlock { 
         volatile int n;
         unsigned tid;