iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Nested transaction is inactive when embedding dashboard (#30699)

This commit is contained in:
Michael S. Molina 2024-10-24 13:08:55 -03:00 committed by GitHub
parent ee3befb9fc
commit c9ff09a418
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
superset/cachekeys/api.py
View File

@ -114,8 +114,8 @@ class CacheRestApi(BaseSupersetModelRestApi):
CacheKey.cache_key.in_(cache_keys) CacheKey.cache_key.in_(cache_keys)
) )
with db.session.begin_nested(): db.session.execute(delete_stmt)
db.session.execute(delete_stmt) db.session.commit() # pylint: disable=consider-using-transaction
stats_logger_manager.instance.gauge( stats_logger_manager.instance.gauge(
"invalidated_cache", len(cache_keys) "invalidated_cache", len(cache_keys)
@ -126,6 +126,7 @@ class CacheRestApi(BaseSupersetModelRestApi):
len(datasource_uids), len(datasource_uids),
) )
except SQLAlchemyError as ex: # pragma: no cover except SQLAlchemyError as ex: # pragma: no cover
db.session.rollback() # pylint: disable=consider-using-transaction
logger.error(ex, exc_info=True) logger.error(ex, exc_info=True)
return self.response_500(str(ex)) return self.response_500(str(ex))
return self.response(201) return self.response(201)

19
superset/dashboards/api.py
View File

@ -1125,9 +1125,11 @@ class DashboardRestApi(BaseSupersetModelRestApi):
logger.info("Triggering screenshot ASYNC") logger.info("Triggering screenshot ASYNC")
cache_dashboard_screenshot.delay( cache_dashboard_screenshot.delay(
username=get_current_user(), username=get_current_user(),
guest_token=g.user.guest_token guest_token=(
if get_current_user() and isinstance(g.user, GuestUser) g.user.guest_token
else None, if get_current_user() and isinstance(g.user, GuestUser)
else None
),
dashboard_id=dashboard.id, dashboard_id=dashboard.id,
dashboard_url=dashboard_url, dashboard_url=dashboard_url,
cache_key=cache_key, cache_key=cache_key,
@ -1595,15 +1597,16 @@ class DashboardRestApi(BaseSupersetModelRestApi):
try: try:
body = self.embedded_config_schema.load(request.json) body = self.embedded_config_schema.load(request.json)
with db.session.begin_nested(): embedded = EmbeddedDashboardDAO.upsert(
embedded = EmbeddedDashboardDAO.upsert( dashboard,
dashboard, body["allowed_domains"],
body["allowed_domains"], )
) db.session.commit() # pylint: disable=consider-using-transaction
result = self.embedded_response_schema.dump(embedded) result = self.embedded_response_schema.dump(embedded)
return self.response(200, result=result) return self.response(200, result=result)
except ValidationError as error: except ValidationError as error:
db.session.rollback() # pylint: disable=consider-using-transaction
return self.response_400(message=error.messages) return self.response_400(message=error.messages)
@expose("/<id_or_slug>/embedded", methods=("DELETE",)) @expose("/<id_or_slug>/embedded", methods=("DELETE",))