Merge pull request pulp#2470 from asmacdo/1738-old-indexes

Create mongoengine indexes only after migrations

server/pulp/plugins/loader/api.py

@@ -432,15 +432,18 @@ def load_content_types(types_dir=_TYPES_DIR, dry_run=False, drop_indices=False):
 
     # to handle node.json only
     descriptors = _load_type_descriptors(types_dir)
-    definitions = parser.parse(descriptors)
+    pre_mongoengine_definitions = parser.parse(descriptors)
 
     # get information about content unit types from entry points
-    definitions += _generate_plugin_definitions()
+    mongoengine_definitions = _generate_plugin_definitions()
 
     if dry_run:
-        return _check_content_definitions(definitions)
+        return _check_content_definitions(pre_mongoengine_definitions + mongoengine_definitions)
     else:
-        database.update_database(definitions, drop_indices=drop_indices)
+        database.update_database(pre_mongoengine_definitions, drop_indices=drop_indices,
+                                 create_indexes=True)
+        database.update_database(mongoengine_definitions, drop_indices=drop_indices,
+                                 create_indexes=False)
 
 # initialization methods -------------------------------------------------------
 

server/pulp/plugins/types/database.py

@@ -48,18 +48,21 @@ def __str__(self):
         return 'MissingDefinitions [%s]' % ', '.join(self.missing_type_ids)
 
 
-def update_database(definitions, error_on_missing_definitions=False, drop_indices=False):
+def update_database(definitions, error_on_missing_definitions=False, drop_indices=False,
+                    create_indexes=True):
     """
     Brings the database up to date with the types defined in the given
     descriptors.
 
-    @param definitions: set of all definitions
-    @type  definitions: list of L{TypeDefinitions}
+    :param definitions: set of all definitions
+    :type  definitions: list of L{TypeDefinitions}
 
-    @param error_on_missing_definitions: if True, an exception will be raised
+    :param error_on_missing_definitions: if True, an exception will be raised
            if there is one or more type collections already in the database
            that are not represented in the given descriptors; defaults to False
-    @type  error_on_missing_definitions: bool
+    :type  error_on_missing_definitions: bool
+    :param create_indexes: If True, ensure indexes of pre-mongoengine collections
+    :type  create_indexes: bool
     """
 
     all_type_ids = [d.id for d in definitions]
@@ -101,19 +104,20 @@ def update_database(definitions, error_on_missing_definitions=False, drop_indice
                 error_defs.append(type_def)
                 continue
 
-        try:
-            _update_unit_key(type_def)
-        except Exception:
-            _logger.exception('Exception updating unit key for type [%s]' % type_def.id)
-            error_defs.append(type_def)
-            continue
+        if create_indexes:
+            try:
+                _update_unit_key(type_def)
+            except Exception:
+                _logger.exception('Exception updating unit key for type [%s]' % type_def.id)
+                error_defs.append(type_def)
+                continue
 
-        try:
-            _update_search_indexes(type_def)
-        except Exception:
-            _logger.exception('Exception updating search indexes for type [%s]' % type_def.id)
-            error_defs.append(type_def)
-            continue
+            try:
+                _update_search_indexes(type_def)
+            except Exception:
+                _logger.exception('Exception updating search indexes for type [%s]' % type_def.id)
+                error_defs.append(type_def)
+                continue
 
     if len(error_defs) > 0:
         raise UpdateFailed(error_defs)

server/test/unit/plugins/types/test_database.py

@@ -28,7 +28,7 @@ def test_update_clean_database(self):
 
         # Test
         defs = [DEF_1, DEF_2, DEF_3, DEF_4]
-        types_db.update_database(defs)
+        types_db.update_database(defs, create_indexes=True)
 
         # Verify
         all_collection_names = types_db.all_type_collection_names()
@@ -57,7 +57,7 @@ def test_update_no_changes(self):
         # Test
         # no real reason for this, just felt better than using the previous list
         same_defs = [DEF_4, DEF_3, DEF_2, DEF_1]
-        types_db.update_database(same_defs)
+        types_db.update_database(same_defs, create_indexes=True)
 
         # Verify
         all_collection_names = types_db.all_type_collection_names()
@@ -81,11 +81,11 @@ def test_update_missing_no_error(self):
 
         # Setup
         defs = [DEF_1, DEF_2, DEF_3]
-        types_db.update_database(defs)
+        types_db.update_database(defs, create_indexes=True)
 
         # Test
         new_defs = [DEF_4]
-        types_db.update_database(new_defs)
+        types_db.update_database(new_defs, create_indexes=True)
 
         # Verify
         all_collection_names = types_db.all_type_collection_names()