File 0001-Fix-db-migration.patch of Package openstack-manila

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-db-migration.patch of Package openstack-manila (Revision 09ca28bf4b6c58d98263967a89550505)

Currently displaying revision 09ca28bf4b6c58d98263967a89550505 , Show latest

From 1626346b10a31bad7593a9dc602681eefcf1ff17 Mon Sep 17 00:00:00 2001
From: Stefan Nica <snica@suse.com>
Date: Tue, 13 Feb 2018 14:09:19 +0100
Subject: [PATCH] Fix db migration for mariadb >= 10.2.8

Starting with mariadb 10.2.8, removing a column
that is part of a primary key requires that the
primary key constraint be dropped and recreated.

Change-Id: I43e4dae325dd6561a9fe0fd4ce595cea4c2ef7a6
Closes-Bug: #1749184
---

diff --git a/manila/db/migrations/alembic/versions/e8ea58723178_remove_host_from_driver_private_data.py b/manila/db/migrations/alembic/versions/e8ea58723178_remove_host_from_driver_private_data.py
index 4dd885c..2ae03f4 100644
--- a/manila/db/migrations/alembic/versions/e8ea58723178_remove_host_from_driver_private_data.py
+++ b/manila/db/migrations/alembic/versions/e8ea58723178_remove_host_from_driver_private_data.py
@@ -38,10 +38,16 @@
 DEFAULT_HOST = 'unknown'
 COLUMN_ENTITY = 'entity_uuid'
 COLUMN_KEY = 'key'
-
+MYSQL_ENGINE = 'mysql'
 
 def upgrade():
+    bind = op.get_bind()
+    engine = bind.engine
     try:
+        if (engine.name == MYSQL_ENGINE):
+            op.drop_constraint('PRIMARY', TABLE_NAME, type_='primary')
+            op.create_primary_key('DRIVERS_PRIVATE_PK', TABLE_NAME,
+                                  ['entity_uuid', 'key'])
         op.drop_column(TABLE_NAME, COLUMN_HOST)
     except Exception:
         LOG.error("Column '%s' could not be dropped", COLUMN_HOST)
diff --git a/releasenotes/notes/bug-1749184-eb06929e76a14fce.yaml b/releasenotes/notes/bug-1749184-eb06929e76a14fce.yaml
new file mode 100644
index 0000000..411bc47
--- /dev/null
+++ b/releasenotes/notes/bug-1749184-eb06929e76a14fce.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - The database migration has been adjusted to work with mariadb >= 10.2.8
+    by ensuring that a primary key constraint is first dropped and re-added
+    when a column is removed that is part of it

Places

File 0001-Fix-db-migration.patch of Package openstack-manila (Revision 09ca28bf4b6c58d98263967a89550505)

Places