JAVA-401: Catch and log exception on ensuring indices for GridFS collections. Exceptions can happen if the MongoClient is a direct connection to a secondary, so this can happen under normal circumstances.

Author: jyemin

src/main/com/mongodb/gridfs/CLI.java

@@ -21,6 +21,8 @@
 import com.mongodb.DBObject;
 import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
+import com.mongodb.ReadPreference;
 import com.mongodb.util.Util;
 
 import java.io.File;
@@ -37,24 +39,24 @@ public class CLI {
      *  Dumps usage info to stdout
      */
     private static void printUsage() {
-        System.out.println("Usage : [--bucket bucketname] action");
+        System.out.println("Usage : [--db database] action");
         System.out.println("  where  action is one of:");
         System.out.println("      list                      : lists all files in the store");
         System.out.println("      put filename              : puts the file filename into the store");
         System.out.println("      get filename1 filename2   : gets filename1 from store and sends to filename2");
         System.out.println("      md5 filename              : does an md5 hash on a file in the db (for testing)");
     }
 
-    private static String host = "127.0.0.1";
     private static String db = "test";
-    
+    private static String uri = "mongodb://127.0.0.1";
     private static Mongo _mongo = null;
 
     @SuppressWarnings("deprecation")
     private static Mongo getMongo()
         throws Exception {
-        if ( _mongo == null )
-            _mongo = new MongoClient( host );
+        if ( _mongo == null )  {
+            _mongo = new MongoClient(new MongoClientURI(uri));
+        }
         return _mongo;
     }
 
@@ -73,8 +75,6 @@ public static void main(String[] args) throws Exception {
             return;
         }
 
-        Mongo m = null;
-
         for ( int i=0; i<args.length; i++ ){
             String s = args[i];
 
@@ -85,7 +85,13 @@ public static void main(String[] args) throws Exception {
             }
 
             if ( s.equals( "--host" ) ){
-                host = args[i+1];
+                uri = "mongodb://" + args[i+1];
+                i++;
+                continue;
+            }
+
+            if ( s.equals( "--uri" ) ){
+                uri = args[i+1];
                 i++;
                 continue;
             }

src/main/com/mongodb/gridfs/GridFS.java

@@ -25,7 +25,9 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
+import com.mongodb.MongoException;
 import org.bson.types.ObjectId;
 
 import com.mongodb.BasicDBObject;
@@ -43,6 +45,7 @@
  * @dochub gridfs
  */
 public class GridFS {
+    private static final Logger LOGGER = Logger.getLogger( "com.mongodb.gridfs" );
 
     /**
      * file's chunk size
@@ -91,11 +94,16 @@ public GridFS(DB db, String bucket) {
         _chunkCollection = _db.getCollection( _bucketName + ".chunks" );
 
         // ensure standard indexes as long as collections are small
-        if (_filesCollection.count() < 1000)
-            _filesCollection.ensureIndex( BasicDBObjectBuilder.start().add( "filename" , 1 ).add( "uploadDate" , 1 ).get() );
-        if (_chunkCollection.count() < 1000)
-            _chunkCollection.ensureIndex( BasicDBObjectBuilder.start().add( "files_id" , 1 ).add( "n" , 1 ).get() , BasicDBObjectBuilder.start().add( "unique" , 1 ).get() );
-
+        try {
+            if (_filesCollection.count() < 1000) {
+                _filesCollection.ensureIndex( BasicDBObjectBuilder.start().add( "filename" , 1 ).add( "uploadDate" , 1 ).get() );
+            }
+            if (_chunkCollection.count() < 1000) {
+                _chunkCollection.ensureIndex( BasicDBObjectBuilder.start().add( "files_id" , 1 ).add( "n" , 1 ).get() , BasicDBObjectBuilder.start().add( "unique" , 1 ).get() );
+            }
+        } catch (MongoException e) {
+             LOGGER.info(String.format("Unable to ensure indices on GridFS collections in database %s", db.getName()));
+        }
         _filesCollection.setObjectClass( GridFSDBFile.class );
     }