Code Monkey home page Code Monkey logo

Comments (16)

madolson avatar madolson commented on August 26, 2024 2

@SoulPancake Yeah. If you can, submit a PR cherry-picking the commits from unstable into the 7.2 branch. Thanks! I did review the list of changes from 7.2.5, and it looked like they were all commits from before the license change.

from valkey.

hwware avatar hwware commented on August 26, 2024 2

@SoulPancake Yeah. If you can, submit a PR cherry-picking the commits from unstable into the 7.2 branch. Thanks! I did review the list of changes from 7.2.5, and it looked like they were all commits from before the license change.

License changes from redis 7.4, so now cherry-picking is safe

from valkey.

enjoy-binbin avatar enjoy-binbin commented on August 26, 2024 1

I think for safety reasons (or for better conflict resolution), the release branch should be arranged by core-team members since in think we won't review it very carefully sometimes.

from valkey.

SoulPancake avatar SoulPancake commented on August 26, 2024 1

These were the commits
b3aaa0a
1f00c95
492021d
5fdaa53
763827c
da727ad

However, I guess there were some refactoring in valkey unstable on top this that also needed to be included

from valkey.

SoulPancake avatar SoulPancake commented on August 26, 2024 1

think for safety reasons (or for better conflict resolution), the release branch should be arranged by core-team members since in think we won't review it very carefully sometimes.

I agree with this, It's trickier than I thought to attempt the conflict resolution or choose which further commits to include
I am closing #567

from valkey.

hwware avatar hwware commented on August 26, 2024 1

I already checked our Valkey commit history, the 6 commits in Redis 7.2.5 already are included, this is why I close this issue.
Below is the detail PRs:

A single shard cluster leaves failed replicas in CLUSTER SLOTS instead of removing them (#12824)
b3aaa0a
Crash in LSET command when replacing small items and exceeding 4GB (#12955)
1f00c95
Blocking commands timeout is reset due to re-processing command (#13004)
492021d
Conversion of numbers in Lua args to redis args can fail. Bug introduced in 7.2.0 (#13115)
5fdaa53
redis-cli: --count (for --scan, --bigkeys, etc) was ignored unless --pattern was also used (#13092)
763827c
redis-check-aof: incorrectly considering data in manifest format as MP-AOF (#12958)
da727ad

Because all these PRs are in the Redis 7.2.5, they are safe in our Valkey repo.

from valkey.

SoulPancake avatar SoulPancake commented on August 26, 2024

@mkauf @madolson @zuiderkwast Folks, Can I take this up

from valkey.

madolson avatar madolson commented on August 26, 2024

Btw, we should have all the commits in our development tree, so you should ideally find the relevant commits from our unstable branch and cherry-pick those.

from valkey.

zuiderkwast avatar zuiderkwast commented on August 26, 2024

@enjoy-binbin This makes sense.

But to help prepare this, we first need to find the commits that we need to cherry pick. They can be posted as comments in this issue. That could save some time.

from valkey.

hwware avatar hwware commented on August 26, 2024

Today I check the commit in Reds 7.2.5, I think all code changes already are included in our unstable branch, please other core team member to double check Thanks @valkey-io/core-team

from valkey.

hwware avatar hwware commented on August 26, 2024

To close it because we have these parts code already

from valkey.

zuiderkwast avatar zuiderkwast commented on August 26, 2024

The plan is to cherry-pick the commits to our 7.2 branch and make a patch release.

from valkey.

madolson avatar madolson commented on August 26, 2024

Btw. I still think this overall approach makes sense. In Redis, one of the maintainers did all the backporting, but ideally we should do the backport with a PR.

from valkey.

murphyjacob4 avatar murphyjacob4 commented on August 26, 2024

@zuiderkwast @madolson I can send the backport PR

from valkey.

LiiNen avatar LiiNen commented on August 26, 2024

some of commits referred in #624 are already included.
(as i know) fork of valkey is created since redis' license changes.
so only we need is to cherrypick commits after changing will be fine.

from valkey.

LiiNen avatar LiiNen commented on August 26, 2024

btw, just wondering..
I have not yet checked whether exists or not, but,
if some commits approved in redis 7.4 and this commit has been applied also in 7.2 as backport, then can we cherrypick it?

from valkey.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.