new renaming logic

slapos/recipe/addresiliency/bully.py

@@ -43,29 +43,60 @@ class Renamer(object):
 
 
     def _failover(self):
+        """\
+        This method does
+
+        - retrieve the broken computer partition
+        - change its reference to 'broken-...' and its software type to 'frozen'
+        - retrieve the winner computer partition (attached to this process)
+        - change its reference and software type to replace the broken one
+
+        Then, after running slapgrid-cp a few times, the winner takes over and
+        a new cp is created to replace it as an importer.
+        """
+
+        # TODO: replace hardcoded strings with values from the API
+
         slap = slapmodule.slap()
         slap.initializeConnection(self.server_url, self.key_file, self.cert_file)
 
-        # partition that will take over
-        cp = slap.registerComputerPartition(computer_guid=self.computer_guid,
+        # partition that will take over.
+        cp_winner = slap.registerComputerPartition(computer_guid=self.computer_guid,
                                                    partition_id=self.partition_id)
+        # XXX although we can already rename cp_winner, to change its software type we need to
+        # get hold of the root cp as well
+
+        root_partition_id = 'slappart0'       # XXX hardcoded. what's the API for this?
+
+        cp_root = slap.registerComputerPartition(computer_guid=self.computer_guid,
+                                                 partition_id=root_partition_id)
 
-        cp_old_name = self.namebase + '0'
+        cp_exporter_ref = self.namebase + '0'       # this is ok. the boss is always number zero.
 
         # partition to be deactivated
-        broken = cp.request(software_release=self.software_release,
+        cp_broken = cp_root.request(software_release=self.software_release,
                                     software_type='frozen',
-                            partition_reference=cp_old_name)
+                                    partition_reference=cp_exporter_ref)
+
+        broken_new_ref = 'broken-{}'.format(time.strftime("%d-%b_%H:%M:%S", time.gmtime()))
+
+        # XXX can we retrieve and log the old reference name?
+        log.debug("Renaming {}: {}".format(cp_broken.getId(), broken_new_ref))
+
+        cp_broken.rename(new_name=broken_new_ref)
+
+        cp_broken.stopped()
+
+        log.debug("Renaming {}: {}".format(cp_broken.getId(), cp_exporter_ref))
+
+        # update software type and name for the partition that will take over
 
-        broken_new_name = 'broken-{}'.format(time.strftime("%d-%b_%H:%M:%S", time.gmtime()))
-        # XXX how can we retrieve and log the old name?
-        log.debug("Renaming {}: {}".format(broken.getId(), broken_new_name))
-        broken.rename(broken_new_name)
+        cp_winner_ref = self.namebase + '2'     # XXX hardcoded. what's the API for this?
 
-        broken.stopped()
+        cp_root.request(software_release=self.software_release,
+                        software_type=self.namebase+'-export',
+                        partition_reference=cp_winner_ref).rename(new_name=cp_exporter_ref)
 
-        log.debug("Renaming {}: {}".format(cp.getId(), cp_old_name))
-        cp.rename(cp_old_name)
 
 
     def failover(self):