get rid of readlocktryassert

mongodb · Apr 24, 2012 · f1eced2 · f1eced2
1 parent a486732
commit f1eced2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/mongo/db/d_concurrency.h b/src/mongo/db/d_concurrency.h
@@ -143,14 +143,6 @@ namespace mongo {
         bool got() const { return _got; }
     };
 
-    struct readlocktryassert : public readlocktry {
-        readlocktryassert(int tryms) :
-            readlocktry(tryms) {
-            uassert(13142, "timeout getting readlock", got());
-        }
-    };
-
-
     /** a mutex, but reported in curop() - thus a "high level" (HL) one
         some overhead so we don't use this for everything.  the externalobjsort mutex
         uses this, as it can be held for eons. implementation still needed. */

diff --git a/src/mongo/db/restapi.cpp b/src/mongo/db/restapi.cpp
@@ -237,7 +237,8 @@ namespace mongo {
 
     void openAdminDb() { 
         {
-            readlocktryassert rl(/*"admin.system.users", */10000);
+            readlocktry rl(/*"admin.system.users", */10000);
+            uassert( 16172 , "couldn't get readlock to open admin db" , rl.got() );
             if( dbHolder().get("admin.system.users",dbpath) )
                 return;
         }
@@ -249,15 +250,17 @@ namespace mongo {
 
     bool RestAdminAccess::haveAdminUsers() const {
         openAdminDb();
-        readlocktryassert rl(/*"admin.system.users", */10000);
+        readlocktry rl(/*"admin.system.users", */10000);
+        uassert( 16173 , "couldn't get read lock to get admin auth credentials" , rl.got() );
         Client::Context cx( "admin.system.users", dbpath, false );
         return ! Helpers::isEmpty("admin.system.users", false);
     }
 
     BSONObj RestAdminAccess::getAdminUser( const string& username ) const {
         openAdminDb();
         Client::GodScope gs;
-        readlocktryassert rl(/*"admin.system.users", */10000);
+        readlocktry rl(/*"admin.system.users", */10000);
+        uassert( 16174 , "couldn't get read lock to check admin user" , rl.got() );
         Client::Context cx( "admin.system.users" );
         BSONObj user;
         if ( Helpers::findOne( "admin.system.users" , BSON( "user" << username ) , user ) )