Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos.core
Commits
eb5d1265
Commit
eb5d1265
authored
Dec 01, 2023
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_upgrader: try to reduce conflict
parent
d23c3231
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep3.py
...ader/Base_triggerFullSiteMigrationToVirtualMasterStep3.py
+4
-0
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Project_checkSiteMigrationCreateRemoteNode.py
...os_upgrader/Project_checkSiteMigrationCreateRemoteNode.py
+11
-3
No files found.
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Base_triggerFullSiteMigrationToVirtualMasterStep3.py
View file @
eb5d1265
...
...
@@ -37,6 +37,10 @@ portal.portal_catalog.searchAndActivate(
method_kw
=
{
'tag'
:
tag
},
activate_kw
=
{
'tag'
:
tag
,
'priority'
:
1
},
# Go slowly, because it generate DB conflicts
packet_size
=
1
,
activity_count
=
1
,
portal_type
=
"Instance Tree"
,
**
migrated_select_dict
...
...
master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/Project_checkSiteMigrationCreateRemoteNode.py
View file @
eb5d1265
...
...
@@ -56,6 +56,14 @@ if remote_node is None:
# XXX Then, migrate other documents linked to the virtual master
for
relative_url_to_migrate
in
relative_url_to_migrate_list
:
object_to_migrate
=
portal
.
restrictedTraverse
(
relative_url_to_migrate
)
object_to_migrate
.
activate
(
**
activate_kw
).
Instance_activateMigrationToRemoteProject
(
remote_node
.
getRelativeUrl
())
portal
.
portal_catalog
.
searchAndActivate
(
method_id
=
'Instance_activateMigrationToRemoteProject'
,
method_args
=
[
remote_node
.
getRelativeUrl
()],
activate_kw
=
activate_kw
,
# Go slowly, because it generate DB conflicts
packet_size
=
1
,
activity_count
=
1
,
relative_url
=
relative_url_to_migrate_list
,
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment