From 5e4f97e84ee79ea4463dbeb799cadcb6d744b215 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Mon, 6 May 2019 17:41:09 +0200 Subject: [PATCH] B #2758: add db_versioning to federated tables. Fix reference to pool_control table (cherry picked from commit 7785509e5ab01aa9307b9556c7f83eda689ab0b7) --- src/onedb/fsck.rb | 2 +- src/onedb/fsck/pool_control.rb | 2 +- src/onedb/onedb_backend.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/onedb/fsck.rb b/src/onedb/fsck.rb index 5f41b7cf49..d97c60f402 100644 --- a/src/onedb/fsck.rb +++ b/src/onedb/fsck.rb @@ -99,7 +99,7 @@ EOT "marketplaceapp_pool"].freeze FEDERATED_TABLES = ["group_pool", "user_pool", "acl", "zone_pool", - "vdc_pool", "marketplace_pool", "marketplaceapp_pool"].freeze + "vdc_pool", "marketplace_pool", "marketplaceapp_pool", "db_versioning"].freeze def tables TABLES diff --git a/src/onedb/fsck/pool_control.rb b/src/onedb/fsck/pool_control.rb index b5abd9e8a9..c68ea27114 100644 --- a/src/onedb/fsck/pool_control.rb +++ b/src/onedb/fsck/pool_control.rb @@ -49,7 +49,7 @@ module OneDBFsck end def fix_pool_control - db = @db[:image_pool] + db = @db[:pool_control] @db.transaction do @fixes_pool_control.each do |name, last_oid| diff --git a/src/onedb/onedb_backend.rb b/src/onedb/onedb_backend.rb index 2842bad402..f5c410ea67 100644 --- a/src/onedb/onedb_backend.rb +++ b/src/onedb/onedb_backend.rb @@ -30,7 +30,7 @@ end class OneDBBacKEnd FEDERATED_TABLES = %w(group_pool user_pool acl zone_pool vdc_pool - marketplace_pool marketplaceapp_pool) + marketplace_pool marketplaceapp_pool db_versioning) def read_db_version connect_db