pg_easy_replicate 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f655d3bf7d458de6b84a85930e7175c05f780a390e9431531a0ae30c35d4737b
-  data.tar.gz: fa23c33715823598d4795ba64cbf466088d01fd97315bfe97d3a05db2da50f48
+  metadata.gz: ba133c0e80239fb125f32daa490fd20efe18c3f7391291d8465a8688fb3c0caf
+  data.tar.gz: f5c1780f43b621ddf4a8359d7dd3131291f42fe064cbd131b1b49308f0bc041e
 SHA512:
-  metadata.gz: 1e69d89ca00ca077784aab0c042e46c85faf7e15f2e585a65321084c5b3543502a7c9a440faa17f829848015a31ed50393129a0d7bfa083a27a731af4c179b68
-  data.tar.gz: ce29729ddcf74420818c0b4d86b98de28fbefd0690368ee4fcdd40f689dcf1ba6c3135850ab1e22de2bbd977c733ca5449cf42ccef728fda20c54b102b38f965
+  metadata.gz: b1d9e43d36d98b1cfe1e992123783f3adb160851acbc60447b77b7fba244dfbb1bf219686759b93619a9ac682813a24449bd4ddb3fea5c09f9990f6276b04ca9
+  data.tar.gz: 68d31a389a1ff11a5e30bbe48b6ab9ebd746adf2a2787c18388627e08c8cd8c2dbaa289e1f898ab2a119b7da2a3e72df92a88a6826504c2438fa6a1cd6e7348e

data/.rspec

@@ -2,4 +2,4 @@
 --color
 --require spec_helper
 --fail-fast
---exclude-pattern spec/lib/smoke_spec.rb
+--exclude-pattern spec/smoke_spec.rb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.1.5] - 2023-06-22
+
+- Fix bug in `stop_sync`
+
 ## [0.1.4] - 2023-06-22
 
 - Drop lockbox dependency

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_easy_replicate (0.1.5)
+    pg_easy_replicate (0.1.6)
       ougai (~> 2.0.0)
       pg (~> 1.5.3)
       sequel (~> 5.69.0)

data/lib/pg_easy_replicate/orchestrate.rb

@@ -18,7 +18,7 @@ module PgEasyReplicate
           group_name: options[:group_name],
           tables: options[:tables],
           conn_string: source_db_url,
-          schema: options[:schema],
+          schema: options[:schema_name],
         )
 
         create_subscription(
@@ -30,7 +30,7 @@ module PgEasyReplicate
         Group.create(
           name: options[:group_name],
           table_names: options[:tables],
-          schema_name: options[:schema],
+          schema_name: options[:schema_name],
           started_at: Time.now.utc,
         )
       rescue => e
@@ -46,7 +46,7 @@ module PgEasyReplicate
           Group.create(
             name: options[:group_name],
             table_names: options[:tables],
-            schema_name: options[:schema],
+            schema_name: options[:schema_name],
             started_at: Time.now.utc,
             failed_at: Time.now.utc,
           )
@@ -80,6 +80,7 @@ module PgEasyReplicate
           "Adding tables up publication",
           { publication_name: publication_name(group_name) },
         )
+
         tables = tables&.split(",") || []
         unless tables.size > 0
           tables = list_all_tables(schema: schema, conn_string: conn_string)
@@ -197,11 +198,11 @@ module PgEasyReplicate
         group_name:,
         source_conn_string: source_db_url,
         target_conn_string: target_db_url,
-        lag_delta_size: DEFAULT_LAG
+        lag_delta_size: nil
       )
         group = Group.find(group_name)
 
-        watch_lag(group_name: group_name, lag: lag_delta_size)
+        watch_lag(group_name: group_name, lag: lag_delta_size || DEFAULT_LAG)
         revoke_connections_on_source_db(group_name)
         wait_for_remaining_catchup(group_name)
         refresh_sequences(

data/lib/pg_easy_replicate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgEasyReplicate
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/scripts/e2e-bootstrap.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -eo pipefail
+
+if [[ -z ${GITHUB_WORKFLOW} ]]; then
+  export SECONDARY_SOURCE_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@source_db/postgres"
+fi
+
+export SOURCE_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@localhost:5432/postgres"
+export TARGET_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@localhost:5433/postgres"
+export PGPASSWORD='jamesbond123@7!'"'"'3aaR'
+
+pgbench --initialize -s 5 --foreign-keys --host localhost -U jamesbond -d postgres
+
+pg_dump --schema-only --host localhost -U jamesbond -d postgres >schema.sql
+cat schema.sql | psql --host localhost -U jamesbond -d postgres -p 5433
+rm schema.sql
+
+bundle exec bin/pg_easy_replicate config_check

data/scripts/e2e-start.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -eo pipefail
+
+if [[ -z ${GITHUB_WORKFLOW} ]]; then
+  export SECONDARY_SOURCE_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@source_db/postgres"
+fi
+
+export SOURCE_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@localhost:5432/postgres"
+export TARGET_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@localhost:5433/postgres"
+export PGPASSWORD='jamesbond123@7!'"'"''"'"'3aaR'
+
+# Bootstrap and cleanup
+echo "===== Performing Bootstrap and cleanup"
+bundle exec bin/pg_easy_replicate bootstrap -g cluster-1
+bundle exec bin/pg_easy_replicate start_sync -g cluster-1 -s public
+bundle exec bin/pg_easy_replicate stats -g cluster-1
+bundle exec bin/pg_easy_replicate switchover -g cluster-1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_easy_replicate
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Shayon Mukherjee
@@ -241,8 +241,6 @@ email:
 executables:
 - pg_easy_replicate
 - pg_easy_replicate_console
-- release.sh
-- test.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -260,8 +258,6 @@ files:
 - Rakefile
 - bin/pg_easy_replicate
 - bin/pg_easy_replicate_console
-- bin/release.sh
-- bin/test.sh
 - docker-compose.yml
 - lib/pg_easy_replicate.rb
 - lib/pg_easy_replicate/cli.rb
@@ -272,6 +268,9 @@ files:
 - lib/pg_easy_replicate/stats.rb
 - lib/pg_easy_replicate/version.rb
 - package.json
+- scripts/e2e-bootstrap.sh
+- scripts/e2e-start.sh
+- scripts/release.sh
 - yarn.lock
 homepage: https://github.com/shayonj/pg_easy_replicate
 licenses:

data/bin/test.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-export SECONDARY_SOURCE_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@source_db/postgres"
-export SOURCE_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@localhost:5432/postgres"
-export TARGET_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@localhost:5433/postgres"
-
-bundle exec bin/pg_easy_replicate config_check
-
-# Bootstrap and cleanup
-echo "===== Performing Bootstrap and cleanup"
-bundle exec bin/pg_easy_replicate bootstrap -g cluster-1
-bundle exec bin/pg_easy_replicate cleanup -e -g cluster-1
-
-# Bootstrap and start_sync
-echo "===== Performing Bootstrap, start_sync, stop_sync and cleanup"
-bundle exec bin/pg_easy_replicate bootstrap -g cluster-1
-bundle exec bin/pg_easy_replicate start_sync -g cluster-1
-bundle exec bin/pg_easy_replicate stop_sync -g cluster-1
-bundle exec bin/pg_easy_replicate cleanup -e -g cluster-1
-
-# Bootstrap with switchover
-echo "===== Performing Bootstrap, start_sync, stop_sync and cleanup"
-bundle exec bin/pg_easy_replicate bootstrap -g cluster-1
-bundle exec bin/pg_easy_replicate start_sync -g cluster-1
-# bundle exec bin/pg_easy_replicate switchover -g cluster-1
-bundle exec bin/pg_easy_replicate cleanup -e -g cluster-1