online_migrations 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ceda570f99a1712496ac5c9549859c7dc2cad7e3cc4ab59c97a22ba17f3bfd0
-  data.tar.gz: dfc5a83147a92bf5e04a532210e72b6f32f561f032b2a1b746ff142bf4e16635
+  metadata.gz: c08a823ebaea1855fcfaae87c3252cbc4a727f04ae564cd14cfcb8e2f43ebb2b
+  data.tar.gz: f02621f945b90de34217f588d26a243b506bc47c9433feab784b8db43ecd83de
 SHA512:
-  metadata.gz: 0ff6cce820134ef6b893f9405b71a0d8f8cd42dd79616123aaa492983671ebcff98dbff21477afa78b29342d40098822da4b8de0306489faf956b21ee44e2113
-  data.tar.gz: 42dcf132290c9affe812ef7489397d4c05d48f33069f3ee09710fced6aaf8ac928fee63c1498333657a824f98885e3af5e706e4dcc4a089b9cd62284ad0223d1
+  metadata.gz: 7bb01d066a03e7bb85c6d6e37f6c3e67351dc1a890579d9eb4c8ef7a200785918c863a7b2f1104a1d531772da0405daa1f9724cad6b224a92da08fba3fac2479
+  data.tar.gz: 21acc8fbfb9a2aab13d5768f1df613d74e9145d55148bdb8b04b53e5687bca9fd0e6f88178282dec9f0642fdad2fd188e979d152b697b771554adf866aa417e3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master (unreleased)
 
+## 0.11.1 (2024-01-11)
+
+- Fix calculation of batch ranges for sharded background migrations
+
 ## 0.11.0 (2024-01-09)
 
 - Support sharding for background migrations

data/lib/online_migrations/background_migrations/migration.rb

@@ -102,9 +102,15 @@ module OnlineMigrations
         if succeeded?
           100.0
         elsif composite?
-          progresses = children.map(&:progress).compact
-          if progresses.any?
-            (progresses.sum / progresses.size).round(2)
+          rows_counts = children.to_a.pluck(:rows_count)
+          if rows_counts.none?(nil)
+            total_rows_count = rows_counts.sum
+
+            progresses = children.map do |child|
+              child.progress * child.rows_count / total_rows_count # weighted progress
+            end
+
+            progresses.sum.round(2)
           end
         elsif rows_count
           jobs_rows_count = migration_jobs.succeeded.sum(:batch_size)
@@ -181,15 +187,17 @@ module OnlineMigrations
         iterator = BatchIterator.new(migration_relation)
         batch_range = nil
 
-        # rubocop:disable Lint/UnreachableLoop
-        iterator.each_batch(of: batch_size, column: batch_column_name, start: next_min_value) do |relation|
-          min = relation.arel_table[batch_column_name].minimum
-          max = relation.arel_table[batch_column_name].maximum
-          batch_range = relation.pick(min, max)
+        on_shard do
+          # rubocop:disable Lint/UnreachableLoop
+          iterator.each_batch(of: batch_size, column: batch_column_name, start: next_min_value) do |relation|
+            min = relation.arel_table[batch_column_name].minimum
+            max = relation.arel_table[batch_column_name].maximum
+            batch_range = relation.pick(min, max)
 
-          break
+            break
+          end
+          # rubocop:enable Lint/UnreachableLoop
         end
-        # rubocop:enable Lint/UnreachableLoop
 
         return if batch_range.nil?
 
@@ -286,7 +294,7 @@ module OnlineMigrations
           attributes.each do |attribute|
             updates[attribute] = read_attribute(attribute) if attribute_changed?(attribute)
           end
-          children.update_all(updates) if updates.any?
+          children.active.update_all(updates) if updates.any?
         end
 
         def next_min_value

data/lib/online_migrations/background_migrations/migration_runner.rb

@@ -14,10 +14,7 @@ module OnlineMigrations
       def run_migration_job
         raise "Should not be called on a composite (with sharding) migration" if migration.composite?
 
-        if migration.enqueued?
-          migration.running!
-          migration.parent.running! if migration.parent && migration.parent.enqueued?
-        end
+        mark_as_running if migration.enqueued?
         migration_payload = notifications_payload(migration)
 
         if !migration.migration_jobs.exists?
@@ -57,7 +54,7 @@ module OnlineMigrations
         raise "This method is not intended for use in production environments" if !Utils.developer_env?
         return if migration.completed?
 
-        migration.running!
+        mark_as_running
 
         if migration.composite?
           migration.children.each do |child_migration|
@@ -96,6 +93,11 @@ module OnlineMigrations
       end
 
       private
+        def mark_as_running
+          migration.running!
+          migration.parent.running! if migration.parent && migration.parent.enqueued?
+        end
+
         def should_throttle?
           ::OnlineMigrations.config.background_migrations.throttler.call
         end

data/lib/online_migrations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnlineMigrations
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: online_migrations
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - fatkodima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Catch unsafe PostgreSQL migrations in development and run them easier in