Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix upgrade of user_ldap when oc_group_members contains duplicated uids#42576

Merged
come-nc merged 1 commit intomasterfrom
fix/fix-ldap-upgrade-on-duplicate-membership
Jan 4, 2024
Merged

Fix upgrade of user_ldap when oc_group_members contains duplicated uids#42576
come-nc merged 1 commit intomasterfrom
fix/fix-ldap-upgrade-on-duplicate-membership

Conversation

@come-nc
Copy link
Contributor

@come-nc come-nc commented Jan 4, 2024 •
edited
Loading

Summary

When upgrading to 28, if oc_group_members contains duplicated uids, migration was failing on unicity constraint.
Also ignore DB errors for this migration step, as people which failed the upgrade before will have a non-empty table in oc_group_membership, and there is no data loss in this case since membership information is in the LDAP and will be fetched by the background job on the next run if incorrect or incomplete.

Checklist

@come-nc come-nc added the 3. to review Waiting for reviews label Jan 4, 2024
@come-nc come-nc added this to the Nextcloud 29 milestone Jan 4, 2024
@come-nc come-nc self-assigned this Jan 4, 2024
@come-nc
Copy link
Contributor Author

come-nc commented Jan 4, 2024

/backport to stable28

@come-nc come-nc requested review from Altahrim and artonge January 4, 2024 10:16
@come-nc come-nc mentioned this pull request Jan 4, 2024
Closed
8 tasks
@come-nc come-nc force-pushed the fix/fix-ldap-upgrade-on-duplicate-membership branch from 654f862 to 6d0f0fc Compare January 4, 2024 10:51
@ArtificialOwl
Copy link
Member

ArtificialOwl commented Jan 4, 2024

should we check on $e->getReason() === DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION ?

@come-nc
Copy link
Contributor Author

come-nc commented Jan 4, 2024

should we check on $e->getReason() === DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION ?

No, see comment, even if it fails for another reason it’s better to ignore and keep going, the background job can fix the data later.

@come-nc come-nc merged commit 2ab852e into master Jan 4, 2024
@come-nc come-nc deleted the fix/fix-ldap-upgrade-on-duplicate-membership branch January 4, 2024 13:17
@schneidr
Copy link

schneidr commented Jan 4, 2024 •
edited
Loading

Does the NextCloud 29 Milestone tag mean this will only be fixed in version 29, and everybody who wants to update from 27 to 28 and uses LDAP authentication needs to manually perform the suggested workaround?

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Jan 4, 2024
Merged
@come-nc
Copy link
Contributor Author

come-nc commented Jan 4, 2024

Does the NextCloud 29 Milestone tag mean this will only be fixed in version 29, and everybody who wants to update from 27 to 28 needs to manually perform the suggested workaround?

No, it means this PR targets master branch which will be 29.
It will be backported to stable28 (in #42583 ) and included in 28.0.2.
And please capitalize as Nextcloud, not NextCloud.

@rpelissi rpelissi mentioned this pull request Feb 9, 2024
Open
8 tasks
@joshtrichards joshtrichards mentioned this pull request Feb 15, 2024
Closed
8 tasks
@blizzz blizzz mentioned this pull request Mar 5, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ArtificialOwl ArtificialOwl ArtificialOwl approved these changes

@artonge artonge artonge approved these changes

@Altahrim Altahrim Awaiting requested review from Altahrim

Assignees

@come-nc come-nc

Labels

3. to review Waiting for reviews bug feature: ldap

Projects

None yet

Milestone

Nextcloud 29

Development

Successfully merging this pull request may close these issues.

[Bug]: Upgrade fails - app user_ldap update failed SQLSTATE[23000]: Integrity constraint violation

4 participants

@come-nc @ArtificialOwl @schneidr @artonge