active_postgres 0.8.0 → 0.9.1

data/lib/active_postgres/components/pgbackrest.rb

@@ -19,6 +19,8 @@ module ActivePostgres
         config.all_hosts.each do |host|
           ssh_executor.execute_on_host(host) do
             execute :sudo, 'apt-get', 'remove', '-y', 'pgbackrest'
+            execute :sudo, 'rm', '-f', '/etc/cron.d/pgbackrest-backup'
+            execute :sudo, 'rm', '-f', '/etc/cron.d/pgbackrest-backup-incremental'
           end
         end
       end
@@ -27,13 +29,21 @@ module ActivePostgres
         puts "pgBackRest is a backup tool and doesn't run as a service."
       end
 
+      def install_on_standby(host)
+        puts "  Installing pgBackRest on standby #{host}..."
+        install_on_host(host, create_stanza: false)
+      end
+
       def run_backup(type = 'full')
         puts "Running #{type} backup..."
         postgres_user = config.postgres_user
 
+        output = nil
         ssh_executor.execute_on_host(config.primary_host) do
-          execute :sudo, '-u', postgres_user, 'pgbackrest', '--stanza=main', "--type=#{type}", 'backup'
+          output = capture(:sudo, '-u', postgres_user, 'pgbackrest', '--stanza=main', "--type=#{type}", 'backup')
         end
+
+        puts output if output
       end
 
       def run_restore(backup_id)
@@ -45,20 +55,43 @@ module ActivePostgres
           execute :sudo, 'systemctl', 'stop', 'postgresql'
 
           # Restore
-          execute :sudo, '-u', postgres_user, 'pgbackrest', '--stanza=main', "--set=#{backup_id}", 'restore'
+          output = capture(:sudo, '-u', postgres_user, 'pgbackrest', '--stanza=main', "--set=#{backup_id}", 'restore')
+          puts output if output
 
           # Start PostgreSQL
           execute :sudo, 'systemctl', 'start', 'postgresql'
         end
       end
 
+      def run_restore_at(target_time, target_action: 'promote')
+        puts "Restoring to #{target_time} (PITR)..."
+        postgres_user = config.postgres_user
+
+        ssh_executor.execute_on_host(config.primary_host) do
+          execute :sudo, 'systemctl', 'stop', 'postgresql'
+
+          output = capture(:sudo, '-u', postgres_user, 'pgbackrest',
+                           '--stanza=main',
+                           '--type=time',
+                           "--target=#{target_time}",
+                           "--target-action=#{target_action}",
+                           'restore')
+          puts output if output
+
+          execute :sudo, 'systemctl', 'start', 'postgresql'
+        end
+      end
+
       def list_backups
         puts 'Available backups:'
         postgres_user = config.postgres_user
 
+        output = nil
         ssh_executor.execute_on_host(config.primary_host) do
-          execute :sudo, '-u', postgres_user, 'pgbackrest', 'info'
+          output = capture(:sudo, '-u', postgres_user, 'pgbackrest', 'info')
         end
+
+        puts output if output
       end
 
       private
@@ -66,7 +99,7 @@ module ActivePostgres
       def install_on_host(host, create_stanza: true)
         puts "  Installing pgBackRest on #{host}..."
 
-        pgbackrest_config = config.component_config(:pgbackrest)
+        pgbackrest_config = secrets.resolve_value(config.component_config(:pgbackrest))
         postgres_user = config.postgres_user
         secrets_obj = secrets
         _ = pgbackrest_config # Used in ERB template
@@ -78,7 +111,8 @@ module ActivePostgres
         end
 
         # Upload configuration
-        upload_template(host, 'pgbackrest.conf.erb', '/etc/pgbackrest.conf', binding, mode: '644')
+        upload_template(host, 'pgbackrest.conf.erb', '/etc/pgbackrest.conf', binding,
+                        mode: '640', owner: "root:#{postgres_user}")
 
         ssh_executor.execute_on_host(host) do
           execute :sudo, 'rm', '-rf', '/var/lib/pgbackrest', '||', 'true'
@@ -99,6 +133,58 @@ module ActivePostgres
             execute :sudo, '-u', postgres_user, 'pgbackrest', '--stanza=main', 'stanza-create'
           end
         end
+
+        # Set up scheduled backups on primary only
+        if create_stanza
+          setup_backup_schedules(host, pgbackrest_config)
+        end
+      end
+
+      def setup_backup_schedules(host, pgbackrest_config)
+        schedules = backup_schedules(pgbackrest_config)
+        schedules.each do |entry|
+          setup_backup_schedule(host, entry[:schedule], entry[:type], entry[:file])
+        end
+      end
+
+      def backup_schedules(pgbackrest_config)
+        schedule_full = pgbackrest_config[:schedule_full] || pgbackrest_config[:schedule]
+        schedule_incremental = pgbackrest_config[:schedule_incremental]
+
+        schedules = []
+        if schedule_full
+          schedules << { type: 'full', schedule: schedule_full, file: '/etc/cron.d/pgbackrest-backup' }
+        end
+        if schedule_incremental
+          schedules << { type: 'incremental', schedule: schedule_incremental, file: '/etc/cron.d/pgbackrest-backup-incremental' }
+        end
+
+        schedules
+      end
+
+      def setup_backup_schedule(host, schedule, backup_type = 'full', cron_file = '/etc/cron.d/pgbackrest-backup')
+        puts "  Setting up #{backup_type} backup schedule: #{schedule}"
+        postgres_user = config.postgres_user
+
+        # Create cron job for scheduled backups
+        # /etc/cron.d format requires username after time spec
+        cron_content = <<~CRON
+          # pgBackRest scheduled backups (managed by active_postgres)
+          SHELL=/bin/bash
+          PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+          #{schedule} #{postgres_user} pgbackrest --stanza=main --type=#{backup_type} backup
+        CRON
+
+        # Install cron job in /etc/cron.d (system cron directory)
+        # Use a temp file + sudo mv to avoid shell redirection permission issues.
+        ssh_executor.upload_file(host, cron_content, cron_file, mode: '644', owner: 'root:root')
+      end
+
+      def remove_backup_schedule(host)
+        ssh_executor.execute_on_host(host) do
+          execute :sudo, 'rm', '-f', '/etc/cron.d/pgbackrest-backup'
+          execute :sudo, 'rm', '-f', '/etc/cron.d/pgbackrest-backup-incremental'
+        end
       end
     end
   end

data/lib/active_postgres/components/pgbouncer.rb

@@ -5,7 +5,8 @@ module ActivePostgres
         puts 'Installing PgBouncer for connection pooling...'
 
         config.all_hosts.each do |host|
-          install_on_host(host)
+          is_standby = config.standby_hosts.include?(host)
+          install_on_host(host, is_standby: is_standby)
         end
       end
 
@@ -14,6 +15,11 @@ module ActivePostgres
 
         config.all_hosts.each do |host|
           ssh_executor.execute_on_host(host) do
+            execute :sudo, 'systemctl', 'disable', '--now', 'pgbouncer-follow-primary.timer', '||', 'true'
+            execute :sudo, 'rm', '-f', '/usr/local/bin/pgbouncer-follow-primary',
+                    '/etc/systemd/system/pgbouncer-follow-primary.service',
+                    '/etc/systemd/system/pgbouncer-follow-primary.timer'
+            execute :sudo, 'systemctl', 'daemon-reload'
             execute :sudo, 'systemctl', 'stop', 'pgbouncer'
             execute :sudo, 'apt-get', 'remove', '-y', 'pgbouncer'
           end
@@ -44,21 +50,42 @@ module ActivePostgres
 
       def install_on_standby(standby_host)
         puts "Installing PgBouncer on standby #{standby_host}..."
-        install_on_host(standby_host)
+        install_on_host(standby_host, is_standby: true)
       end
 
       private
 
-      def install_on_host(host)
+      def install_on_host(host, is_standby: false)
         puts "  Installing PgBouncer on #{host}..."
 
         user_config = config.component_config(:pgbouncer)
 
+        # Determine follow_primary behavior:
+        # - Primary: use global follow_primary setting
+        # - Standby: check per-standby pgbouncer_follow_primary, default false (use localhost for read replicas)
+        if is_standby
+          standby_config = config.standby_config_for(host) || {}
+          follow_primary = standby_config['pgbouncer_follow_primary'] == true
+        else
+          follow_primary = user_config[:follow_primary] == true
+        end
+
+        if follow_primary && !config.component_enabled?(:repmgr)
+          raise Error, 'PgBouncer follow_primary requires repmgr to be enabled'
+        end
+
         max_connections = get_postgres_max_connections(host)
         optimal_pool = ConnectionPooler.calculate_optimal_pool_sizes(max_connections)
 
         pgbouncer_config = optimal_pool.merge(user_config)
+        # For standbys not following primary, use localhost; otherwise use primary host
+        pgbouncer_config[:database_host] = follow_primary ? config.primary_replication_host : '127.0.0.1'
         ssl_enabled = config.component_enabled?(:ssl)
+        has_ca_cert = ssl_enabled && secrets.resolve('ssl_chain')
+        secrets_obj = secrets
+        _ = pgbouncer_config
+        _ = has_ca_cert
+        _ = secrets_obj
 
         puts "  Calculated pool settings for max_connections=#{max_connections}"
 
@@ -76,6 +103,8 @@ module ActivePostgres
           execute :sudo, 'systemctl', 'enable', 'pgbouncer'
           execute :sudo, 'systemctl', 'restart', 'pgbouncer'
         end
+
+        install_follow_primary(host, pgbouncer_config) if follow_primary
       end
 
       def setup_ssl_certs(host)
@@ -130,10 +159,7 @@ module ActivePostgres
       def fetch_user_hash(backend, user, postgres_user)
         sql = build_user_hash_sql(user)
 
-        backend.upload! StringIO.new(sql), '/tmp/get_user_hash.sql'
-        backend.execute :chmod, '644', '/tmp/get_user_hash.sql'
-        user_hash = backend.capture(:sudo, '-u', postgres_user, 'psql', '-t', '-f', '/tmp/get_user_hash.sql').strip
-        backend.execute :rm, '-f', '/tmp/get_user_hash.sql'
+        user_hash = ssh_executor.run_sql_on_backend(backend, sql, postgres_user: postgres_user).to_s.strip
 
         if user_hash && !user_hash.empty?
           puts "  ✓ Added #{user} to PgBouncer userlist"
@@ -167,6 +193,31 @@ module ActivePostgres
           warn '  Warning: No users added to userlist - connections may fail'
         end
       end
+
+      def install_follow_primary(host, pgbouncer_config)
+        interval = pgbouncer_config[:follow_primary_interval] || 5
+        interval = interval.to_i
+        interval = 5 if interval <= 0
+
+        repmgr_conf = '/etc/repmgr.conf'
+        postgres_user = config.postgres_user
+        _ = interval
+        _ = repmgr_conf
+        _ = postgres_user
+
+        upload_template(host, 'pgbouncer_follow_primary.sh.erb', '/usr/local/bin/pgbouncer-follow-primary', binding,
+                        mode: '755', owner: 'root:root')
+        upload_template(host, 'pgbouncer-follow-primary.service.erb',
+                        '/etc/systemd/system/pgbouncer-follow-primary.service', binding, mode: '644', owner: 'root:root')
+        upload_template(host, 'pgbouncer-follow-primary.timer.erb',
+                        '/etc/systemd/system/pgbouncer-follow-primary.timer', binding, mode: '644', owner: 'root:root')
+
+        ssh_executor.execute_on_host(host) do
+          execute :sudo, 'systemctl', 'daemon-reload'
+          execute :sudo, 'systemctl', 'enable', '--now', 'pgbouncer-follow-primary.timer'
+          execute :sudo, 'systemctl', 'start', 'pgbouncer-follow-primary.service'
+        end
+      end
     end
   end
 end