Skip to content

fix(locking): Accept mixed as value on setTTL - #48689

Merged
solracsf merged 1 commit into
masterfrom
mixedSetTTL
Oct 14, 2024
Merged

fix(locking): Accept mixed as value on setTTL#48689
solracsf merged 1 commit into
masterfrom
mixedSetTTL

Conversation

@solracsf

@solracsfsolracsf commented Oct 14, 2024

Copy link
Copy Markdown
Member

Summary

Fix:

OC\Lock\MemcacheLockingProvider::setTTL(): Argument #3 ($compare) must be of type ?int, string given

Underlying compareSetTTL also accepts mixed values.

Checklist

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
@solracsf

Copy link
Copy Markdown
MemberAuthor

/backport to stable30

@solracsf

Copy link
Copy Markdown
MemberAuthor

/backport to stable29

@solracsf

Copy link
Copy Markdown
MemberAuthor

/backport to stable28

@solracsfsolracsf self-assigned this Oct 14, 2024

@kesselbkesselb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you 👍

I've spotted that error some days ago in a log.
The fix looks okay to me, but I'm not familiar enough with the locking code to approve.

@provokateurinprovokateurin left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably copy-pasta from the ttl parameter 👍

@solracsf
solracsf enabled auto-merge October 14, 2024 12:38
@solracsf
solracsf merged commit ef532fe into masterOct 14, 2024
@solracsf
solracsf deleted the mixedSetTTL branch October 14, 2024 13:43
@backportbot

Copy link
Copy Markdown

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28
# Create the new backport branch
git checkout -b backport/48689/stable28
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts, resolve them
git cherry-pick 8f7784bd
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/48689/stable28

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@solracsf@kesselb@provokateurin@come-nc