Fixed synchronization of metrics

Crystal-SDS · Oct 28, 2017 · 418ff92 · 418ff92
1 parent ea7b8d3
commit 418ff92
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/api/api/common.py b/api/api/common.py
@@ -162,15 +162,13 @@ def rsync_dir_with_nodes(directory):
             if not node['ssh_access']:
                 raise FileSynchronizationException("SSH credentials missing. Please, set the credentials for this "+node['type']+" node: "+node['name'])
 
-            # Directory is only synchronized if node status is UP
-            if calendar.timegm(time.gmtime()) - int(float(node['last_ping'])) <= NODE_STATUS_THRESHOLD:
-                # The basename of the path is not needed because it will be the same as source dir
-                logger.info("Rsync - pushing to "+node['type']+":"+node['name'])
-                dest_directory = os.path.dirname(directory)
-                data = {'directory': directory, 'dest_directory': dest_directory, 'node_ip': node['ip'],
-                        'ssh_username': node['ssh_username'], 'ssh_password': node['ssh_password']}
-
-                threading.Thread(target=rsync, args=(node, data)).start()
+            # The basename of the path is not needed because it will be the same as source dir
+            logger.info("Rsync - pushing to "+node['type']+":"+node['name'])
+            dest_directory = os.path.dirname(directory)
+            data = {'directory': directory, 'dest_directory': dest_directory, 'node_ip': node['ip'],
+                    'ssh_username': node['ssh_username'], 'ssh_password': node['ssh_password']}
+
+            threading.Thread(target=rsync, args=(node, data)).start()
 
 
 def rsync(node, data):

diff --git a/api/metrics/views.py b/api/metrics/views.py
@@ -273,13 +273,6 @@ def post(self, request):
 
             r.hmset('workload_metric:' + str(workload_metric_id), data)
 
-            if data['enabled']:
-                metric_name = data['metric_name'].split('.')[0]
-                if data['put']:
-                    start_metric('put_'+metric_name)
-                if data['get']:
-                    start_metric('get_'+metric_name)
-
             return JSONResponse(data, status=status.HTTP_201_CREATED)
 
         except DataError: