[PR #19651] [MERGED] 19644 Make atomic use correct database instead of default #15693

New Issue

adam · 2025-12-30T00:23:26+01:00

adam commented

2025-12-30 00:23:26 +01:00

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/19651
Author: @arthanson
Created: 6/5/2025
Status: ✅ Merged
Merged: 6/25/2025
Merged by: @jeremystretch

Base: main ← Head: 19644-atomic-branching

📝 Commits (7)

3cd0a93 19644 set atomic transactions to appropriate database
caaed88 19644 set atomic transactions for Job Script run
78f1e7d 19644 set atomic transactions to appropriate database
9e2248c 19644 set atomic transactions to appropriate database
ed9625d Merge branch 'main' into 19644-atomic-branching
100f08d 19644 fix review comments
3b4ca5e 19644 fix review comments

📊 Changes

11 files changed (+45 additions, -42 deletions)

View changed files

📝 netbox/circuits/views.py (+2 -2)
📝 netbox/dcim/utils.py (+2 -2)
📝 netbox/dcim/views.py (+3 -3)
📝 netbox/extras/jobs.py (+3 -0)
📝 netbox/ipam/api/views.py (+2 -2)
📝 netbox/netbox/api/viewsets/__init__.py (+3 -3)
📝 netbox/netbox/api/viewsets/mixins.py (+16 -16)
📝 netbox/netbox/views/generic/bulk_views.py (+7 -7)
📝 netbox/netbox/views/generic/feature_views.py (+2 -2)
📝 netbox/netbox/views/generic/object_views.py (+2 -2)
📝 netbox/virtualization/views.py (+3 -3)

📄 Description

Fixes: #19644

transaction.atomic will go to the default database, this is normally not a problem but if multiple schemas are databases are configured using a router (like with the branching plugin) this will be incorrect as the atomic wrapper should be done on the database the changes are made on.

In jobs.py the script running code is a special case as the script could potentially modify models in multiple schemas so both the default database needs a wrapper and any model specific ones - arbitrarily used device as the model to key off, but any ChangeLogged model could be used.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netbox-community/netbox/pull/19651 **Author:** [@arthanson](https://github.com/arthanson) **Created:** 6/5/2025 **Status:** ✅ Merged **Merged:** 6/25/2025 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `main` ← **Head:** `19644-atomic-branching` --- ### 📝 Commits (7) - [`3cd0a93`](https://github.com/netbox-community/netbox/commit/3cd0a930dcda09d933c2b9c7cfb4a8a32115b2fb) 19644 set atomic transactions to appropriate database - [`caaed88`](https://github.com/netbox-community/netbox/commit/caaed888f73c7e7342be3868d929a8c628c12c0c) 19644 set atomic transactions for Job Script run - [`78f1e7d`](https://github.com/netbox-community/netbox/commit/78f1e7d6180c0cec9fee471ce2e0cba9736d745c) 19644 set atomic transactions to appropriate database - [`9e2248c`](https://github.com/netbox-community/netbox/commit/9e2248cbf15dcf2ef2f42e12f20a3f2adfcdb4aa) 19644 set atomic transactions to appropriate database - [`ed9625d`](https://github.com/netbox-community/netbox/commit/ed9625d2dd70d464af04ff18210ac987be43d8ac) Merge branch 'main' into 19644-atomic-branching - [`100f08d`](https://github.com/netbox-community/netbox/commit/100f08d04d742d00f811ab69ef8ebbdfb6d3a403) 19644 fix review comments - [`3b4ca5e`](https://github.com/netbox-community/netbox/commit/3b4ca5ee482b0fcb33acd9cbd2bbfcb4c21fa790) 19644 fix review comments ### 📊 Changes **11 files changed** (+45 additions, -42 deletions) <details> <summary>View changed files</summary> 📝 `netbox/circuits/views.py` (+2 -2) 📝 `netbox/dcim/utils.py` (+2 -2) 📝 `netbox/dcim/views.py` (+3 -3) 📝 `netbox/extras/jobs.py` (+3 -0) 📝 `netbox/ipam/api/views.py` (+2 -2) 📝 `netbox/netbox/api/viewsets/__init__.py` (+3 -3) 📝 `netbox/netbox/api/viewsets/mixins.py` (+16 -16) 📝 `netbox/netbox/views/generic/bulk_views.py` (+7 -7) 📝 `netbox/netbox/views/generic/feature_views.py` (+2 -2) 📝 `netbox/netbox/views/generic/object_views.py` (+2 -2) 📝 `netbox/virtualization/views.py` (+3 -3) </details> ### 📄 Description ### Fixes: #19644 transaction.atomic will go to the default database, this is normally not a problem but if multiple schemas are databases are configured using a router (like with the branching plugin) this will be incorrect as the atomic wrapper should be done on the database the changes are made on. In jobs.py the script running code is a special case as the script could potentially modify models in multiple schemas so both the default database needs a wrapper and any model specific ones - arbitrarily used device as the model to key off, but any ChangeLogged model could be used. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

adam added the pull-request label 2025-12-30 00:23:26 +01:00

adam closed this issue

2025-12-30 00:23:27 +01:00

Sign in to join this conversation.

Branches Tags

main

update-changelog-comments-docs

feature-removal-issue-type

20911-dropdown

20239-plugin-menu-classes-mutable-state

21097-graphql-id-lookups

feature

fix_module_substitution

20923-dcim-templates

20044-elevation-stuck-lightmode

feature-ip-prefix-link

v4.5-beta1-release

20068-import-moduletype-attrs

20766-fix-german-translation-code-literals

20378-del-script

7604-filter-modifiers-v3

circuit-swap

12318-case-insensitive-uniqueness

20637-improve-device-q-filter

20660-script-load

19724-graphql

20614-update-ruff

14884-script

02496-max-page

19720-macaddress-interface-generic-relation

19408-circuit-terminations-export-templates

20203-openapi-check

fix-19669-api-image-download

7604-filter-modifiers

19275-fixes-interface-bulk-edit

fix-17794-get_field_value_return_list

11507-show-aggregate-and-rir-on-api

9583-add_column_specific_search_field_to_tables

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/netbox#15693