Skip to content

Synchronise 2024.1 with upstream #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 12, 2025
Merged

Synchronise 2024.1 with upstream #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c1b660
Fix doc bug
Dec 13, 2024
6925177
Merge "Fix doc bug" into stable/2024.1
Apr 30, 2025
028de8e
Fix broken metadata function calls
tobias-urdin Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/source/admin/db.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ migrations:
used to do the upgrade to Ocata, is
`ocata01_add_visibility_remove_is_public.py`_.

.. _`current directory`: https://opendev.org/openstack/glance/src/branch/stable/ocata/glance/db/sqlalchemy/migrate_repo/versions
.. _`045_add_visibility.py`: https://opendev.org/openstack/glance/src/branch/stable/ocata/glance/db/sqlalchemy/migrate_repo/versions/045_add_visibility.py
.. _`ocata01_add_visibility_remove_is_public.py`: https://opendev.org/openstack/glance/src/branch/stable/ocata/glance/db/sqlalchemy/alembic_migrations/versions/ocata01_add_visibility_remove_is_public.py
.. _`current directory`: https://opendev.org/openstack/glance/src/tag/ocata-em/glance/db/sqlalchemy/migrate_repo/versions
.. _`045_add_visibility.py`: https://opendev.org/openstack/glance/src/tag/ocata-em/glance/db/sqlalchemy/migrate_repo/versions/045_add_visibility.py
.. _`ocata01_add_visibility_remove_is_public.py`: https://opendev.org/openstack/glance/src/tag/ocata-em/glance/db/sqlalchemy/alembic_migrations/versions/ocata01_add_visibility_remove_is_public.py

Sync the Database
-----------------
Expand Down
14 changes: 7 additions & 7 deletions glance/db/sqlalchemy/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def _populate_metadata(meta, conn, metadata_path=None, merge=False,

if db_namespace and overwrite:
LOG.info(_LI("Overwriting namespace %s"), values['namespace'])
_clear_namespace_metadata(meta, db_namespace[0])
_clear_namespace_metadata(meta, conn, db_namespace[0])
db_namespace = None

if not db_namespace:
Expand All @@ -303,7 +303,7 @@ def _populate_metadata(meta, conn, metadata_path=None, merge=False,
continue
elif prefer_new:
values.update({'updated_at': timeutils.utcnow()})
_update_data_in_db(namespaces_table, values,
_update_data_in_db(conn, namespaces_table, values,
namespaces_table.c.id, db_namespace[0])

namespace_id = db_namespace[0]
Expand All @@ -321,7 +321,7 @@ def _populate_metadata(meta, conn, metadata_path=None, merge=False,
meta, conn, resource_type['name'])
elif prefer_new:
val = {'updated_at': timeutils.utcnow()}
_update_data_in_db(resource_types_table, val,
_update_data_in_db(conn, resource_types_table, val,
resource_types_table.c.id, rt_id)

values = {
Expand All @@ -338,7 +338,7 @@ def _populate_metadata(meta, conn, metadata_path=None, merge=False,
_insert_data_to_db(conn, namespace_rt_table, values)
elif prefer_new:
values.update({'updated_at': timeutils.utcnow()})
_update_rt_association(namespace_rt_table, values,
_update_rt_association(conn, namespace_rt_table, values,
rt_id, namespace_id)

for name, schema in metadata.get('properties', {}).items():
Expand All @@ -355,7 +355,7 @@ def _populate_metadata(meta, conn, metadata_path=None, merge=False,
_insert_data_to_db(conn, properties_table, values)
elif prefer_new:
values.update({'updated_at': timeutils.utcnow()})
_update_data_in_db(properties_table, values,
_update_data_in_db(conn, properties_table, values,
properties_table.c.id, property_id)

for object in metadata.get('objects', []):
Expand All @@ -373,7 +373,7 @@ def _populate_metadata(meta, conn, metadata_path=None, merge=False,
_insert_data_to_db(conn, objects_table, values)
elif prefer_new:
values.update({'updated_at': timeutils.utcnow()})
_update_data_in_db(objects_table, values,
_update_data_in_db(conn, objects_table, values,
objects_table.c.id, object_id)

for tag in metadata.get('tags', []):
Expand All @@ -388,7 +388,7 @@ def _populate_metadata(meta, conn, metadata_path=None, merge=False,
_insert_data_to_db(conn, tags_table, values)
elif prefer_new:
values.update({'updated_at': timeutils.utcnow()})
_update_data_in_db(tags_table, values,
_update_data_in_db(conn, tags_table, values,
tags_table.c.id, tag_id)

LOG.info(_LI("File %s loaded to database."), file)
Expand Down
Loading