Revert "feat!: upgrade pymongo (#34675)" (#35178)

This reverts commit cbd4904.

Makefile

@@ -137,8 +137,6 @@ compile-requirements: pre-requirements $(COMMON_CONSTRAINTS_TXT) ## Re-compile *
 	mv requirements/common_constraints.tmp requirements/common_constraints.txt
 	sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
 	mv requirements/common_constraints.tmp requirements/common_constraints.txt
-	sed 's/event-tracking<2.4.1//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
 	pip-compile -v --allow-unsafe ${COMPILE_OPTS} -o requirements/pip.txt requirements/pip.in
 	pip install -r requirements/pip.txt
 

requirements/common_constraints.txt

@@ -40,4 +40,4 @@ importlib-metadata<7
 # We will pin event-tracking to do not break existing installations
 # This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
 # has been resolved and edx-platform is running with pymongo>=4.4.0
-
+event-tracking<2.4.1

requirements/constraints.txt

@@ -32,13 +32,9 @@ django-oauth-toolkit==1.7.1
 # incremental upgrade
 django-simple-history==3.4.0
 
-# Adding pin to avoid any major upgrade
-pymongo<4.4.1
-
-# To override the constraint of edx-lint
-# This can be removed once https://github.com/openedx/edx-platform/issues/34586 is resolved
-# and the upstream constraint in edx-lint has been removed.
-event-tracking==3.0.0
+# constrained in opaque_keys. migration guide here: https://pymongo.readthedocs.io/en/4.0/migrate-to-pymongo4.html
+# Major upgrade will be done in separate ticket.
+pymongo<4.0.0
 
 # greater version has breaking changes and requires some migration steps.
 django-webpack-loader==0.7.0
@@ -129,4 +125,4 @@ numpy<2.0.0
 # django-storages==1.14.4 breaks course imports
 # Two lines were added in 1.14.4 that make file_exists_in_storage function always return False,
 # as the default value of AWS_S3_FILE_OVERWRITE is True
-django-storages<1.14.4
+django-storages<1.14.4

requirements/edx/base.txt

@@ -376,10 +376,6 @@ djangorestframework==3.14.0
     #   super-csv
 djangorestframework-xml==2.0.0
     # via edx-enterprise
-dnspython==2.6.1
-    # via
-    #   -r requirements/edx/paver.txt
-    #   pymongo
 done-xblock==2.3.0
     # via -r requirements/edx/bundled.in
 drf-jwt==1.19.2
@@ -540,9 +536,9 @@ enmerkar==0.7.1
     # via enmerkar-underscore
 enmerkar-underscore==2.3.0
     # via -r requirements/edx/kernel.in
-event-tracking==3.0.0
+event-tracking==2.4.0
     # via
-    #   -c requirements/edx/../constraints.txt
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/kernel.in
     #   edx-completion
     #   edx-proctoring
@@ -869,7 +865,7 @@ pylti1p3==2.0.0
     # via -r requirements/edx/kernel.in
 pymemcache==4.0.0
     # via -r requirements/edx/paver.txt
-pymongo==4.4.0
+pymongo==3.13.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in

requirements/edx/development.txt

@@ -614,10 +614,8 @@ djangorestframework-xml==2.0.0
     #   edx-enterprise
 dnspython==2.6.1
     # via
-    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   email-validator
-    #   pymongo
 docutils==0.21.2
     # via
     #   -r requirements/edx/doc.txt
@@ -855,9 +853,9 @@ enmerkar-underscore==2.3.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-event-tracking==3.0.0
+event-tracking==2.4.0
     # via
-    #   -c requirements/edx/../constraints.txt
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-completion
@@ -1537,7 +1535,7 @@ pymemcache==4.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-pymongo==4.4.0
+pymongo==3.13.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt

requirements/edx/doc.txt

@@ -440,10 +440,6 @@ djangorestframework-xml==2.0.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-dnspython==2.6.1
-    # via
-    #   -r requirements/edx/base.txt
-    #   pymongo
 docutils==0.21.2
     # via
     #   pydata-sphinx-theme
@@ -618,9 +614,9 @@ enmerkar==0.7.1
     #   enmerkar-underscore
 enmerkar-underscore==2.3.0
     # via -r requirements/edx/base.txt
-event-tracking==3.0.0
+event-tracking==2.4.0
     # via
-    #   -c requirements/edx/../constraints.txt
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-completion
     #   edx-proctoring
@@ -1030,7 +1026,7 @@ pylti1p3==2.0.0
     # via -r requirements/edx/base.txt
 pymemcache==4.0.0
     # via -r requirements/edx/base.txt
-pymongo==4.4.0
+pymongo==3.13.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt

requirements/edx/paver.txt

@@ -10,8 +10,6 @@ charset-normalizer==2.0.12
     # via
     #   -c requirements/edx/../constraints.txt
     #   requests
-dnspython==2.6.1
-    # via pymongo
 edx-opaque-keys==2.10.0
     # via -r requirements/edx/paver.in
 idna==3.7
@@ -38,7 +36,7 @@ psutil==6.0.0
     # via -r requirements/edx/paver.in
 pymemcache==4.0.0
     # via -r requirements/edx/paver.in
-pymongo==4.4.0
+pymongo==3.13.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/paver.in

requirements/edx/testing.txt

@@ -476,10 +476,7 @@ djangorestframework-xml==2.0.0
     #   -r requirements/edx/base.txt
     #   edx-enterprise
 dnspython==2.6.1
-    # via
-    #   -r requirements/edx/base.txt
-    #   email-validator
-    #   pymongo
+    # via email-validator
 done-xblock==2.3.0
     # via -r requirements/edx/base.txt
 drf-jwt==1.19.2
@@ -653,9 +650,9 @@ enmerkar==0.7.1
     #   enmerkar-underscore
 enmerkar-underscore==2.3.0
     # via -r requirements/edx/base.txt
-event-tracking==3.0.0
+event-tracking==2.4.0
     # via
-    #   -c requirements/edx/../constraints.txt
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-completion
     #   edx-proctoring
@@ -1144,7 +1141,7 @@ pylti1p3==2.0.0
     # via -r requirements/edx/base.txt
 pymemcache==4.0.0
     # via -r requirements/edx/base.txt
-pymongo==4.4.0
+pymongo==3.13.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt

scripts/structures_pruning/requirements/base.txt

@@ -11,13 +11,11 @@ click==8.1.6
     #   click-log
 click-log==0.4.0
     # via -r scripts/structures_pruning/requirements/base.in
-dnspython==2.6.1
-    # via pymongo
 edx-opaque-keys==2.10.0
     # via -r scripts/structures_pruning/requirements/base.in
 pbr==6.0.0
     # via stevedore
-pymongo==4.4.0
+pymongo==3.13.0
     # via
     #   -c scripts/structures_pruning/requirements/../../../requirements/constraints.txt
     #   -r scripts/structures_pruning/requirements/base.in

scripts/structures_pruning/requirements/testing.txt

@@ -12,10 +12,6 @@ click-log==0.4.0
     # via -r scripts/structures_pruning/requirements/base.txt
 ddt==1.7.2
     # via -r scripts/structures_pruning/requirements/testing.in
-dnspython==2.6.1
-    # via
-    #   -r scripts/structures_pruning/requirements/base.txt
-    #   pymongo
 edx-opaque-keys==2.10.0
     # via -r scripts/structures_pruning/requirements/base.txt
 iniconfig==2.0.0
@@ -28,7 +24,7 @@ pbr==6.0.0
     #   stevedore
 pluggy==1.5.0
     # via pytest
-pymongo==4.4.0
+pymongo==3.13.0
     # via
     #   -r scripts/structures_pruning/requirements/base.txt
     #   edx-opaque-keys

xmodule/contentstore/mongo.py

@@ -3,7 +3,6 @@
 """
 
 
-import hashlib
 import json
 import os
 
@@ -41,55 +40,23 @@ def __init__(
         # GridFS will throw an exception if the Database is wrapped in a MongoProxy. So don't wrap it.
         # The appropriate methods below are marked as autoretry_read - those methods will handle
         # the AutoReconnect errors.
-        self.connection_params = {
-            'db': db,
-            'host': host,
-            'port': port,
-            'tz_aware': tz_aware,
-            'user': user,
-            'password': password,
-            'proxy': False,
-            **kwargs
-        }
-        self.bucket = bucket
-        self.do_connection()
-
-    def do_connection(self):
-        """
-        Connects to mongodb.
-        """
-        mongo_db = connect_to_mongodb(**self.connection_params)
+        proxy = False
+        mongo_db = connect_to_mongodb(
+            db, host,
+            port=port, tz_aware=tz_aware, user=user, password=password, proxy=proxy, **kwargs
+        )
 
-        self.fs = gridfs.GridFS(mongo_db, self.bucket)  # pylint: disable=invalid-name
+        self.fs = gridfs.GridFS(mongo_db, bucket)  # pylint: disable=invalid-name
 
-        self.fs_files = mongo_db[self.bucket + ".files"]  # the underlying collection GridFS uses
-        self.chunks = mongo_db[self.bucket + ".chunks"]
+        self.fs_files = mongo_db[bucket + ".files"]  # the underlying collection GridFS uses
+        self.chunks = mongo_db[bucket + ".chunks"]
 
     def close_connections(self):
         """
         Closes any open connections to the underlying databases
         """
         self.fs_files.database.client.close()
 
-    def ensure_connection(self):
-        """
-        Ensure that mongodb connection is open.
-        """
-        if self.check_connection():
-            return
-        self.do_connection()
-
-    def check_connection(self):
-        """
-        Check if mongodb connection is open or not.
-        """
-        connection = self.fs_files.database.client
-        try:
-            connection.admin.command('ping')
-            return True
-        except pymongo.errors.InvalidOperation:
-            return False
-
     def _drop_database(self, database=True, collections=True, connections=True):
         """
         A destructive operation to drop the underlying database and close all connections.
@@ -102,8 +69,8 @@ def _drop_database(self, database=True, collections=True, connections=True):
 
         If connections is True, then close the connection to the database as well.
         """
-        self.ensure_connection()
         connection = self.fs_files.database.client
+
         if database:
             connection.drop_database(self.fs_files.database.name)
         elif collections:
@@ -136,22 +103,16 @@ def save(self, content):
             # but many more objects have this in python3 and shouldn't be using the chunking logic. For string and
             # byte streams we write them directly to gridfs and convert them to byetarrys if necessary.
             if hasattr(content.data, '__iter__') and not isinstance(content.data, (bytes, (str,))):
-                custom_md5 = hashlib.md5()
                 for chunk in content.data:
                     fp.write(chunk)
-                    custom_md5.update(chunk)
-                fp.custom_md5 = custom_md5.hexdigest()
             else:
                 # Ideally we could just ensure that we don't get strings in here and only byte streams
                 # but being confident of that wolud be a lot more work than we have time for so we just
                 # handle both cases here.
                 if isinstance(content.data, str):
-                    encoded_data = content.data.encode('utf-8')
-                    fp.write(encoded_data)
-                    fp.custom_md5 = hashlib.md5(encoded_data).hexdigest()
+                    fp.write(content.data.encode('utf-8'))
                 else:
                     fp.write(content.data)
-                    fp.custom_md5 = hashlib.md5(content.data).hexdigest()
 
         return content
 
@@ -181,13 +142,12 @@ def find(self, location, throw_on_not_found=True, as_stream=False):  # lint-amne
                         'thumbnail',
                         thumbnail_location[4]
                     )
-
                 return StaticContentStream(
                     location, fp.displayname, fp.content_type, fp, last_modified_at=fp.uploadDate,
                     thumbnail_location=thumbnail_location,
                     import_path=getattr(fp, 'import_path', None),
                     length=fp.length, locked=getattr(fp, 'locked', False),
-                    content_digest=getattr(fp, 'custom_md5', None),
+                    content_digest=getattr(fp, 'md5', None),
                 )
             else:
                 with self.fs.get(content_id) as fp:
@@ -201,13 +161,12 @@ def find(self, location, throw_on_not_found=True, as_stream=False):  # lint-amne
                             'thumbnail',
                             thumbnail_location[4]
                         )
-
                     return StaticContent(
                         location, fp.displayname, fp.content_type, fp.read(), last_modified_at=fp.uploadDate,
                         thumbnail_location=thumbnail_location,
                         import_path=getattr(fp, 'import_path', None),
                         length=fp.length, locked=getattr(fp, 'locked', False),
-                        content_digest=getattr(fp, 'custom_md5', None),
+                        content_digest=getattr(fp, 'md5', None),
                     )
         except NoFile:
             if throw_on_not_found:  # lint-amnesty, pylint: disable=no-else-raise