Skip to content

fix:SETEX replication does not work#3122

Closed
YuCai18 wants to merge 1 commit intoOpenAtomFoundation:unstablefrom
YuCai18:hotfix3.5/setex
Closed

fix:SETEX replication does not work#3122
YuCai18 wants to merge 1 commit intoOpenAtomFoundation:unstablefrom
YuCai18:hotfix3.5/setex

Conversation

@YuCai18
Copy link
Copy Markdown
Collaborator

@YuCai18 YuCai18 commented Jul 9, 2025

修复了pika4.0中setex在主从上不同步的bug #3117

修改的代码部分

1.命令名称错误:

修改了SetexCmd::ToRedisProtocol()和PsetexCmd::ToRedisProtocol()方法。原代码中,SetexCmd::ToRedisProtocol()方法生成的是pksetexat命令,而不是标准的setex命令。同样,PsetexCmd::ToRedisProtocol()也生成了错误的命令名称。在主从复制过程中,主节点会将命令转换为二进制日志(binlog)发送给从节点,所以从节点无法正确识别和执行这些非标准命令。

2.过期时间计算错误:

原代码中计算过期时间使用了time(nullptr) + ttl_sec_(对于SETEX)和pstd::NowMillis() + ttl_millsec(对于PSETEX)。这意味着主节点计算的是"当前时间+过期秒数"作为绝对过期时间点。当从节点接收到这个命令时,它会直接使用这个绝对时间,而不是重新计算。由于主从之间可能存在时间差或者命令传输延迟,这会导致从节点上的实际过期时间与主节点不一致。

修改后的运行截图

image-20250709201539889-1752063341461-4

image-20250709201845060-1752063526769-6

Summary by CodeRabbit

  • Bug Fixes
    • Improved accuracy and consistency of expiration timestamps for key expiration commands. Expiration times are now correctly represented in seconds in protocol outputs.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Jul 9, 2025

"""

Walkthrough

The changes improve expiration timestamp handling in key expiration and set-with-expiration commands by explicitly using 64-bit integer types and converting between milliseconds and seconds as needed. This ensures consistent, overflow-safe timestamp calculations and Redis protocol output.

Changes

File(s) Change Summary
src/pika_kv.cc Modified expiration timestamp calculations in SetexCmd::ToRedisProtocol(), PsetexCmd::ToRedisProtocol(), and PKSetexAtCmd::Do() for explicit 64-bit integer usage and correct unit conversions between milliseconds and seconds.

Estimated code review effort

2 (~20 minutes)

Suggested labels

4.0.0

Suggested reviewers

  • wangshao1
  • AlexStocks

Poem

🐇 Hopping through time, with numbers so neat,
Expiry now safe, no overflow to meet.
Milliseconds dance, then seconds take flight,
Commands run smoother, just right day and night.
Code bunnies cheer, with timestamps aligned,
In Pika’s swift world, all bugs left behind!
⏳✨🐰
"""


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 1513cf9 and 97c2754.

📒 Files selected for processing (1)
  • src/pika_kv.cc (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/pika_kv.cc
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (4)
  • GitHub Check: build_on_ubuntu
  • GitHub Check: build_on_macos
  • GitHub Check: Analyze (go)
  • GitHub Check: build_on_centos
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions Bot added ☢️ Bug Something isn't working 📒 Documentation Improvements or additions to documentation labels Jul 9, 2025
@YuCai18 YuCai18 changed the base branch from 3.5 to 4.0 July 9, 2025 13:03
@YuCai18 YuCai18 changed the base branch from 4.0 to unstable July 10, 2025 09:15
Comment thread src/pika_kv.cc Outdated
RedisAppendLenUint64(content, pksetexat_cmd.size(), "$");
RedisAppendContent(content, pksetexat_cmd);
// to setex cmd
std::string setex_cmd("setex");
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

这里不能直接这样修改,因为setex设置过期时间的方式是将当前机器的时间加上+TTL, 而 pksetexat 命令设置过期时间的方式是设置绝对的过期时间戳,由于每个机器上机器时钟可能不一致,所以理应是采用第二种方式

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

done

Comment thread src/pika_kv.cc Outdated
RedisAppendLenUint64(content, pksetexat_cmd.size(), "$");
RedisAppendContent(content, pksetexat_cmd);
// to psetex cmd
std::string psetex_cmd("psetex");
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

为什么psetex这里也需要改动,我记得issue提到的是setex命令有问题

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

确实,这里还原了,done

Comment thread src/pika_kv.cc Outdated
// time_stamp
char buf[100];
auto time_stamp = pstd::NowMillis() + ttl_millsec;
auto time_stamp = ttl_millsec;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

这里的pstd::NowMillis()会不会有问题,这个返回值我记得是毫秒的单位

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

这里没有问题,因为查看pika_kv.h代码可以发现pksetexat 期望的 第 2 个参数的秒级,它在里面会/1000,所以这里要用毫秒。

@YuCai18
Copy link
Copy Markdown
Collaborator Author

YuCai18 commented Jul 21, 2025

done @Mixficsol

@Issues-translate-bot
Copy link
Copy Markdown

Bot detected the issue body's language is not English, translate it automatically.


done @Mixficsol

@YuCai18 YuCai18 closed this Jul 22, 2025
@YuCai18 YuCai18 deleted the hotfix3.5/setex branch July 22, 2025 01:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

☢️ Bug Something isn't working 📒 Documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants