Feb 12, 2024 · Jan 29, 2024 · Jan 29, 2024 · Jan 31, 2024 · Feb 4, 2024 · Feb 4, 2024
diff --git a/testgres/plugins/pg_probackup2/pg_probackup2/storage/fs_backup.py b/testgres/plugins/pg_probackup2/pg_probackup2/storage/fs_backup.py
    """ Backup directory. Usually created by running pg_probackup init -B <path>"""

    def __init__(self, *, rel_path, backup):
        self.path = os.path.join(init_params.tmp_path, rel_path, backup)
        backup_prefix = os.environ.get('PG_PROBACKUP_TEST_BACKUP_DIR_PREFIX')
        if backup_prefix and not os.path.isabs(backup_prefix):
            raise Exception(f"PG_PROBACKUP_TEST_BACKUP_DIR_PREFIX must be an absolute path, current value: {backup_prefix}")
        self.path = os.path.join(backup_prefix or init_params.tmp_path, rel_path, backup)
        self.pb_args = ('-B', self.path)

    def list_instance_backups(self, instance):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,7 +43,10 @@ class FSTestBackupDir(TestBackupDir):
		""" Backup directory. Usually created by running pg_probackup init -B <path>"""

		def __init__(self, *, rel_path, backup):
		self.path = os.path.join(init_params.tmp_path, rel_path, backup)
		backup_prefix = os.environ.get('PG_PROBACKUP_TEST_BACKUP_DIR_PREFIX')
Copy link ContributorAuthor demonolockFeb 1, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Получение параметров окружения нужно делать в init_helpers.py, иначе будет дубликация кода - в s3_backup.py тоже нужно будет добавить. Copy link Contributor asavchkovFeb 4, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Для S3 я планирую перенести присвоение self.path в базовый класс, чтобы сделать пути в S3 и не в S3 одинаковыми. Но это требует предварительной проверки и будет делаться в рамках отдельногно PR.
		if backup_prefix and not os.path.isabs(backup_prefix):
		raise Exception(f"PG_PROBACKUP_TEST_BACKUP_DIR_PREFIX must be an absolute path, current value: {backup_prefix}")
		self.path = os.path.join(backup_prefix or init_params.tmp_path, rel_path, backup)
		self.pb_args = ('-B', self.path)

		def list_instance_backups(self, instance):
Expand Down