From 94c14b34e210ccb408c9d2f26c88ebbc87f4a27e Mon Sep 17 00:00:00 2001 From: ilia1243 <8808144+ilia1243@users.noreply.github.com> Date: Fri, 31 Mar 2023 10:22:39 +0300 Subject: [PATCH] Resolve conflict of archive names in add_node and restore procedures --- kubemarine/core/utils.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/kubemarine/core/utils.py b/kubemarine/core/utils.py index ed522fc50..0df671009 100755 --- a/kubemarine/core/utils.py +++ b/kubemarine/core/utils.py @@ -444,17 +444,21 @@ def upload_info_new_control_planes(self): if new_control_planes.is_empty(): return + archive_name = 'dump_log_cluster.tar.gz' + archive_dump_path = get_dump_filepath(self.cluster.context, archive_name) + archive_remote_path = f"/tmp/{archive_name}" + log = self.cluster.log + node = self.cluster.nodes['control-plane'].get_initial_nodes().get_first_member(provide_node_configs=True) control_plane = self.cluster.make_group([node['connect_to']]) - data_copy_res = control_plane.sudo(f'tar -czvf /tmp/kubemarine-backup.tar.gz {self.dir_path}') - self.cluster.log.verbose('Backup created:\n%s' % data_copy_res) - control_plane.get('/tmp/kubemarine-backup.tar.gz', - get_dump_filepath(self.cluster.context, "dump_log_cluster.tar.gz"), 'dump_log_cluster.tar.gz') + data_copy_res = control_plane.sudo(f'tar -czvf {archive_remote_path} {self.dir_path}') + log.verbose("Archive with procedures history is created:\n%s" % data_copy_res) + control_plane.get(archive_remote_path, archive_dump_path) - self.cluster.log.debug('Backup downloaded') + log.debug("Archive with procedures history is downloaded") for new_node in new_control_planes.get_ordered_members_list(provide_node_configs=True): group = self.cluster.make_group([new_node['connect_to']]) - group.put(get_dump_filepath(self.cluster.context, "dump_log_cluster.tar.gz"), - "/tmp/dump_log_cluster.tar.gz", sudo=True) - group.sudo(f'tar -C / -xzvf /tmp/dump_log_cluster.tar.gz') + group.put(archive_dump_path, archive_remote_path, sudo=True) + group.sudo(f'tar -C / -xzvf {archive_remote_path}') + log.debug(f"Archive with procedures history is uploaded to {new_node['name']!r}")