Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Oct 14, 2024
Merged

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

merged 1 commit into from
Oct 14, 2024

Conversation

solracsf
Copy link
Member

@solracsf solracsf commented Oct 14, 2024

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
Member Author

/backport to stable30

@solracsf
Copy link
Member Author

/backport to stable29

@solracsf
Copy link
Member Author

/backport to stable28

@solracsf solracsf self-assigned this Oct 14, 2024
Copy link
Contributor

@kesselb kesselb left a comment

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.

Copy link
Member

@provokateurin provokateurin left a comment

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 merged commit ef532fe into master Oct 14, 2024
177 checks passed
@solracsf solracsf deleted the mixedSetTTL branch October 14, 2024 13:43
Copy link

backportbot bot commented Oct 14, 2024

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 free to 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