Merge pull request #9 from maierbenedikt/production

Updating (disowning) block replicas

Author: yiiyama

lib/common/interface/mysqlstore.py

@@ -1228,6 +1228,35 @@ def _do_delete_blockreplicas(self, replica_list): #override
 
             self._mysql.query(sql)
 
+    def _do_update_blockreplicas(self, replica_list): #override
+        # Mass block replica update (e.g. unsubscription after a deletion) typically happens for a few sites and a few datasets.
+        # Fetch site id first to avoid a long query.
+
+        if len(replica_list) == 0:
+            return
+
+        sites = list(set([r.site for r in replica_list])) # list of sites
+        datasets = list(set([r.block.dataset for r in replica_list])) # list of datasets
+        groups = list(set([r.block.group for r in replica_list])) # list of groups
+
+        site_id_map = {}
+        self._make_site_map(sites, site_id_map = site_id_map)
+        group_id_map = {}
+        self._make_group_map(groups, group_id_map = group_id_map)
+        dataset_id_map = {}
+        self._make_dataset_map(datasets, dataset_id_map = dataset_id_map)
+
+        for dataset in datasets:
+            for block_id, block_name in self._mysql.xquery('SELECT `id`, `name` FROM `blocks` WHERE `dataset_id` = %s', dataset_id_map[dataset]):
+                block_name_to_id[Block.translate_name(block_name)] = block_id
+
+        all_replicas = []
+        for replica in replica_list:
+            all_replicas.append((block_name_to_id[replica.block.name], site_id_map[replica.site], group_id_map[replica.group], replica.is_complete, replica.is_custodial, time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(block_replica.last_update))))
+
+        fields = ('block_id', 'site_id', 'group_id', 'is_complete', 'is_custodial', 'last_update')
+        self._mysql.insert_many('block_replicas', fields, None, all_replicas, do_update = True)
+
     def _do_set_dataset_status(self, dataset_name, status_str): #override
         self._mysql.query('UPDATE `datasets` SET `status` = %s WHERE `name` LIKE %s', status_str, dataset_name)
 

lib/common/interface/store.py

@@ -558,6 +558,32 @@ def delete_blockreplicas(self, replica_list):
         finally:
             self.release_lock()
 
+    def update_blockreplica(self, replica):
+        """
+        Update block replica in persistent storage.
+        """
+
+        if config.read_only:
+            logger.debug('_do_update_blockreplica(%s:%s)', replica.site.name, replica.block.real_name())
+            return
+
+        self.update_blockreplicas([replica])
+
+    def update_blockreplicas(self, replica_list):
+        """
+        Update a set of block replicas in persistent storage.
+        """
+
+        if config.read_only:
+            logger.debug('_do_update_blockreplicas(%d replicas)', len(replica_list))
+            return
+
+        self.acquire_lock()
+        try:
+            self._do_update_blockreplicas(replica_list)
+        finally:
+            self.release_lock()
+
     def set_dataset_status(self, dataset, status):
         """
         Set and save dataset status

lib/detox/main.py

@@ -491,6 +491,13 @@ def commit_deletions(self, run_number, policy, deletion_list, is_test, comment):
 
             for deletion_id, (approved, replicas) in deletion_mapping.iteritems():
                 size = sum([r.size() for r in replicas])
+                for replica in replicas:
+                    blockreplicas = []
+                    for block_replica in replica.block_replicas:
+                        blockreplica = block_replica.clone(group = None)
+                        blockreplicas.append(blockreplica)
+                         
+                    self.inventory_manager.store.update_blockreplicas(blockreplicas)
 
                 if approved and not is_test:
                     total_size += size