Updating (disowning) block replicas

Author: dr-stringfellow

lib/common/interface/mysqlstore.py

@@ -1252,7 +1252,7 @@ def _do_update_blockreplicas(self, replica_list): #override
 
         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] if replica.group != None else None, replica.is_complete, replica.is_custodial, time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(block_replica.last_update))))
+            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)

lib/detox/main.py

@@ -494,16 +494,7 @@ def commit_deletions(self, run_number, policy, deletion_list, is_test, comment):
                 for replica in replicas:
                     blockreplicas = []
                     for block_replica in replica.block_replicas:
-
-                        blockreplica = BlockReplica(
-                            block_replica.block,
-                            block_replica.site,
-                            None,
-                            block_replica.is_complete,
-                            block_replica.is_custodial,
-                            size = block_replica.size,
-                            last_update = block_replica.last_update)
-                        
+                        blockreplica = block_replica.clone(group = None)
                         blockreplicas.append(blockreplica)
 
                     self.inventory_manager.store.update_blockreplicas(blockreplicas)