clean up some file names rs

17 files changed, 70 insertions, 59 deletions

diff --git a/SConstruct b/SConstruct
index 2ca8617f42e..554aef732cf 100644
--- a/SConstruct
+++ b/SConstruct
@@ -410,7 +410,7 @@ coreServerFiles = [ "util/message_server_port.cpp" , "util/message_server_asio.c
                     "client/parallel.cpp" ,  
                     "db/matcher.cpp" , "db/indexkey.cpp" , "db/dbcommands_generic.cpp" ]
 
-serverOnlyFiles = Split( "db/query.cpp db/update.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/repl/replset.cpp db/repl/consensus.cpp db/repl/rs_initiate.cpp db/repl/replset_commands.cpp db/repl/manager.cpp db/repl/health.cpp db/repl/heartbeat.cpp db/repl/rs_config.cpp db/oplog.cpp db/repl_block.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/matcher_covered.cpp db/dbeval.cpp db/dbwebserver.cpp db/dbhelpers.cpp db/instance.cpp db/client.cpp db/database.cpp db/pdfile.cpp db/cursor.cpp db/security_commands.cpp db/security.cpp util/miniwebserver.cpp db/storage.cpp db/queryoptimizer.cpp db/extsort.cpp db/mr.cpp s/d_util.cpp db/cmdline.cpp" )
+serverOnlyFiles = Split( "db/query.cpp db/update.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/repl/rs.cpp db/repl/consensus.cpp db/repl/rs_initiate.cpp db/repl/replset_commands.cpp db/repl/manager.cpp db/repl/health.cpp db/repl/heartbeat.cpp db/repl/rs_config.cpp db/oplog.cpp db/repl_block.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/matcher_covered.cpp db/dbeval.cpp db/dbwebserver.cpp db/dbhelpers.cpp db/instance.cpp db/client.cpp db/database.cpp db/pdfile.cpp db/cursor.cpp db/security_commands.cpp db/security.cpp util/miniwebserver.cpp db/storage.cpp db/queryoptimizer.cpp db/extsort.cpp db/mr.cpp s/d_util.cpp db/cmdline.cpp" )
 
 serverOnlyFiles += [ "db/index.cpp" ] + Glob( "db/index_*.cpp" )
 
diff --git a/db/db.cpp b/db/db.cpp
index b5eeea16b73..a4e5a92bde8 100644
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -30,7 +30,7 @@
 #include "clientcursor.h"
 #include "pdfile.h"
 #include "stats/counters.h"
-#include "repl/replset.h"
+#include "repl/rs.h"
 #if !defined(_WIN32)
 #include <sys/file.h>
 #endif
diff --git a/db/db.vcxproj b/db/db.vcxproj
index 2cc01f62a42..dbe071411af 100644
--- a/db/db.vcxproj
+++ b/db/db.vcxproj
@@ -549,7 +549,7 @@
     <ClCompile Include="btree.cpp" />

     <ClCompile Include="btreecursor.cpp" />

     <ClCompile Include="repl\health.cpp" />

-    <ClCompile Include="repl\replset.cpp" />

+    <ClCompile Include="repl\rs.cpp" />

     <ClCompile Include="repl\replset_commands.cpp" />

     <ClCompile Include="repl\rs_config.cpp" />

   </ItemGroup>

@@ -588,7 +588,7 @@
     <ClInclude Include="repl\connections.h" />

     <ClInclude Include="repl\multicmd.h" />

     <ClInclude Include="repl\rsmember.h" />

-    <ClInclude Include="repl\rstime.h" />

+    <ClInclude Include="repl\rs_optime.h" />

     <ClInclude Include="stats\counters.h" />

     <ClInclude Include="stats\snapshots.h" />

     <ClInclude Include="stats\top.h" />

@@ -675,7 +675,7 @@
     <ClInclude Include="btree.h" />

     <ClInclude Include="repl\health.h" />

     <ClInclude Include="..\util\hostandport.h" />

-    <ClInclude Include="repl\replset.h" />

+    <ClInclude Include="repl\rs.h" />

     <ClInclude Include="repl\rs_config.h" />

     <ClInclude Include="..\bson\bsonelement.h" />

     <ClInclude Include="..\bson\bsoninlines.h" />

diff --git a/db/db.vcxproj.filters b/db/db.vcxproj.filters
index e3225b78ffd..6eb7627e8a9 100755
--- a/db/db.vcxproj.filters
+++ b/db/db.vcxproj.filters
@@ -181,17 +181,14 @@
     <ClCompile Include="..\util\util.cpp">

       <Filter>db</Filter>

     </ClCompile>

-    <ClCompile Include="repl\replset.cpp">

-      <Filter>db\replset</Filter>

-    </ClCompile>

     <ClCompile Include="repl\replset_commands.cpp">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClCompile>

     <ClCompile Include="repl\rs_config.cpp">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClCompile>

     <ClCompile Include="repl\health.cpp">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClCompile>

     <ClCompile Include="..\util\background.cpp">

       <Filter>util</Filter>

@@ -209,7 +206,7 @@
       <Filter>db\btree</Filter>

     </ClCompile>

     <ClCompile Include="repl\consensus.cpp">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClCompile>

     <ClCompile Include="..\pch.cpp" />

     <ClCompile Include="..\client\connpool.cpp">

@@ -222,7 +219,7 @@
       <Filter>client</Filter>

     </ClCompile>

     <ClCompile Include="repl\manager.cpp">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClCompile>

     <ClCompile Include="..\pcre-7.4\pcreposix.c">

       <Filter>util\pcre</Filter>

@@ -303,7 +300,7 @@
       <Filter>util</Filter>

     </ClCompile>

     <ClCompile Include="repl\rs_initiate.cpp">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClCompile>

     <ClCompile Include="..\util\concurrency\vars.cpp">

       <Filter>util\concurrency</Filter>

@@ -312,7 +309,7 @@
       <Filter>util\concurrency</Filter>

     </ClCompile>

     <ClCompile Include="repl\heartbeat.cpp">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClCompile>

     <ClCompile Include="..\s\shardconnection.cpp">

       <Filter>db</Filter>

@@ -330,6 +327,9 @@
       <Filter>client</Filter>

     </ClCompile>

     <ClCompile Include="..\util\version.cpp" />

+    <ClCompile Include="repl\rs.cpp">

+      <Filter>db\rs</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="client.h">

@@ -542,14 +542,11 @@
     <ClInclude Include="update.h">

       <Filter>db</Filter>

     </ClInclude>

-    <ClInclude Include="repl\replset.h">

-      <Filter>db\replset</Filter>

-    </ClInclude>

     <ClInclude Include="repl\rs_config.h">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClInclude>

     <ClInclude Include="repl\health.h">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClInclude>

     <ClInclude Include="..\util\allocator.h">

       <Filter>util</Filter>

@@ -598,7 +595,7 @@
     </ClInclude>

     <ClInclude Include="..\pch.h" />

     <ClInclude Include="repl\connections.h">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClInclude>

     <ClInclude Include="..\client\connpool.h">

       <Filter>client</Filter>

@@ -609,9 +606,6 @@
     <ClInclude Include="..\util\ramlog.h">

       <Filter>util</Filter>

     </ClInclude>

-    <ClInclude Include="repl\rstime.h">

-      <Filter>db\replset</Filter>

-    </ClInclude>

     <ClInclude Include="..\util\mongoutils\html.h">

       <Filter>util\mongoutils</Filter>

     </ClInclude>

@@ -631,7 +625,7 @@
       <Filter>util</Filter>

     </ClInclude>

     <ClInclude Include="repl\rsmember.h">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClInclude>

     <ClInclude Include="..\util\concurrency\list.h">

       <Filter>util\concurrency</Filter>

@@ -652,7 +646,7 @@
       <Filter>util\concurrency</Filter>

     </ClInclude>

     <ClInclude Include="repl\multicmd.h">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </ClInclude>

     <ClInclude Include="..\util\concurrency\msg.h">

       <Filter>util\concurrency</Filter>

@@ -702,6 +696,12 @@
     <ClInclude Include="..\client\syncclusterconnection.h">

       <Filter>client</Filter>

     </ClInclude>

+    <ClInclude Include="repl\rs_optime.h">

+      <Filter>db\rs</Filter>

+    </ClInclude>

+    <ClInclude Include="repl\rs.h">

+      <Filter>db\rs</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <Filter Include="libs">

@@ -734,15 +734,15 @@
     <Filter Include="db\btree">

       <UniqueIdentifier>{37b238b2-21ec-4788-bdf9-a59b43490454}</UniqueIdentifier>

     </Filter>

-    <Filter Include="db\replset">

+    <Filter Include="scripting">

+      <UniqueIdentifier>{6b78f34f-e6b0-49e4-b04e-6478c3a3c077}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="db\rs">

       <UniqueIdentifier>{3b73f786-d352-446f-a5f5-df49384baf7a}</UniqueIdentifier>

     </Filter>

-    <Filter Include="db\replset\test stuff">

+    <Filter Include="db\rs\test stuff">

       <UniqueIdentifier>{4a1ea357-1077-4ad1-85b4-db48a6e1eb46}</UniqueIdentifier>

     </Filter>

-    <Filter Include="scripting">

-      <UniqueIdentifier>{6b78f34f-e6b0-49e4-b04e-6478c3a3c077}</UniqueIdentifier>

-    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="db.rc">

@@ -751,17 +751,17 @@
   </ItemGroup>

   <ItemGroup>

     <None Include="repl\notes.txt">

-      <Filter>db\replset</Filter>

+      <Filter>db\rs</Filter>

     </None>

     <None Include="..\util\mongoutils\README">

       <Filter>util\mongoutils</Filter>

     </None>

     <None Include="..\SConstruct" />

     <None Include="repl\testing.js">

-      <Filter>db\replset\test stuff</Filter>

+      <Filter>db\rs\test stuff</Filter>

     </None>

     <None Include="repl\test.html">

-      <Filter>db\replset\test stuff</Filter>

+      <Filter>db\rs\test stuff</Filter>

     </None>

     <None Include="readme.txt">

       <Filter>util\concurrency</Filter>

diff --git a/db/repl.cpp b/db/repl.cpp
index a693391880d..5a848c176b3 100644
--- a/db/repl.cpp
+++ b/db/repl.cpp
@@ -46,7 +46,7 @@
 #include "security.h"
 #include "cmdline.h"
 #include "repl_block.h"
-#include "repl/replset.h"
+#include "repl/rs.h"
 
 namespace mongo {
     
diff --git a/db/repl/consensus.cpp b/db/repl/consensus.cpp
index 68c379ef018..137ab85daa1 100644
--- a/db/repl/consensus.cpp
+++ b/db/repl/consensus.cpp
@@ -16,7 +16,7 @@
 
 #include "pch.h"
 #include "../commands.h"
-#include "replset.h"
+#include "rs.h"
 #include "multicmd.h"
 
 namespace mongo { 
diff --git a/db/repl/health.cpp b/db/repl/health.cpp
index 1b16c13dffa..36fce22f603 100644
--- a/db/repl/health.cpp
+++ b/db/repl/health.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "pch.h"
-#include "replset.h"
+#include "rs.h"
 #include "health.h"
 #include "../../util/background.h"
 #include "../../client/dbclient.h"
diff --git a/db/repl/heartbeat.cpp b/db/repl/heartbeat.cpp
index 01560776664..8c375081c1e 100644
--- a/db/repl/heartbeat.cpp
+++ b/db/repl/heartbeat.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "pch.h"
-#include "replset.h"
+#include "rs.h"
 #include "health.h"
 #include "../../util/background.h"
 #include "../../client/dbclient.h"
diff --git a/db/repl/manager.cpp b/db/repl/manager.cpp
index 28dd3a7d041..07162a8629f 100644
--- a/db/repl/manager.cpp
+++ b/db/repl/manager.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "pch.h"
-#include "replset.h"
+#include "rs.h"
 
 namespace mongo {
 
diff --git a/db/repl/replset_commands.cpp b/db/repl/replset_commands.cpp
index fc2e8c70657..d902c3d45da 100644
--- a/db/repl/replset_commands.cpp
+++ b/db/repl/replset_commands.cpp
@@ -18,7 +18,7 @@
 #include "../cmdline.h"
 #include "../commands.h"
 #include "health.h"
-#include "replset.h"
+#include "rs.h"
 #include "rs_config.h"
 
 namespace mongo { 
diff --git a/db/repl/replset.cpp b/db/repl/rs.cpp
index 4358c23ec3e..1bc5103bae5 100644
--- a/db/repl/replset.cpp
+++ b/db/repl/rs.cpp
@@ -17,7 +17,7 @@
 #include "pch.h"
 #include "../cmdline.h"
 #include "../../util/sock.h"
-#include "replset.h"
+#include "rs.h"
 #include "../client.h"
 
 namespace mongo { 
diff --git a/db/repl/replset.h b/db/repl/rs.h
index 0b151bb8a48..24a5d8c6588 100644
--- a/db/repl/replset.h
+++ b/db/repl/rs.h
@@ -1,4 +1,4 @@
-// /db/repl/replset.h
+// /db/repl/rs.h
 
 /**
 *    Copyright (C) 2008 10gen Inc.
@@ -23,7 +23,7 @@
 #include "../../util/concurrency/msg.h"
 #include "../../util/hostandport.h"
 #include "../commands.h"
-#include "rstime.h"
+#include "rs_optime.h"
 #include "rsmember.h"
 #include "rs_config.h"
 
diff --git a/db/repl/rs_config.cpp b/db/repl/rs_config.cpp
index 5ba2ef778a5..332056bcb6c 100644
--- a/db/repl/rs_config.cpp
+++ b/db/repl/rs_config.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "pch.h"
-#include "replset.h"
+#include "rs.h"
 #include "../../client/dbclient.h"
 #include "../../client/syncclusterconnection.h"
 #include "../../util/hostandport.h"
diff --git a/db/repl/rs_initiate.cpp b/db/repl/rs_initiate.cpp
index cd4640fd08c..5a619881f5e 100644
--- a/db/repl/rs_initiate.cpp
+++ b/db/repl/rs_initiate.cpp
@@ -23,7 +23,7 @@
 #include "../../util/mmap.h"
 #include "../../util/mongoutils/str.h"
 #include "health.h"
-#include "replset.h"
+#include "rs.h"
 #include "rs_config.h"
 
 using namespace bson;
@@ -81,6 +81,18 @@ namespace mongo {
         virtual bool run(const string& , BSONObj& cmdObj, string& errmsg, BSONObjBuilder& result, bool fromRepl) {
             log() << "replSet replSetInitiate admin command received from client" << rsLog;
 
+            {
+                // just make sure we can get a write lock before doing anything else.  we'll reacquire one 
+                // later.  of course it could be stuck then, but this check lowers the risk if weird things 
+                // are up.
+                time_t t = time(0);
+                writelock lk("admin.");
+                if( time(0)-t > 10 ) { 
+                    errmsg = "took a long time to get write lock, so not initiating.  Initiate when server less busy?";
+                    return false;
+                }
+            }
+
             if( !replSet ) { 
                 errmsg = "server is not running with --replSet";
                 return false;
diff --git a/db/repl/rs_optime.h b/db/repl/rs_optime.h
new file mode 100644
index 00000000000..46cb261f1f4
--- /dev/null
+++ b/db/repl/rs_optime.h
@@ -0,0 +1,12 @@
+// @file rs_optime.h

+

+#pragma once

+

+namespace mongo {

+

+    struct rsoptime { 

+        unsigned long long ord;

+        void reset() { ord = ~0; }

+    };

+

+}

diff --git a/db/repl/rstime.h b/db/repl/rstime.h
deleted file mode 100644
index c5f9f87e60d..00000000000
--- a/db/repl/rstime.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// @file rstime.h

-

-#pragma once

-

-namespace mongo {

-

-    struct rstime { 

-        unsigned long long v;

-        unsigned server() const { return (unsigned) (v >> (64-8)); }

-        unsigned long long op() const { return v & 0xffffffffffffffLL; }

-    };

-

-}

diff --git a/db/replpair.h b/db/replpair.h
index 337266d76e6..e7fc149aa85 100644
--- a/db/replpair.h
+++ b/db/replpair.h
@@ -22,7 +22,7 @@
 #include "../client/dbclient.h"
 #include "repl.h"
 #include "cmdline.h"
-#include "repl/replset.h"
+#include "repl/rs.h"
 
 namespace mongo {