Check dbhash on config servers once a minute and report failures SERVER-3323

2 files changed, 12 insertions, 1 deletions

diff --git a/s/config.cpp b/s/config.cpp
index 00800649645..07da064fa6f 100644
--- a/s/config.cpp
+++ b/s/config.cpp
@@ -609,7 +609,7 @@ namespace mongo {
         if ( checkConsistency ) {
             string errmsg;
             if ( ! checkConfigServersConsistent( errmsg ) ) {
-                log( LL_ERROR ) << "config servers not in sync! " << errmsg << endl;
+                log( LL_ERROR ) << "config servers not in sync! " << errmsg << warnings;
                 return false;
             }
         }
diff --git a/s/server.cpp b/s/server.cpp
index d8502ec0583..1ee30f126e5 100644
--- a/s/server.cpp
+++ b/s/server.cpp
@@ -26,6 +26,7 @@
 #include "../util/ramlog.h"
 #include "../util/signal_handlers.h"
 #include "../util/admin_access.h"
+#include "../util/concurrency/task.h"
 #include "../db/dbwebserver.h"
 #include "../scripting/engine.h"
 
@@ -318,6 +319,16 @@ int _main(int argc, char* argv[]) {
         return 8;
     }
 
+    {
+        class CheckConfigServers : public task::Task {
+            virtual string name() const { return "CheckConfigServers"; }
+            virtual void doWork() { configServer.ok(true); }
+        };
+        static CheckConfigServers checkConfigServers;
+
+        task::repeat(&checkConfigServers, 60*1000);
+    }
+
     int configError = configServer.checkConfigVersion( params.count( "upgrade" ) );
     if ( configError ) {
         if ( configError > 0 ) {