openstack
/
heat
Code Issues Proposed changes

Revert "Make sure all "updated_at" fields store fractional seconds" 

This reverts commit 3b2d14ad99.

This has been causing heat to break for a number of users running
mariadb 10 - this may be a dependency issue, but reverting this
until we work out why things are broken seems the safest course
of action.

(Pulled from gate, can't pass until Neutron netaddr fix is landed in kilo) -- again

Change-Id: If2b41f1c07803090ea7dd8591985a3f305404c2a
Partial-Bug: #1488779
This commit is contained in:
Steven Hardy 2015-08-28 11:29:21 +01:00 committed by Armando Migliaccio
parent f8f4307f66
commit 90abc6a2f0
2 changed files with 1 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
heat/db/sqlalchemy/migrate_repo/versions/065_update_at_fsp.py
View File

@ -1,43 +0,0 @@
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
import sqlalchemy
from sqlalchemy import dialects
from heat.common.i18n import _LW
LOG = logging.getLogger(__name__)
def upgrade(migrate_engine):
meta = sqlalchemy.MetaData(bind=migrate_engine)
if migrate_engine.name == 'mysql':
if migrate_engine.dialect.server_version_info < (5, 6, 4):
LOG.warn(_LW('Migration 065 could not be applied as the MySQl '
'server version is below 5.6.4. Once the server has '
'been upgraded this migration will need to be '
'manually applied.'))
return
# Note that this feature was only added in 5.6.4
# see: http://docs.sqlalchemy.org/en/rel_0_9/dialects/mysql.html
for tn in ['raw_template', 'user_creds', 'stack',
'resource', 'resource_data', 'event',
'watch_rule', 'watch_data', 'snapshot',
'software_deployment', 'software_config',
'sync_point', 'service', 'stack_tag']:
table = sqlalchemy.Table(tn, meta, autoload=True)
# Use the fsp parameter (fractional seconds parameter) to allow
# subsecond timestamps.
table.c.updated_at.alter(type=dialects.mysql.DATETIME(fsp=6))
table.c.created_at.alter(type=dialects.mysql.DATETIME(fsp=6))

31
heat/tests/db/test_migrations.py
View File

@ -31,7 +31,6 @@ from oslo_db.sqlalchemy import utils
from oslo_serialization import jsonutils
import six
import sqlalchemy
from sqlalchemy import dialects
import testtools
from heat.db.sqlalchemy import migrate_repo
@ -623,35 +622,7 @@ class HeatMigrationsCheckers(test_migrations.WalkVersionsMixin,
class TestHeatMigrationsMySQL(HeatMigrationsCheckers,
test_base.MySQLOpportunisticTestCase):
def _check_065(self, engine, data):
server_ver = engine.dialect.server_version_info
if server_ver < (5, 6, 4):
self.skip('MySQL server version too old %s' %
six.text_type(server_ver))
for tab_name in ['raw_template', 'user_creds', 'stack',
'resource', 'resource_data', 'event',
'watch_rule', 'watch_data', 'snapshot',
'software_deployment', 'software_config',
'sync_point', 'service', 'stack_tag']:
self.assertColumnType(engine, tab_name, 'updated_at',
dialects.mysql.DATETIME)
self.assertColumnType(engine, tab_name, 'created_at',
dialects.mysql.DATETIME)
# test on one table that we can write and read a subsecond
# datetime.
test_dt = datetime.datetime.now()
if test_dt.microsecond == 0:
test_dt.microsecond = 814673
raw_table = utils.get_table(engine, 'raw_template')
templ = [dict(id=15, template='{}', files='{}',
updated_at=test_dt)]
engine.execute(raw_table.insert(), templ)
temps_in_db = list(raw_table.select().
where(raw_table.c.id == '15').execute())
self.assertEqual(1, len(temps_in_db))
self.assertEqual(test_dt, temps_in_db[0].updated_at)
pass
class TestHeatMigrationsPostgreSQL(HeatMigrationsCheckers,