1 This patchset is for bug: |
|
2 |
|
3 22726259 - Nova needs to support MySQL Cluster |
|
4 |
|
5 This fixes the following aspects of Nova: |
|
6 1. Implementation of an oslo.db configuration parameter to specify the MySQL |
|
7 storage engine (mysql_storage_engine). |
|
8 2. Replacement of hardcoded SQL statements that set the engine to "InnoDB" |
|
9 to the above configuration value. |
|
10 3. Logic to handle SQL differences between MySQL InnoDB and MySQL Cluster (NDB). |
|
11 This includes column lengths, constraints, foreign keys, and indexes. |
|
12 |
|
13 This has not been committed upstream, but has been filed in launchpad: |
|
14 |
|
15 https://bugs.launchpad.net/nova/+bug/1564110 |
|
16 |
|
17 |
|
18 --- nova-2015.1.2/nova/tests/unit/db/test_migrations.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
19 +++ nova-2015.1.2/nova/tests/unit/db/test_migrations.py 2016-03-30 16:22:31.345781715 -0600 |
|
20 @@ -59,6 +59,9 @@ from nova import exception |
|
21 from nova import test |
|
22 from nova.tests import fixtures as nova_fixtures |
|
23 |
|
24 +from oslo_config import cfg |
|
25 + |
|
26 +CONF = cfg.CONF |
|
27 |
|
28 LOG = logging.getLogger(__name__) |
|
29 |
|
30 @@ -905,9 +908,10 @@ class TestNovaMigrationsMySQL(NovaMigrat |
|
31 "SELECT count(*) " |
|
32 "FROM information_schema.TABLES " |
|
33 "WHERE TABLE_SCHEMA='%(database)s' " |
|
34 - "AND ENGINE != 'InnoDB' " |
|
35 + "AND ENGINE != '%(mysql_storage_engine)s' " |
|
36 "AND TABLE_NAME != 'migrate_version'" % |
|
37 - {'database': self.migrate_engine.url.database}) |
|
38 + {'database': self.migrate_engine.url.database, |
|
39 + 'mysql_storage_engine': CONF.database.mysql_storage_engine}) |
|
40 count = noninnodb.scalar() |
|
41 self.assertEqual(count, 0, "%d non InnoDB tables created" % count) |
|
42 |
|
43 --- nova-2015.1.2/nova/db/sqlalchemy/utils.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
44 +++ nova-2015.1.2/nova/db/sqlalchemy/utils.py 2016-03-29 17:23:21.832584350 -0600 |
|
45 @@ -27,6 +27,9 @@ from nova.db.sqlalchemy import api as db |
|
46 from nova import exception |
|
47 from nova.i18n import _, _LE |
|
48 |
|
49 +from oslo_config import cfg |
|
50 + |
|
51 +CONF = cfg.CONF |
|
52 |
|
53 LOG = logging.getLogger(__name__) |
|
54 |
|
55 @@ -120,7 +123,7 @@ def create_shadow_table(migrate_engine, |
|
56 |
|
57 shadow_table_name = db._SHADOW_TABLE_PREFIX + table.name |
|
58 shadow_table = Table(shadow_table_name, meta, *columns, |
|
59 - mysql_engine='InnoDB') |
|
60 + mysql_engine=CONF.database.mysql_storage_engine) |
|
61 try: |
|
62 shadow_table.create() |
|
63 return shadow_table |
|
64 --- nova-2015.1.2/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/002_instance_mapping.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
65 +++ nova-2015.1.2/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/002_instance_mapping.py 2016-03-29 17:23:21.832858639 -0600 |
|
66 @@ -20,6 +20,9 @@ from sqlalchemy import MetaData |
|
67 from sqlalchemy import String |
|
68 from sqlalchemy import Table |
|
69 |
|
70 +from oslo_config import cfg |
|
71 + |
|
72 +CONF = cfg.CONF |
|
73 |
|
74 def upgrade(migrate_engine): |
|
75 meta = MetaData() |
|
76 @@ -39,7 +42,7 @@ def upgrade(migrate_engine): |
|
77 Index('project_id_idx', 'project_id'), |
|
78 ForeignKeyConstraint(columns=['cell_id'], |
|
79 refcolumns=[cell_mappings.c.id]), |
|
80 - mysql_engine='InnoDB', |
|
81 + mysql_engine=CONF.database.mysql_storage_engine, |
|
82 mysql_charset='utf8' |
|
83 ) |
|
84 instance_mappings.create(checkfirst=True) |
|
85 --- nova-2015.1.2/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/001_cell_mapping.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
86 +++ nova-2015.1.2/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/001_cell_mapping.py 2016-03-29 17:23:21.833110868 -0600 |
|
87 @@ -20,6 +20,9 @@ from sqlalchemy import String |
|
88 from sqlalchemy import Table |
|
89 from sqlalchemy import Text |
|
90 |
|
91 +from oslo_config import cfg |
|
92 + |
|
93 +CONF = cfg.CONF |
|
94 |
|
95 def upgrade(migrate_engine): |
|
96 meta = MetaData() |
|
97 @@ -35,7 +38,7 @@ def upgrade(migrate_engine): |
|
98 Column('database_connection', Text()), |
|
99 UniqueConstraint('uuid', name='uniq_cell_mappings0uuid'), |
|
100 Index('uuid_idx', 'uuid'), |
|
101 - mysql_engine='InnoDB', |
|
102 + mysql_engine=CONF.database.mysql_storage_engine, |
|
103 mysql_charset='utf8' |
|
104 ) |
|
105 |
|
106 --- nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/252_add_instance_extra_table.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
107 +++ nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/252_add_instance_extra_table.py 2016-03-29 17:23:21.833360742 -0600 |
|
108 @@ -21,6 +21,9 @@ from sqlalchemy import String |
|
109 from sqlalchemy import Table |
|
110 from sqlalchemy import Text |
|
111 |
|
112 +from oslo_config import cfg |
|
113 + |
|
114 +CONF = cfg.CONF |
|
115 |
|
116 def upgrade(migrate_engine): |
|
117 meta = MetaData() |
|
118 @@ -42,7 +45,7 @@ def upgrade(migrate_engine): |
|
119 continue |
|
120 _columns = tuple([Column(*args, **kwargs) |
|
121 for args, kwargs in columns]) |
|
122 - table = Table(basename, meta, *_columns, mysql_engine='InnoDB', |
|
123 + table = Table(basename, meta, *_columns, mysql_engine=CONF.database.mysql_storage_engine, |
|
124 mysql_charset='utf8') |
|
125 table.create() |
|
126 |
|
127 --- nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/267_instance_uuid_non_nullable.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
128 +++ nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/267_instance_uuid_non_nullable.py 2016-03-29 17:23:21.833658136 -0600 |
|
129 @@ -23,6 +23,10 @@ from nova.i18n import _ |
|
130 |
|
131 LOG = logging.getLogger(__name__) |
|
132 |
|
133 +from oslo_config import cfg |
|
134 + |
|
135 +CONF = cfg.CONF |
|
136 + |
|
137 UC_NAME = 'uniq_instances0uuid' |
|
138 |
|
139 |
|
140 @@ -90,6 +94,12 @@ def process_null_records(meta, scan=True |
|
141 |
|
142 |
|
143 def upgrade(migrate_engine): |
|
144 + |
|
145 + # MySQL Cluster, a.k.a. NDB, has non-NULL records from the beginning. |
|
146 + # If we are using NDB, we will return without migrating as it is not required. |
|
147 + if CONF.database.mysql_storage_engine == "NDBCLUSTER": |
|
148 + return |
|
149 + |
|
150 # NOTE(mriedem): We're going to load up all of the tables so we can find |
|
151 # any with an instance_uuid column since those may be foreign keys back |
|
152 # to the instances table and we want to cleanup those records first. We |
|
153 --- nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/250_remove_instance_groups_metadata.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
154 +++ nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/250_remove_instance_groups_metadata.py 2016-03-29 17:23:21.833942694 -0600 |
|
155 @@ -17,6 +17,9 @@ |
|
156 from sqlalchemy import MetaData, Table, Column, DateTime, Integer, String, \ |
|
157 ForeignKey |
|
158 |
|
159 +from oslo_config import cfg |
|
160 + |
|
161 +CONF = cfg.CONF |
|
162 |
|
163 def upgrade(migrate_engine): |
|
164 """Remove the instance_group_metadata table.""" |
|
165 @@ -49,7 +52,7 @@ def downgrade(migrate_engine): |
|
166 Column('value', String(length=255)), |
|
167 Column('group_id', Integer, ForeignKey('instance_groups.id'), |
|
168 nullable=False), |
|
169 - mysql_engine='InnoDB', |
|
170 + mysql_engine=CONF.database.mysql_storage_engine, |
|
171 mysql_charset='utf8', |
|
172 ) |
|
173 group_metadata.create() |
|
174 @@ -65,7 +68,7 @@ def downgrade(migrate_engine): |
|
175 Column('group_id', Integer, |
|
176 ForeignKey('shadow_instance_groups.id'), |
|
177 nullable=False), |
|
178 - mysql_engine='InnoDB', |
|
179 + mysql_engine=CONF.database.mysql_storage_engine, |
|
180 mysql_charset='utf8', |
|
181 ) |
|
182 shadow_group_metadata.create() |
|
183 --- nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
184 +++ nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py 2016-03-29 17:23:21.835352443 -0600 |
|
185 @@ -25,6 +25,15 @@ from nova.i18n import _LE |
|
186 |
|
187 LOG = logging.getLogger(__name__) |
|
188 |
|
189 +from oslo_config import cfg |
|
190 + |
|
191 +CONF = cfg.CONF |
|
192 + |
|
193 +if CONF.database.mysql_storage_engine == "NDBCLUSTER": |
|
194 + db_string_length = 128 |
|
195 +else: |
|
196 + db_string_length = 255 |
|
197 + |
|
198 |
|
199 # Note on the autoincrement flag: this is defaulted for primary key columns |
|
200 # of integral type, so is no longer set explicitly in such cases. |
|
201 @@ -76,7 +85,7 @@ def _create_shadow_tables(migrate_engine |
|
202 |
|
203 shadow_table_name = 'shadow_' + table_name |
|
204 shadow_table = Table(shadow_table_name, meta, *columns, |
|
205 - mysql_engine='InnoDB') |
|
206 + mysql_engine=CONF.database.mysql_storage_engine) |
|
207 try: |
|
208 shadow_table.create() |
|
209 except Exception: |
|
210 @@ -167,7 +176,7 @@ def _create_dump_tables(migrate_engine): |
|
211 else: |
|
212 columns.append(column.copy()) |
|
213 table_dump = Table(dump_table_name, meta, *columns, |
|
214 - mysql_engine='InnoDB') |
|
215 + mysql_engine=CONF.database.mysql_storage_engine) |
|
216 table_dump.create() |
|
217 |
|
218 |
|
219 @@ -180,14 +189,14 @@ def upgrade(migrate_engine): |
|
220 Column('updated_at', DateTime), |
|
221 Column('deleted_at', DateTime), |
|
222 Column('id', Integer, primary_key=True, nullable=False), |
|
223 - Column('hypervisor', String(length=255)), |
|
224 - Column('os', String(length=255)), |
|
225 - Column('architecture', String(length=255)), |
|
226 - Column('version', String(length=255)), |
|
227 - Column('url', String(length=255)), |
|
228 - Column('md5hash', String(length=255)), |
|
229 + Column('hypervisor', String(length=db_string_length)), |
|
230 + Column('os', String(length=db_string_length)), |
|
231 + Column('architecture', String(length=db_string_length)), |
|
232 + Column('version', String(length=db_string_length)), |
|
233 + Column('url', String(length=db_string_length)), |
|
234 + Column('md5hash', String(length=db_string_length)), |
|
235 Column('deleted', Integer), |
|
236 - mysql_engine='InnoDB', |
|
237 + mysql_engine=CONF.database.mysql_storage_engine, |
|
238 mysql_charset='utf8' |
|
239 ) |
|
240 |
|
241 @@ -196,11 +205,11 @@ def upgrade(migrate_engine): |
|
242 Column('updated_at', DateTime), |
|
243 Column('deleted_at', DateTime), |
|
244 Column('id', Integer, primary_key=True, nullable=False), |
|
245 - Column('host', String(length=255)), |
|
246 + Column('host', String(length=db_string_length)), |
|
247 Column('aggregate_id', Integer, ForeignKey('aggregates.id'), |
|
248 nullable=False), |
|
249 Column('deleted', Integer), |
|
250 - mysql_engine='InnoDB', |
|
251 + mysql_engine=CONF.database.mysql_storage_engine, |
|
252 mysql_charset='utf8' |
|
253 ) |
|
254 |
|
255 @@ -211,10 +220,10 @@ def upgrade(migrate_engine): |
|
256 Column('id', Integer, primary_key=True, nullable=False), |
|
257 Column('aggregate_id', Integer, ForeignKey('aggregates.id'), |
|
258 nullable=False), |
|
259 - Column('key', String(length=255), nullable=False), |
|
260 - Column('value', String(length=255), nullable=False), |
|
261 + Column('key', String(length=db_string_length), nullable=False), |
|
262 + Column('value', String(length=db_string_length), nullable=False), |
|
263 Column('deleted', Integer), |
|
264 - mysql_engine='InnoDB', |
|
265 + mysql_engine=CONF.database.mysql_storage_engine, |
|
266 mysql_charset='utf8' |
|
267 ) |
|
268 |
|
269 @@ -223,9 +232,9 @@ def upgrade(migrate_engine): |
|
270 Column('updated_at', DateTime), |
|
271 Column('deleted_at', DateTime), |
|
272 Column('id', Integer, primary_key=True, nullable=False), |
|
273 - Column('name', String(length=255)), |
|
274 + Column('name', String(length=db_string_length)), |
|
275 Column('deleted', Integer), |
|
276 - mysql_engine='InnoDB', |
|
277 + mysql_engine=CONF.database.mysql_storage_engine, |
|
278 mysql_charset='utf8' |
|
279 ) |
|
280 |
|
281 @@ -234,7 +243,7 @@ def upgrade(migrate_engine): |
|
282 Column('updated_at', DateTime), |
|
283 Column('deleted_at', DateTime), |
|
284 Column('id', Integer, primary_key=True, nullable=False), |
|
285 - Column('device_name', String(length=255), nullable=True), |
|
286 + Column('device_name', String(length=db_string_length), nullable=True), |
|
287 Column('delete_on_termination', Boolean), |
|
288 Column('snapshot_id', String(length=36), nullable=True), |
|
289 Column('volume_id', String(length=36), nullable=True), |
|
290 @@ -243,14 +252,14 @@ def upgrade(migrate_engine): |
|
291 Column('connection_info', MediumText()), |
|
292 Column('instance_uuid', String(length=36)), |
|
293 Column('deleted', Integer), |
|
294 - Column('source_type', String(length=255), nullable=True), |
|
295 - Column('destination_type', String(length=255), nullable=True), |
|
296 - Column('guest_format', String(length=255), nullable=True), |
|
297 - Column('device_type', String(length=255), nullable=True), |
|
298 - Column('disk_bus', String(length=255), nullable=True), |
|
299 + Column('source_type', String(length=db_string_length), nullable=True), |
|
300 + Column('destination_type', String(length=db_string_length), nullable=True), |
|
301 + Column('guest_format', String(length=db_string_length), nullable=True), |
|
302 + Column('device_type', String(length=db_string_length), nullable=True), |
|
303 + Column('disk_bus', String(length=db_string_length), nullable=True), |
|
304 Column('boot_index', Integer), |
|
305 Column('image_id', String(length=36), nullable=True), |
|
306 - mysql_engine='InnoDB', |
|
307 + mysql_engine=CONF.database.mysql_storage_engine, |
|
308 mysql_charset='utf8' |
|
309 ) |
|
310 |
|
311 @@ -263,12 +272,12 @@ def upgrade(migrate_engine): |
|
312 Column('last_refreshed', DateTime), |
|
313 Column('bw_in', BigInteger), |
|
314 Column('bw_out', BigInteger), |
|
315 - Column('mac', String(length=255)), |
|
316 + Column('mac', String(length=db_string_length)), |
|
317 Column('uuid', String(length=36)), |
|
318 Column('last_ctr_in', BigInteger()), |
|
319 Column('last_ctr_out', BigInteger()), |
|
320 Column('deleted', Integer), |
|
321 - mysql_engine='InnoDB', |
|
322 + mysql_engine=CONF.database.mysql_storage_engine, |
|
323 mysql_charset='utf8' |
|
324 ) |
|
325 |
|
326 @@ -277,14 +286,14 @@ def upgrade(migrate_engine): |
|
327 Column('updated_at', DateTime), |
|
328 Column('deleted_at', DateTime), |
|
329 Column('id', Integer, primary_key=True, nullable=False), |
|
330 - Column('api_url', String(length=255)), |
|
331 + Column('api_url', String(length=db_string_length)), |
|
332 Column('weight_offset', Float), |
|
333 Column('weight_scale', Float), |
|
334 - Column('name', String(length=255)), |
|
335 + Column('name', String(length=db_string_length)), |
|
336 Column('is_parent', Boolean), |
|
337 Column('deleted', Integer), |
|
338 - Column('transport_url', String(length=255), nullable=False), |
|
339 - mysql_engine='InnoDB', |
|
340 + Column('transport_url', String(length=db_string_length), nullable=False), |
|
341 + mysql_engine=CONF.database.mysql_storage_engine, |
|
342 mysql_charset='utf8' |
|
343 ) |
|
344 |
|
345 @@ -293,11 +302,11 @@ def upgrade(migrate_engine): |
|
346 Column('updated_at', DateTime), |
|
347 Column('deleted_at', DateTime), |
|
348 Column('id', Integer, primary_key=True, nullable=False), |
|
349 - Column('user_id', String(length=255)), |
|
350 - Column('project_id', String(length=255)), |
|
351 - Column('file_name', String(length=255)), |
|
352 + Column('user_id', String(length=db_string_length)), |
|
353 + Column('project_id', String(length=db_string_length)), |
|
354 + Column('file_name', String(length=db_string_length)), |
|
355 Column('deleted', Integer), |
|
356 - mysql_engine='InnoDB', |
|
357 + mysql_engine=CONF.database.mysql_storage_engine, |
|
358 mysql_charset='utf8' |
|
359 ) |
|
360 |
|
361 @@ -307,10 +316,10 @@ def upgrade(migrate_engine): |
|
362 Column('deleted_at', DateTime), |
|
363 Column('id', Integer, primary_key=True, nullable=False), |
|
364 Column('compute_node_id', Integer, nullable=False), |
|
365 - Column('key', String(length=255), nullable=False), |
|
366 - Column('value', String(length=255)), |
|
367 + Column('key', String(length=db_string_length), nullable=False), |
|
368 + Column('value', String(length=db_string_length)), |
|
369 Column('deleted', Integer), |
|
370 - mysql_engine='InnoDB', |
|
371 + mysql_engine=CONF.database.mysql_storage_engine, |
|
372 mysql_charset='utf8' |
|
373 ) |
|
374 |
|
375 @@ -334,12 +343,12 @@ def upgrade(migrate_engine): |
|
376 Column('free_disk_gb', Integer), |
|
377 Column('current_workload', Integer), |
|
378 Column('running_vms', Integer), |
|
379 - Column('hypervisor_hostname', String(length=255)), |
|
380 + Column('hypervisor_hostname', String(length=db_string_length)), |
|
381 Column('deleted', Integer), |
|
382 Column('host_ip', InetSmall()), |
|
383 Column('supported_instances', Text), |
|
384 Column('pci_stats', Text, nullable=True), |
|
385 - mysql_engine='InnoDB', |
|
386 + mysql_engine=CONF.database.mysql_storage_engine, |
|
387 mysql_charset='utf8' |
|
388 ) |
|
389 |
|
390 @@ -349,14 +358,14 @@ def upgrade(migrate_engine): |
|
391 Column('deleted_at', DateTime), |
|
392 Column('id', Integer, primary_key=True, nullable=False), |
|
393 Column('address', InetSmall()), |
|
394 - Column('username', String(length=255)), |
|
395 - Column('password', String(length=255)), |
|
396 - Column('console_type', String(length=255)), |
|
397 - Column('public_hostname', String(length=255)), |
|
398 - Column('host', String(length=255)), |
|
399 - Column('compute_host', String(length=255)), |
|
400 + Column('username', String(length=db_string_length)), |
|
401 + Column('password', String(length=db_string_length)), |
|
402 + Column('console_type', String(length=db_string_length)), |
|
403 + Column('public_hostname', String(length=db_string_length)), |
|
404 + Column('host', String(length=db_string_length)), |
|
405 + Column('compute_host', String(length=db_string_length)), |
|
406 Column('deleted', Integer), |
|
407 - mysql_engine='InnoDB', |
|
408 + mysql_engine=CONF.database.mysql_storage_engine, |
|
409 mysql_charset='utf8' |
|
410 ) |
|
411 |
|
412 @@ -365,15 +374,15 @@ def upgrade(migrate_engine): |
|
413 Column('updated_at', DateTime), |
|
414 Column('deleted_at', DateTime), |
|
415 Column('id', Integer, primary_key=True, nullable=False), |
|
416 - Column('instance_name', String(length=255)), |
|
417 - Column('password', String(length=255)), |
|
418 + Column('instance_name', String(length=db_string_length)), |
|
419 + Column('password', String(length=db_string_length)), |
|
420 Column('port', Integer), |
|
421 Column('pool_id', Integer, ForeignKey('console_pools.id')), |
|
422 Column('instance_uuid', String(length=36), |
|
423 ForeignKey('instances.uuid', |
|
424 name='consoles_instance_uuid_fkey')), |
|
425 Column('deleted', Integer), |
|
426 - mysql_engine='InnoDB', |
|
427 + mysql_engine=CONF.database.mysql_storage_engine, |
|
428 mysql_charset='utf8' |
|
429 ) |
|
430 |
|
431 @@ -382,11 +391,11 @@ def upgrade(migrate_engine): |
|
432 Column('updated_at', DateTime), |
|
433 Column('deleted_at', DateTime), |
|
434 Column('deleted', Boolean), |
|
435 - Column('domain', String(length=255), primary_key=True, nullable=False), |
|
436 - Column('scope', String(length=255)), |
|
437 - Column('availability_zone', String(length=255)), |
|
438 - Column('project_id', String(length=255)), |
|
439 - mysql_engine='InnoDB', |
|
440 + Column('domain', String(length=db_string_length), primary_key=True, nullable=False), |
|
441 + Column('scope', String(length=db_string_length)), |
|
442 + Column('availability_zone', String(length=db_string_length)), |
|
443 + Column('project_id', String(length=db_string_length)), |
|
444 + mysql_engine=CONF.database.mysql_storage_engine, |
|
445 mysql_charset='utf8' |
|
446 ) |
|
447 |
|
448 @@ -401,10 +410,10 @@ def upgrade(migrate_engine): |
|
449 Column('leased', Boolean), |
|
450 Column('reserved', Boolean), |
|
451 Column('virtual_interface_id', Integer), |
|
452 - Column('host', String(length=255)), |
|
453 + Column('host', String(length=db_string_length)), |
|
454 Column('instance_uuid', String(length=36)), |
|
455 Column('deleted', Integer), |
|
456 - mysql_engine='InnoDB', |
|
457 + mysql_engine=CONF.database.mysql_storage_engine, |
|
458 mysql_charset='utf8' |
|
459 ) |
|
460 |
|
461 @@ -415,13 +424,13 @@ def upgrade(migrate_engine): |
|
462 Column('id', Integer, primary_key=True, nullable=False), |
|
463 Column('address', InetSmall()), |
|
464 Column('fixed_ip_id', Integer), |
|
465 - Column('project_id', String(length=255)), |
|
466 - Column('host', String(length=255)), |
|
467 + Column('project_id', String(length=db_string_length)), |
|
468 + Column('host', String(length=db_string_length)), |
|
469 Column('auto_assigned', Boolean), |
|
470 - Column('pool', String(length=255)), |
|
471 - Column('interface', String(length=255)), |
|
472 + Column('pool', String(length=db_string_length)), |
|
473 + Column('interface', String(length=db_string_length)), |
|
474 Column('deleted', Integer), |
|
475 - mysql_engine='InnoDB', |
|
476 + mysql_engine=CONF.database.mysql_storage_engine, |
|
477 mysql_charset='utf8' |
|
478 ) |
|
479 |
|
480 @@ -432,11 +441,11 @@ def upgrade(migrate_engine): |
|
481 Column('id', Integer, primary_key=True, nullable=False), |
|
482 Column('instance_uuid', String(length=36)), |
|
483 Column('code', Integer, nullable=False), |
|
484 - Column('message', String(length=255)), |
|
485 + Column('message', String(length=db_string_length)), |
|
486 Column('details', MediumText()), |
|
487 - Column('host', String(length=255)), |
|
488 + Column('host', String(length=db_string_length)), |
|
489 Column('deleted', Integer), |
|
490 - mysql_engine='InnoDB', |
|
491 + mysql_engine=CONF.database.mysql_storage_engine, |
|
492 mysql_charset='utf8' |
|
493 ) |
|
494 |
|
495 @@ -447,7 +456,7 @@ def upgrade(migrate_engine): |
|
496 Column('id', Integer, primary_key=True, nullable=False), |
|
497 Column('uuid', String(36), nullable=False), |
|
498 Column('deleted', Integer), |
|
499 - mysql_engine='InnoDB', |
|
500 + mysql_engine=CONF.database.mysql_storage_engine, |
|
501 mysql_charset='utf8' |
|
502 ) |
|
503 |
|
504 @@ -459,7 +468,7 @@ def upgrade(migrate_engine): |
|
505 Column('network_info', MediumText()), |
|
506 Column('instance_uuid', String(length=36), nullable=False), |
|
507 Column('deleted', Integer), |
|
508 - mysql_engine='InnoDB', |
|
509 + mysql_engine=CONF.database.mysql_storage_engine, |
|
510 mysql_charset='utf8' |
|
511 ) |
|
512 |
|
513 @@ -469,13 +478,13 @@ def upgrade(migrate_engine): |
|
514 Column('deleted_at', DateTime), |
|
515 Column('deleted', Integer), |
|
516 Column('id', Integer, primary_key=True, nullable=False), |
|
517 - Column('user_id', String(length=255)), |
|
518 - Column('project_id', String(length=255)), |
|
519 + Column('user_id', String(length=db_string_length)), |
|
520 + Column('project_id', String(length=db_string_length)), |
|
521 Column('uuid', String(length=36), nullable=False), |
|
522 - Column('name', String(length=255)), |
|
523 + Column('name', String(length=db_string_length)), |
|
524 UniqueConstraint('uuid', 'deleted', |
|
525 name='uniq_instance_groups0uuid0deleted'), |
|
526 - mysql_engine='InnoDB', |
|
527 + mysql_engine=CONF.database.mysql_storage_engine, |
|
528 mysql_charset='utf8', |
|
529 ) |
|
530 |
|
531 @@ -485,11 +494,11 @@ def upgrade(migrate_engine): |
|
532 Column('deleted_at', DateTime), |
|
533 Column('deleted', Integer), |
|
534 Column('id', Integer, primary_key=True, nullable=False), |
|
535 - Column('key', String(length=255)), |
|
536 - Column('value', String(length=255)), |
|
537 + Column('key', String(length=db_string_length)), |
|
538 + Column('value', String(length=db_string_length)), |
|
539 Column('group_id', Integer, ForeignKey('instance_groups.id'), |
|
540 nullable=False), |
|
541 - mysql_engine='InnoDB', |
|
542 + mysql_engine=CONF.database.mysql_storage_engine, |
|
543 mysql_charset='utf8', |
|
544 ) |
|
545 |
|
546 @@ -499,10 +508,10 @@ def upgrade(migrate_engine): |
|
547 Column('deleted_at', DateTime), |
|
548 Column('deleted', Integer), |
|
549 Column('id', Integer, primary_key=True, nullable=False), |
|
550 - Column('policy', String(length=255)), |
|
551 + Column('policy', String(length=db_string_length)), |
|
552 Column('group_id', Integer, ForeignKey('instance_groups.id'), |
|
553 nullable=False), |
|
554 - mysql_engine='InnoDB', |
|
555 + mysql_engine=CONF.database.mysql_storage_engine, |
|
556 mysql_charset='utf8', |
|
557 ) |
|
558 |
|
559 @@ -512,10 +521,10 @@ def upgrade(migrate_engine): |
|
560 Column('deleted_at', DateTime), |
|
561 Column('deleted', Integer), |
|
562 Column('id', Integer, primary_key=True, nullable=False), |
|
563 - Column('instance_id', String(length=255)), |
|
564 + Column('instance_id', String(length=db_string_length)), |
|
565 Column('group_id', Integer, ForeignKey('instance_groups.id'), |
|
566 nullable=False), |
|
567 - mysql_engine='InnoDB', |
|
568 + mysql_engine=CONF.database.mysql_storage_engine, |
|
569 mysql_charset='utf8', |
|
570 ) |
|
571 |
|
572 @@ -524,11 +533,11 @@ def upgrade(migrate_engine): |
|
573 Column('updated_at', DateTime), |
|
574 Column('deleted_at', DateTime), |
|
575 Column('id', Integer, primary_key=True, nullable=False), |
|
576 - Column('key', String(length=255)), |
|
577 - Column('value', String(length=255)), |
|
578 + Column('key', String(length=db_string_length)), |
|
579 + Column('value', String(length=db_string_length)), |
|
580 Column('instance_uuid', String(length=36), nullable=True), |
|
581 Column('deleted', Integer), |
|
582 - mysql_engine='InnoDB', |
|
583 + mysql_engine=CONF.database.mysql_storage_engine, |
|
584 mysql_charset='utf8' |
|
585 ) |
|
586 |
|
587 @@ -538,10 +547,10 @@ def upgrade(migrate_engine): |
|
588 Column('deleted_at', DateTime), |
|
589 Column('id', Integer, primary_key=True, nullable=False), |
|
590 Column('instance_uuid', String(length=36), nullable=False), |
|
591 - Column('key', String(length=255), nullable=False), |
|
592 - Column('value', String(length=255)), |
|
593 + Column('key', String(length=db_string_length), nullable=False), |
|
594 + Column('value', String(length=db_string_length)), |
|
595 Column('deleted', Integer), |
|
596 - mysql_engine='InnoDB', |
|
597 + mysql_engine=CONF.database.mysql_storage_engine, |
|
598 mysql_charset='utf8' |
|
599 ) |
|
600 |
|
601 @@ -552,10 +561,10 @@ def upgrade(migrate_engine): |
|
602 Column('id', Integer, primary_key=True, nullable=False), |
|
603 Column('instance_type_id', Integer, ForeignKey('instance_types.id'), |
|
604 nullable=False), |
|
605 - Column('key', String(length=255)), |
|
606 - Column('value', String(length=255)), |
|
607 + Column('key', String(length=db_string_length)), |
|
608 + Column('value', String(length=db_string_length)), |
|
609 Column('deleted', Integer), |
|
610 - mysql_engine='InnoDB', |
|
611 + mysql_engine=CONF.database.mysql_storage_engine, |
|
612 mysql_charset='utf8' |
|
613 ) |
|
614 |
|
615 @@ -565,9 +574,9 @@ def upgrade(migrate_engine): |
|
616 Column('deleted_at', DateTime), |
|
617 Column('id', Integer, primary_key=True, nullable=False), |
|
618 Column('instance_type_id', Integer, nullable=False), |
|
619 - Column('project_id', String(length=255)), |
|
620 + Column('project_id', String(length=db_string_length)), |
|
621 Column('deleted', Integer), |
|
622 - mysql_engine='InnoDB', |
|
623 + mysql_engine=CONF.database.mysql_storage_engine, |
|
624 mysql_charset='utf8' |
|
625 ) |
|
626 |
|
627 @@ -575,20 +584,20 @@ def upgrade(migrate_engine): |
|
628 Column('created_at', DateTime), |
|
629 Column('updated_at', DateTime), |
|
630 Column('deleted_at', DateTime), |
|
631 - Column('name', String(length=255)), |
|
632 + Column('name', String(length=db_string_length)), |
|
633 Column('id', Integer, primary_key=True, nullable=False), |
|
634 Column('memory_mb', Integer, nullable=False), |
|
635 Column('vcpus', Integer, nullable=False), |
|
636 Column('swap', Integer, nullable=False), |
|
637 Column('vcpu_weight', Integer), |
|
638 - Column('flavorid', String(length=255)), |
|
639 + Column('flavorid', String(length=db_string_length)), |
|
640 Column('rxtx_factor', Float), |
|
641 Column('root_gb', Integer), |
|
642 Column('ephemeral_gb', Integer), |
|
643 Column('disabled', Boolean), |
|
644 Column('is_public', Boolean), |
|
645 Column('deleted', Integer), |
|
646 - mysql_engine='InnoDB', |
|
647 + mysql_engine=CONF.database.mysql_storage_engine, |
|
648 mysql_charset='utf8' |
|
649 ) |
|
650 |
|
651 @@ -599,54 +608,54 @@ def upgrade(migrate_engine): |
|
652 Column('deleted_at', DateTime), |
|
653 Column('id', Integer, primary_key=True, nullable=False), |
|
654 Column('internal_id', Integer), |
|
655 - Column('user_id', String(length=255)), |
|
656 - Column('project_id', String(length=255)), |
|
657 - Column('image_ref', String(length=255)), |
|
658 - Column('kernel_id', String(length=255)), |
|
659 - Column('ramdisk_id', String(length=255)), |
|
660 + Column('user_id', String(length=db_string_length)), |
|
661 + Column('project_id', String(length=db_string_length)), |
|
662 + Column('image_ref', String(length=db_string_length)), |
|
663 + Column('kernel_id', String(length=db_string_length)), |
|
664 + Column('ramdisk_id', String(length=db_string_length)), |
|
665 Column('launch_index', Integer), |
|
666 - Column('key_name', String(length=255)), |
|
667 + Column('key_name', String(length=db_string_length)), |
|
668 Column('key_data', MediumText()), |
|
669 Column('power_state', Integer), |
|
670 - Column('vm_state', String(length=255)), |
|
671 + Column('vm_state', String(length=db_string_length)), |
|
672 Column('memory_mb', Integer), |
|
673 Column('vcpus', Integer), |
|
674 - Column('hostname', String(length=255)), |
|
675 - Column('host', String(length=255)), |
|
676 + Column('hostname', String(length=db_string_length)), |
|
677 + Column('host', String(length=db_string_length)), |
|
678 Column('user_data', MediumText()), |
|
679 - Column('reservation_id', String(length=255)), |
|
680 + Column('reservation_id', String(length=db_string_length)), |
|
681 Column('scheduled_at', DateTime), |
|
682 Column('launched_at', DateTime), |
|
683 Column('terminated_at', DateTime), |
|
684 - Column('display_name', String(length=255)), |
|
685 - Column('display_description', String(length=255)), |
|
686 - Column('availability_zone', String(length=255)), |
|
687 + Column('display_name', String(length=db_string_length)), |
|
688 + Column('display_description', String(length=db_string_length)), |
|
689 + Column('availability_zone', String(length=db_string_length)), |
|
690 Column('locked', Boolean), |
|
691 - Column('os_type', String(length=255)), |
|
692 + Column('os_type', String(length=db_string_length)), |
|
693 Column('launched_on', MediumText()), |
|
694 Column('instance_type_id', Integer), |
|
695 - Column('vm_mode', String(length=255)), |
|
696 - Column('uuid', String(length=36)), |
|
697 - Column('architecture', String(length=255)), |
|
698 - Column('root_device_name', String(length=255)), |
|
699 + Column('vm_mode', String(length=db_string_length)), |
|
700 + Column('uuid', String(length=36), nullable=False), |
|
701 + Column('architecture', String(length=db_string_length)), |
|
702 + Column('root_device_name', String(length=db_string_length)), |
|
703 Column('access_ip_v4', InetSmall()), |
|
704 Column('access_ip_v6', InetSmall()), |
|
705 - Column('config_drive', String(length=255)), |
|
706 - Column('task_state', String(length=255)), |
|
707 - Column('default_ephemeral_device', String(length=255)), |
|
708 - Column('default_swap_device', String(length=255)), |
|
709 + Column('config_drive', String(length=db_string_length)), |
|
710 + Column('task_state', String(length=db_string_length)), |
|
711 + Column('default_ephemeral_device', String(length=db_string_length)), |
|
712 + Column('default_swap_device', String(length=db_string_length)), |
|
713 Column('progress', Integer), |
|
714 Column('auto_disk_config', Boolean), |
|
715 Column('shutdown_terminate', Boolean), |
|
716 Column('disable_terminate', Boolean), |
|
717 Column('root_gb', Integer), |
|
718 Column('ephemeral_gb', Integer), |
|
719 - Column('cell_name', String(length=255)), |
|
720 - Column('node', String(length=255)), |
|
721 + Column('cell_name', String(length=db_string_length)), |
|
722 + Column('node', String(length=db_string_length)), |
|
723 Column('deleted', Integer), |
|
724 Column('locked_by', inst_lock_enum), |
|
725 Column('cleaned', Integer, default=0), |
|
726 - mysql_engine='InnoDB', |
|
727 + mysql_engine=CONF.database.mysql_storage_engine, |
|
728 mysql_charset='utf8' |
|
729 ) |
|
730 |
|
731 @@ -655,16 +664,16 @@ def upgrade(migrate_engine): |
|
732 Column('updated_at', DateTime), |
|
733 Column('deleted_at', DateTime), |
|
734 Column('id', Integer, primary_key=True, nullable=False), |
|
735 - Column('action', String(length=255)), |
|
736 + Column('action', String(length=db_string_length)), |
|
737 Column('instance_uuid', String(length=36)), |
|
738 - Column('request_id', String(length=255)), |
|
739 - Column('user_id', String(length=255)), |
|
740 - Column('project_id', String(length=255)), |
|
741 + Column('request_id', String(length=db_string_length)), |
|
742 + Column('user_id', String(length=db_string_length)), |
|
743 + Column('project_id', String(length=db_string_length)), |
|
744 Column('start_time', DateTime), |
|
745 Column('finish_time', DateTime), |
|
746 - Column('message', String(length=255)), |
|
747 + Column('message', String(length=db_string_length)), |
|
748 Column('deleted', Integer), |
|
749 - mysql_engine='InnoDB', |
|
750 + mysql_engine=CONF.database.mysql_storage_engine, |
|
751 mysql_charset='utf8', |
|
752 ) |
|
753 |
|
754 @@ -673,14 +682,14 @@ def upgrade(migrate_engine): |
|
755 Column('updated_at', DateTime), |
|
756 Column('deleted_at', DateTime), |
|
757 Column('id', Integer, primary_key=True, nullable=False), |
|
758 - Column('event', String(length=255)), |
|
759 + Column('event', String(length=db_string_length)), |
|
760 Column('action_id', Integer, ForeignKey('instance_actions.id')), |
|
761 Column('start_time', DateTime), |
|
762 Column('finish_time', DateTime), |
|
763 - Column('result', String(length=255)), |
|
764 + Column('result', String(length=db_string_length)), |
|
765 Column('traceback', Text), |
|
766 Column('deleted', Integer), |
|
767 - mysql_engine='InnoDB', |
|
768 + mysql_engine=CONF.database.mysql_storage_engine, |
|
769 mysql_charset='utf8', |
|
770 ) |
|
771 |
|
772 @@ -690,10 +699,10 @@ def upgrade(migrate_engine): |
|
773 Column('deleted_at', DateTime), |
|
774 Column('id', Integer, primary_key=True, nullable=False), |
|
775 Column('target_num', Integer), |
|
776 - Column('host', String(length=255)), |
|
777 + Column('host', String(length=db_string_length)), |
|
778 Column('volume_id', String(length=36), nullable=True), |
|
779 Column('deleted', Integer), |
|
780 - mysql_engine='InnoDB', |
|
781 + mysql_engine=CONF.database.mysql_storage_engine, |
|
782 mysql_charset='utf8' |
|
783 ) |
|
784 |
|
785 @@ -702,12 +711,12 @@ def upgrade(migrate_engine): |
|
786 Column('updated_at', DateTime), |
|
787 Column('deleted_at', DateTime), |
|
788 Column('id', Integer, primary_key=True, nullable=False), |
|
789 - Column('name', String(length=255)), |
|
790 - Column('user_id', String(length=255)), |
|
791 - Column('fingerprint', String(length=255)), |
|
792 + Column('name', String(length=db_string_length)), |
|
793 + Column('user_id', String(length=db_string_length)), |
|
794 + Column('fingerprint', String(length=db_string_length)), |
|
795 Column('public_key', MediumText()), |
|
796 Column('deleted', Integer), |
|
797 - mysql_engine='InnoDB', |
|
798 + mysql_engine=CONF.database.mysql_storage_engine, |
|
799 mysql_charset='utf8' |
|
800 ) |
|
801 |
|
802 @@ -716,17 +725,17 @@ def upgrade(migrate_engine): |
|
803 Column('updated_at', DateTime), |
|
804 Column('deleted_at', DateTime), |
|
805 Column('id', Integer, primary_key=True, nullable=False), |
|
806 - Column('source_compute', String(length=255)), |
|
807 - Column('dest_compute', String(length=255)), |
|
808 - Column('dest_host', String(length=255)), |
|
809 - Column('status', String(length=255)), |
|
810 + Column('source_compute', String(length=db_string_length)), |
|
811 + Column('dest_compute', String(length=db_string_length)), |
|
812 + Column('dest_host', String(length=db_string_length)), |
|
813 + Column('status', String(length=db_string_length)), |
|
814 Column('instance_uuid', String(length=36)), |
|
815 Column('old_instance_type_id', Integer), |
|
816 Column('new_instance_type_id', Integer), |
|
817 - Column('source_node', String(length=255)), |
|
818 - Column('dest_node', String(length=255)), |
|
819 + Column('source_node', String(length=db_string_length)), |
|
820 + Column('dest_node', String(length=db_string_length)), |
|
821 Column('deleted', Integer), |
|
822 - mysql_engine='InnoDB', |
|
823 + mysql_engine=CONF.database.mysql_storage_engine, |
|
824 mysql_charset='utf8' |
|
825 ) |
|
826 |
|
827 @@ -738,7 +747,7 @@ def upgrade(migrate_engine): |
|
828 Column('injected', Boolean), |
|
829 Column('cidr', Inet()), |
|
830 Column('netmask', InetSmall()), |
|
831 - Column('bridge', String(length=255)), |
|
832 + Column('bridge', String(length=db_string_length)), |
|
833 Column('gateway', InetSmall()), |
|
834 Column('broadcast', InetSmall()), |
|
835 Column('dns1', InetSmall()), |
|
836 @@ -747,20 +756,20 @@ def upgrade(migrate_engine): |
|
837 Column('vpn_public_port', Integer), |
|
838 Column('vpn_private_address', InetSmall()), |
|
839 Column('dhcp_start', InetSmall()), |
|
840 - Column('project_id', String(length=255)), |
|
841 - Column('host', String(length=255)), |
|
842 + Column('project_id', String(length=db_string_length)), |
|
843 + Column('host', String(length=db_string_length)), |
|
844 Column('cidr_v6', Inet()), |
|
845 Column('gateway_v6', InetSmall()), |
|
846 - Column('label', String(length=255)), |
|
847 + Column('label', String(length=db_string_length)), |
|
848 Column('netmask_v6', InetSmall()), |
|
849 - Column('bridge_interface', String(length=255)), |
|
850 + Column('bridge_interface', String(length=db_string_length)), |
|
851 Column('multi_host', Boolean), |
|
852 Column('dns2', InetSmall()), |
|
853 Column('uuid', String(length=36)), |
|
854 Column('priority', Integer), |
|
855 Column('rxtx_base', Integer), |
|
856 Column('deleted', Integer), |
|
857 - mysql_engine='InnoDB', |
|
858 + mysql_engine=CONF.database.mysql_storage_engine, |
|
859 mysql_charset='utf8' |
|
860 ) |
|
861 |
|
862 @@ -776,8 +785,8 @@ def upgrade(migrate_engine): |
|
863 Column('product_id', String(4)), |
|
864 Column('vendor_id', String(4)), |
|
865 Column('dev_type', String(8)), |
|
866 - Column('dev_id', String(255)), |
|
867 - Column('label', String(255), nullable=False), |
|
868 + Column('dev_id', String(db_string_length)), |
|
869 + Column('label', String(db_string_length), nullable=False), |
|
870 Column('status', String(36), nullable=False), |
|
871 Column('extra_info', Text, nullable=True), |
|
872 Column('instance_uuid', String(36), nullable=True), |
|
873 @@ -788,7 +797,7 @@ def upgrade(migrate_engine): |
|
874 UniqueConstraint('compute_node_id', |
|
875 'address', 'deleted', |
|
876 name=pci_devices_uc_name), |
|
877 - mysql_engine='InnoDB', |
|
878 + mysql_engine=CONF.database.mysql_storage_engine, |
|
879 mysql_charset='utf8') |
|
880 |
|
881 provider_fw_rules = Table('provider_fw_rules', meta, |
|
882 @@ -801,7 +810,7 @@ def upgrade(migrate_engine): |
|
883 Column('to_port', Integer), |
|
884 Column('cidr', Inet()), |
|
885 Column('deleted', Integer), |
|
886 - mysql_engine='InnoDB', |
|
887 + mysql_engine=CONF.database.mysql_storage_engine, |
|
888 mysql_charset='utf8' |
|
889 ) |
|
890 |
|
891 @@ -810,11 +819,11 @@ def upgrade(migrate_engine): |
|
892 Column('updated_at', DateTime), |
|
893 Column('deleted_at', DateTime), |
|
894 Column('id', Integer, primary_key=True, nullable=False), |
|
895 - Column('class_name', String(length=255)), |
|
896 - Column('resource', String(length=255)), |
|
897 + Column('class_name', String(length=db_string_length)), |
|
898 + Column('resource', String(length=db_string_length)), |
|
899 Column('hard_limit', Integer), |
|
900 Column('deleted', Integer), |
|
901 - mysql_engine='InnoDB', |
|
902 + mysql_engine=CONF.database.mysql_storage_engine, |
|
903 mysql_charset='utf8' |
|
904 ) |
|
905 |
|
906 @@ -823,14 +832,14 @@ def upgrade(migrate_engine): |
|
907 Column('updated_at', DateTime), |
|
908 Column('deleted_at', DateTime), |
|
909 Column('id', Integer, primary_key=True, nullable=False), |
|
910 - Column('project_id', String(length=255)), |
|
911 - Column('resource', String(length=255)), |
|
912 + Column('project_id', String(length=db_string_length)), |
|
913 + Column('resource', String(length=db_string_length)), |
|
914 Column('in_use', Integer, nullable=False), |
|
915 Column('reserved', Integer, nullable=False), |
|
916 Column('until_refresh', Integer), |
|
917 Column('deleted', Integer), |
|
918 - Column('user_id', String(length=255)), |
|
919 - mysql_engine='InnoDB', |
|
920 + Column('user_id', String(length=db_string_length)), |
|
921 + mysql_engine=CONF.database.mysql_storage_engine, |
|
922 mysql_charset='utf8' |
|
923 ) |
|
924 |
|
925 @@ -839,11 +848,11 @@ def upgrade(migrate_engine): |
|
926 Column('created_at', DateTime), |
|
927 Column('updated_at', DateTime), |
|
928 Column('deleted_at', DateTime), |
|
929 - Column('project_id', String(length=255)), |
|
930 - Column('resource', String(length=255), nullable=False), |
|
931 + Column('project_id', String(length=db_string_length)), |
|
932 + Column('resource', String(length=db_string_length), nullable=False), |
|
933 Column('hard_limit', Integer), |
|
934 Column('deleted', Integer), |
|
935 - mysql_engine='InnoDB', |
|
936 + mysql_engine=CONF.database.mysql_storage_engine, |
|
937 mysql_charset='utf8' |
|
938 ) |
|
939 |
|
940 @@ -856,18 +865,18 @@ def upgrade(migrate_engine): |
|
941 Column('deleted_at', DateTime), |
|
942 Column('deleted', Integer), |
|
943 Column('user_id', |
|
944 - String(length=255), |
|
945 + String(length=db_string_length), |
|
946 nullable=False), |
|
947 Column('project_id', |
|
948 - String(length=255), |
|
949 + String(length=db_string_length), |
|
950 nullable=False), |
|
951 Column('resource', |
|
952 - String(length=255), |
|
953 + String(length=db_string_length), |
|
954 nullable=False), |
|
955 Column('hard_limit', Integer, nullable=True), |
|
956 UniqueConstraint('user_id', 'project_id', 'resource', |
|
957 'deleted', name=uniq_name), |
|
958 - mysql_engine='InnoDB', |
|
959 + mysql_engine=CONF.database.mysql_storage_engine, |
|
960 mysql_charset='utf8', |
|
961 ) |
|
962 |
|
963 @@ -878,13 +887,13 @@ def upgrade(migrate_engine): |
|
964 Column('id', Integer, primary_key=True, nullable=False), |
|
965 Column('uuid', String(length=36), nullable=False), |
|
966 Column('usage_id', Integer, nullable=False), |
|
967 - Column('project_id', String(length=255)), |
|
968 - Column('resource', String(length=255)), |
|
969 + Column('project_id', String(length=db_string_length)), |
|
970 + Column('resource', String(length=db_string_length)), |
|
971 Column('delta', Integer, nullable=False), |
|
972 Column('expire', DateTime), |
|
973 Column('deleted', Integer), |
|
974 - Column('user_id', String(length=255)), |
|
975 - mysql_engine='InnoDB', |
|
976 + Column('user_id', String(length=db_string_length)), |
|
977 + mysql_engine=CONF.database.mysql_storage_engine, |
|
978 mysql_charset='utf8' |
|
979 ) |
|
980 |
|
981 @@ -895,7 +904,7 @@ def upgrade(migrate_engine): |
|
982 Column('id', Integer, primary_key=True, nullable=False), |
|
983 Column('uuid', String(length=36), nullable=False), |
|
984 Column('deleted', Integer), |
|
985 - mysql_engine='InnoDB', |
|
986 + mysql_engine=CONF.database.mysql_storage_engine, |
|
987 mysql_charset='utf8' |
|
988 ) |
|
989 |
|
990 @@ -908,7 +917,7 @@ def upgrade(migrate_engine): |
|
991 Column('security_group_id', Integer), |
|
992 Column('instance_uuid', String(length=36)), |
|
993 Column('deleted', Integer), |
|
994 - mysql_engine='InnoDB', |
|
995 + mysql_engine=CONF.database.mysql_storage_engine, |
|
996 mysql_charset='utf8' |
|
997 ) |
|
998 |
|
999 @@ -918,13 +927,13 @@ def upgrade(migrate_engine): |
|
1000 Column('deleted_at', DateTime), |
|
1001 Column('id', Integer, primary_key=True, nullable=False), |
|
1002 Column('parent_group_id', Integer, ForeignKey('security_groups.id')), |
|
1003 - Column('protocol', String(length=255)), |
|
1004 + Column('protocol', String(length=db_string_length)), |
|
1005 Column('from_port', Integer), |
|
1006 Column('to_port', Integer), |
|
1007 Column('cidr', Inet()), |
|
1008 Column('group_id', Integer, ForeignKey('security_groups.id')), |
|
1009 Column('deleted', Integer), |
|
1010 - mysql_engine='InnoDB', |
|
1011 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1012 mysql_charset='utf8' |
|
1013 ) |
|
1014 |
|
1015 @@ -933,12 +942,12 @@ def upgrade(migrate_engine): |
|
1016 Column('updated_at', DateTime), |
|
1017 Column('deleted_at', DateTime), |
|
1018 Column('id', Integer, primary_key=True, nullable=False), |
|
1019 - Column('name', String(length=255)), |
|
1020 - Column('description', String(length=255)), |
|
1021 - Column('user_id', String(length=255)), |
|
1022 - Column('project_id', String(length=255)), |
|
1023 + Column('name', String(length=db_string_length)), |
|
1024 + Column('description', String(length=db_string_length)), |
|
1025 + Column('user_id', String(length=db_string_length)), |
|
1026 + Column('project_id', String(length=db_string_length)), |
|
1027 Column('deleted', Integer), |
|
1028 - mysql_engine='InnoDB', |
|
1029 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1030 mysql_charset='utf8' |
|
1031 ) |
|
1032 |
|
1033 @@ -952,7 +961,7 @@ def upgrade(migrate_engine): |
|
1034 Column('from_port', Integer), |
|
1035 Column('to_port', Integer), |
|
1036 Column('cidr', Inet()), |
|
1037 - mysql_engine='InnoDB', |
|
1038 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1039 mysql_charset='utf8', |
|
1040 ) |
|
1041 |
|
1042 @@ -961,14 +970,14 @@ def upgrade(migrate_engine): |
|
1043 Column('updated_at', DateTime), |
|
1044 Column('deleted_at', DateTime), |
|
1045 Column('id', Integer, primary_key=True, nullable=False), |
|
1046 - Column('host', String(length=255)), |
|
1047 - Column('binary', String(length=255)), |
|
1048 - Column('topic', String(length=255)), |
|
1049 + Column('host', String(length=db_string_length)), |
|
1050 + Column('binary', String(length=db_string_length)), |
|
1051 + Column('topic', String(length=db_string_length)), |
|
1052 Column('report_count', Integer, nullable=False), |
|
1053 Column('disabled', Boolean), |
|
1054 Column('deleted', Integer), |
|
1055 - Column('disabled_reason', String(length=255)), |
|
1056 - mysql_engine='InnoDB', |
|
1057 + Column('disabled_reason', String(length=db_string_length)), |
|
1058 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1059 mysql_charset='utf8' |
|
1060 ) |
|
1061 |
|
1062 @@ -979,7 +988,7 @@ def upgrade(migrate_engine): |
|
1063 Column('id', Integer, primary_key=True, nullable=False), |
|
1064 Column('uuid', String(length=36), nullable=False), |
|
1065 Column('deleted', Integer), |
|
1066 - mysql_engine='InnoDB', |
|
1067 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1068 mysql_charset='utf8' |
|
1069 ) |
|
1070 |
|
1071 @@ -989,16 +998,16 @@ def upgrade(migrate_engine): |
|
1072 Column('deleted_at', DateTime), |
|
1073 Column('id', String(length=36), primary_key=True, nullable=False), |
|
1074 Column('volume_id', String(length=36), nullable=False), |
|
1075 - Column('user_id', String(length=255)), |
|
1076 - Column('project_id', String(length=255)), |
|
1077 - Column('status', String(length=255)), |
|
1078 - Column('progress', String(length=255)), |
|
1079 + Column('user_id', String(length=db_string_length)), |
|
1080 + Column('project_id', String(length=db_string_length)), |
|
1081 + Column('status', String(length=db_string_length)), |
|
1082 + Column('progress', String(length=db_string_length)), |
|
1083 Column('volume_size', Integer), |
|
1084 Column('scheduled_at', DateTime), |
|
1085 - Column('display_name', String(length=255)), |
|
1086 - Column('display_description', String(length=255)), |
|
1087 + Column('display_name', String(length=db_string_length)), |
|
1088 + Column('display_description', String(length=db_string_length)), |
|
1089 Column('deleted', String(length=36)), |
|
1090 - mysql_engine='InnoDB', |
|
1091 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1092 mysql_charset='utf8' |
|
1093 ) |
|
1094 |
|
1095 @@ -1007,16 +1016,16 @@ def upgrade(migrate_engine): |
|
1096 Column('updated_at', DateTime), |
|
1097 Column('deleted_at', DateTime), |
|
1098 Column('id', Integer, primary_key=True, nullable=False), |
|
1099 - Column('task_name', String(length=255), nullable=False), |
|
1100 - Column('state', String(length=255), nullable=False), |
|
1101 - Column('host', String(length=255), nullable=False), |
|
1102 + Column('task_name', String(length=db_string_length), nullable=False), |
|
1103 + Column('state', String(length=db_string_length), nullable=False), |
|
1104 + Column('host', String(length=db_string_length), nullable=False), |
|
1105 Column('period_beginning', DateTime, nullable=False), |
|
1106 Column('period_ending', DateTime, nullable=False), |
|
1107 - Column('message', String(length=255), nullable=False), |
|
1108 + Column('message', String(length=db_string_length), nullable=False), |
|
1109 Column('task_items', Integer), |
|
1110 Column('errors', Integer), |
|
1111 Column('deleted', Integer), |
|
1112 - mysql_engine='InnoDB', |
|
1113 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1114 mysql_charset='utf8' |
|
1115 ) |
|
1116 |
|
1117 @@ -1025,12 +1034,12 @@ def upgrade(migrate_engine): |
|
1118 Column('updated_at', DateTime), |
|
1119 Column('deleted_at', DateTime), |
|
1120 Column('id', Integer, primary_key=True, nullable=False), |
|
1121 - Column('address', String(length=255)), |
|
1122 + Column('address', String(length=db_string_length)), |
|
1123 Column('network_id', Integer), |
|
1124 Column('uuid', String(length=36)), |
|
1125 Column('instance_uuid', String(length=36), nullable=True), |
|
1126 Column('deleted', Integer), |
|
1127 - mysql_engine='InnoDB', |
|
1128 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1129 mysql_charset='utf8' |
|
1130 ) |
|
1131 |
|
1132 @@ -1041,7 +1050,7 @@ def upgrade(migrate_engine): |
|
1133 Column('id', Integer, primary_key=True, nullable=False), |
|
1134 Column('uuid', String(length=36), nullable=False), |
|
1135 Column('deleted', Integer), |
|
1136 - mysql_engine='InnoDB', |
|
1137 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1138 mysql_charset='utf8' |
|
1139 ) |
|
1140 |
|
1141 @@ -1050,20 +1059,20 @@ def upgrade(migrate_engine): |
|
1142 Column('updated_at', DateTime), |
|
1143 Column('deleted_at', DateTime), |
|
1144 Column('id', String(length=36), primary_key=True, nullable=False), |
|
1145 - Column('ec2_id', String(length=255)), |
|
1146 - Column('user_id', String(length=255)), |
|
1147 - Column('project_id', String(length=255)), |
|
1148 - Column('host', String(length=255)), |
|
1149 + Column('ec2_id', String(length=db_string_length)), |
|
1150 + Column('user_id', String(length=db_string_length)), |
|
1151 + Column('project_id', String(length=db_string_length)), |
|
1152 + Column('host', String(length=db_string_length)), |
|
1153 Column('size', Integer), |
|
1154 - Column('availability_zone', String(length=255)), |
|
1155 - Column('mountpoint', String(length=255)), |
|
1156 - Column('status', String(length=255)), |
|
1157 - Column('attach_status', String(length=255)), |
|
1158 + Column('availability_zone', String(length=db_string_length)), |
|
1159 + Column('mountpoint', String(length=db_string_length)), |
|
1160 + Column('status', String(length=db_string_length)), |
|
1161 + Column('attach_status', String(length=db_string_length)), |
|
1162 Column('scheduled_at', DateTime), |
|
1163 Column('launched_at', DateTime), |
|
1164 Column('terminated_at', DateTime), |
|
1165 - Column('display_name', String(length=255)), |
|
1166 - Column('display_description', String(length=255)), |
|
1167 + Column('display_name', String(length=db_string_length)), |
|
1168 + Column('display_description', String(length=db_string_length)), |
|
1169 Column('provider_location', String(length=256)), |
|
1170 Column('provider_auth', String(length=256)), |
|
1171 Column('snapshot_id', String(length=36)), |
|
1172 @@ -1071,7 +1080,7 @@ def upgrade(migrate_engine): |
|
1173 Column('instance_uuid', String(length=36)), |
|
1174 Column('attach_time', DateTime), |
|
1175 Column('deleted', String(length=36)), |
|
1176 - mysql_engine='InnoDB', |
|
1177 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1178 mysql_charset='utf8' |
|
1179 ) |
|
1180 |
|
1181 @@ -1095,8 +1104,8 @@ def upgrade(migrate_engine): |
|
1182 Column("instance_uuid", String(length=36)), |
|
1183 Column("project_id", String(length=36)), |
|
1184 Column("user_id", String(length=36)), |
|
1185 - Column("availability_zone", String(length=255)), |
|
1186 - mysql_engine='InnoDB', |
|
1187 + Column("availability_zone", String(length=db_string_length)), |
|
1188 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1189 mysql_charset='utf8' |
|
1190 ) |
|
1191 |
|
1192 @@ -1223,15 +1232,21 @@ def upgrade(migrate_engine): |
|
1193 table=aggregate_hosts, |
|
1194 name=uc_name).create() |
|
1195 |
|
1196 - uc_name = 'uniq_aggregate_metadata0aggregate_id0key0deleted' |
|
1197 - UniqueConstraint('aggregate_id', 'key', 'deleted', |
|
1198 - table=aggregate_metadata, |
|
1199 - name=uc_name).create() |
|
1200 - |
|
1201 - uc_name = 'uniq_instance_type_extra_specs0instance_type_id0key0deleted' |
|
1202 - UniqueConstraint('instance_type_id', 'key', 'deleted', |
|
1203 - table=instance_type_extra_specs, |
|
1204 - name=uc_name).create() |
|
1205 + # Constraint does not work in MySQL Cluster, a.k.a NDB. |
|
1206 + # |
|
1207 + if CONF.database.mysql_storage_engine != "NDBCLUSTER": |
|
1208 + uc_name = 'uniq_aggregate_metadata0aggregate_id0key0deleted' |
|
1209 + UniqueConstraint('aggregate_id', 'key', 'deleted', |
|
1210 + table=aggregate_metadata, |
|
1211 + name=uc_name).create() |
|
1212 + |
|
1213 + # Constraint does not work in MySQL Cluster, a.k.a NDB. |
|
1214 + # |
|
1215 + if CONF.database.mysql_storage_engine != "NDBCLUSTER": |
|
1216 + uc_name = 'uniq_instance_type_extra_specs0instance_type_id0key0deleted' |
|
1217 + UniqueConstraint('instance_type_id', 'key', 'deleted', |
|
1218 + table=instance_type_extra_specs, |
|
1219 + name=uc_name).create() |
|
1220 |
|
1221 # created first (to preserve ordering for schema diffs) |
|
1222 mysql_pre_indexes = [ |
|
1223 --- nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/266_add_instance_tags.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
1224 +++ nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/266_add_instance_tags.py 2016-03-29 17:23:21.835566671 -0600 |
|
1225 @@ -12,6 +12,9 @@ |
|
1226 |
|
1227 import sqlalchemy as sa |
|
1228 |
|
1229 +from oslo_config import cfg |
|
1230 + |
|
1231 +CONF = cfg.CONF |
|
1232 |
|
1233 def upgrade(migrate_engine): |
|
1234 meta = sa.MetaData(bind=migrate_engine) |
|
1235 @@ -22,7 +25,7 @@ def upgrade(migrate_engine): |
|
1236 sa.Column('tag', sa.Unicode(80), primary_key=True, |
|
1237 nullable=False), |
|
1238 sa.Index('tags_tag_idx', 'tag'), |
|
1239 - mysql_engine='InnoDB', |
|
1240 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1241 mysql_charset='utf8') |
|
1242 tags.create() |
|
1243 |
|
1244 --- nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/233_add_stats_in_compute_nodes.py.orig 2016-03-29 17:22:24.000000000 -0600 |
|
1245 +++ nova-2015.1.2/nova/db/sqlalchemy/migrate_repo/versions/233_add_stats_in_compute_nodes.py 2016-03-29 17:23:21.835820531 -0600 |
|
1246 @@ -25,6 +25,9 @@ from sqlalchemy import String |
|
1247 from sqlalchemy import Table |
|
1248 from sqlalchemy import Text |
|
1249 |
|
1250 +from oslo_config import cfg |
|
1251 + |
|
1252 +CONF = cfg.CONF |
|
1253 |
|
1254 def upgrade(engine): |
|
1255 meta = MetaData() |
|
1256 @@ -73,7 +76,7 @@ def downgrade(engine): |
|
1257 index=True), |
|
1258 Index('compute_node_stats_node_id_and_deleted_idx', |
|
1259 'compute_node_id', 'deleted'), |
|
1260 - mysql_engine='InnoDB', |
|
1261 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1262 mysql_charset='utf8' |
|
1263 ) |
|
1264 table.create() |
|
1265 @@ -88,7 +91,7 @@ def downgrade(engine): |
|
1266 Column('key', String(255), nullable=False), |
|
1267 Column('value', String(255), nullable=True), |
|
1268 Column('compute_node_id', Integer), |
|
1269 - mysql_engine='InnoDB', |
|
1270 + mysql_engine=CONF.database.mysql_storage_engine, |
|
1271 mysql_charset='utf8' |
|
1272 ) |
|
1273 table.create() |
|