Merge pull request #1668 from schakrava/1667_replication_regression

Fix regression in replication due to django 1.8 update. Fixes #1667
rockstor · Mar 7, 2017 · f3bcb52 · f3bcb52
2 parents 47c0538 + 1655e9e
commit f3bcb52
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/conf/settings.conf.in b/conf/settings.conf.in
@@ -248,21 +248,21 @@ LOGGING = {
             'level': 'DEBUG',
             'propagate': True,
         },
-	    'system': {
-		    'handlers': ['file'],
-		    'level': 'DEBUG',
+        'system': {
+            'handlers': ['file'],
+            'level': 'DEBUG',
             'propagate': True,
-	    },
-	    'scripts': {
-		    'handlers': ['file'],
-		    'level': 'DEBUG',
+        },
+        'scripts': {
+            'handlers': ['file'],
+            'level': 'DEBUG',
             'propagate': True,
-	    },
-	    'fs': {
-	        'handlers': ['file'],
-	        'level': 'DEBUG',
+        },
+        'fs': {
+            'handlers': ['file'],
+            'level': 'DEBUG',
             'propagate': True,
-	    },
+        },
     }
 }
 

diff --git a/src/rockstor/smart_manager/replication/__init__.py b/src/rockstor/smart_manager/replication/__init__.py
@@ -0,0 +1,5 @@
+
+import os
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+import django  # noqa E402
+django.setup()
diff --git a/src/rockstor/smart_manager/replication/receiver.py b/src/rockstor/smart_manager/replication/receiver.py
@@ -64,8 +64,7 @@ def __init__(self, identity, meta):
         self.ack = False
         self.total_bytes_received = 0
         # close all db connections prior to fork.
-        for alias, info in db.connections.databases.items():
-            db.close_connection()
+        db.close_old_connections()
         super(Receiver, self).__init__()
 
     def _sys_exit(self, code):

diff --git a/src/rockstor/smart_manager/replication/sender.py b/src/rockstor/smart_manager/replication/sender.py
@@ -61,8 +61,7 @@ def __init__(self, uuid, receiver_ip, replica, rt=None):
         self.total_bytes_sent = 0
         self.ppid = os.getpid()
         self.max_snap_retain = settings.REPLICATION.get('max_snap_retain')
-        for alias, info in db.connections.databases.items():
-            db.close_connection()
+        db.close_old_connections()
         super(Sender, self).__init__()
 
     @contextmanager