From 8a36f17d21edea7ae9ec6a4d8aced614c5400e57 Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Tue, 19 May 2015 17:16:07 +0200 Subject: [PATCH] retry with pg_basebackup if one cannot get data from WAL-E. --- helpers/postgresql.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/helpers/postgresql.py b/helpers/postgresql.py index eacd17e3..f923c5ac 100644 --- a/helpers/postgresql.py +++ b/helpers/postgresql.py @@ -115,9 +115,11 @@ class Postgresql: def create_replica(self, master_connurl, master_connection): """ creates a new replica using either pg_basebackup or WAL-E """ if self.should_use_s3_to_create_replica(master_connurl): - return self.create_replica_with_s3() - else: - return self.create_replica_with_pg_basebackup(master_connection) + result = self.create_replica_with_s3() + # if restore from the backup on S3 failed - try with the pg_basebackup + if result == 0: + return result + return self.create_replica_with_pg_basebackup(master_connection) def create_replica_with_pg_basebackup(self, master_connection): return os.system('pg_basebackup -R -D {data_dir} --host={hostname} --port={port} -U {username}'.format(