fix: fix replication on pika node recovering #3038

wangshao1 · 2025-03-07T06:15:39Z

修复pika slave节点恢复之后，dashboard没有更新元信息的问题。
修复info replication master ip:port 解析失败的问题。

coderabbitai · 2025-03-07T06:15:48Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

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.
- Generate unit testing code for this file.
- 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 generate unit testing code for this file.
- @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 generate unit testing code.
- @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.

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 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.

Mixficsol · 2025-03-07T07:04:35Z

codis/pkg/topom/topom_group.go


-		err = s.tryFixReplicationRelationship(group, state.Server, state, masterOffGroupLen)
+		err = s.tryFixReplicationRelationship(group, state.Server, state)
 		if err != nil {


这一个 tryFixReplicationRelationship 处于一个 for 循环中，下面第 356 行有通知 Proxy 变更元信息的步骤，这里是不是应该等所有的 state 都处理完之后再去变更元信息

Mixficsol · 2025-03-07T07:38:29Z

codis/pkg/topom/topom_group.go

+			// current server is slave, execute the command `slaveof [new master ip] [new master port]`
+			if err = updateMasterToNewOne(groupServer.Addr, curMasterAddr, s.config.ProductAuth); err != nil {
+				return err
+			}


这里的第400行 err = s.storeUpdateGroup(group) 看着这个元信息变更是多余的，可以考虑删掉

* fix invalid arguments error when dashboard send slveof force Co-authored-by: wangshaoyi <wangshaoyi@360.cn>

* fix: Reduced ReadCache tags for some commands (#3034) * fix: Fixed an issue with asynchronous loading (#3037) * summary different stages duration && add rocksdb perfcontext (#3036) * fix: The number of element updates in RedisCache is configurable (#3043) * The number of element updates in RedisCache is configurable Co-authored-by: wuxianrong <wuxianrong@360.cn> * fix: fix replication on pika node recovering (#3038) * fix: Fix problems found during testing (#3039) * Example Modify the policy for updating big keys except String to Redis-Cache (#3047) Co-authored-by: wuxianrong <wuxianrong@360.cn> * add auth command to admin-thread-pool (#3048) Co-authored-by: wuxianrong <wuxianrong@360.cn> * fix: Example Repair the subjective and objective offline logic of noeds (#3049) * Example Repair the subjective and objective offline logic of primary and secondary nodes * fix comment --------- Co-authored-by: wuxianrong <wuxianrong@360.cn> * fix: Fixed version information for Pika, Pika_exporter, Codis (#3054) * Fixed version information for Pika, Pika_exporter, Codis * Delete redundant logic --------- Co-authored-by: wuxianrong <wuxianrong@360.cn> * fix: Fixed versions of Pika, Pika_exporter, Codis (#3057) * Resolve conflict differences * Resolve conflict differences * Resolve conflict differences * fix string test * change by review --------- Co-authored-by: wangshao1 <30471730+wangshao1@users.noreply.github.com> Co-authored-by: wuxianrong <wuxianrong@360.cn>

* fix: Reduced ReadCache tags for some commands (OpenAtomFoundation#3034) * fix: Fixed an issue with asynchronous loading (OpenAtomFoundation#3037) * summary different stages duration && add rocksdb perfcontext (OpenAtomFoundation#3036) * fix: The number of element updates in RedisCache is configurable (OpenAtomFoundation#3043) * The number of element updates in RedisCache is configurable Co-authored-by: wuxianrong <wuxianrong@360.cn> * fix: fix replication on pika node recovering (OpenAtomFoundation#3038) * fix: Fix problems found during testing (OpenAtomFoundation#3039) * Example Modify the policy for updating big keys except String to Redis-Cache (OpenAtomFoundation#3047) Co-authored-by: wuxianrong <wuxianrong@360.cn> * add auth command to admin-thread-pool (OpenAtomFoundation#3048) Co-authored-by: wuxianrong <wuxianrong@360.cn> * fix: Example Repair the subjective and objective offline logic of noeds (OpenAtomFoundation#3049) * Example Repair the subjective and objective offline logic of primary and secondary nodes * fix comment --------- Co-authored-by: wuxianrong <wuxianrong@360.cn> * fix: Fixed version information for Pika, Pika_exporter, Codis (OpenAtomFoundation#3054) * Fixed version information for Pika, Pika_exporter, Codis * Delete redundant logic --------- Co-authored-by: wuxianrong <wuxianrong@360.cn> * fix: Fixed versions of Pika, Pika_exporter, Codis (OpenAtomFoundation#3057) * Resolve conflict differences * Resolve conflict differences * Resolve conflict differences * fix string test * change by review --------- Co-authored-by: wangshao1 <30471730+wangshao1@users.noreply.github.com> Co-authored-by: wuxianrong <wuxianrong@360.cn>

* fix: tryFixReplicationRelationships error (OpenAtomFoundation#2991) * fix invalid arguments error when dashboard send slveof force Co-authored-by: wangshaoyi <wangshaoyi@360.cn> * fix replication relationship error while recovering from offline * update proxy slot mappings after slave pika recovered --------- Co-authored-by: wangshaoyi <wangshaoyi@360.cn>

github-actions bot added the ☢️ Bug Something isn't working label Mar 7, 2025

Mixficsol reviewed Mar 7, 2025

View reviewed changes

wangshao1 and others added 3 commits March 14, 2025 14:52

fix: tryFixReplicationRelationships error (OpenAtomFoundation#2991)

800c074

* fix invalid arguments error when dashboard send slveof force Co-authored-by: wangshaoyi <wangshaoyi@360.cn>

fix replication relationship error while recovering from offline

cf64c54

update proxy slot mappings after slave pika recovered

ea7e1b5

wangshao1 force-pushed the bugfix/fix_replication_error branch from a8fbe5b to ea7e1b5 Compare March 14, 2025 06:52

wangshao1 merged commit b19fdd6 into OpenAtomFoundation:3.5 Mar 14, 2025
10 checks passed

Mixficsol pushed a commit to Mixficsol/pika that referenced this pull request Mar 26, 2025

fix: fix replication on pika node recovering (OpenAtomFoundation#3038)

30fdfd3

coderabbitai bot mentioned this pull request Mar 27, 2025

fix: update v4.0.2 changelog #3063

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: fix replication on pika node recovering #3038

fix: fix replication on pika node recovering #3038

Uh oh!

wangshao1 commented Mar 7, 2025

Uh oh!

coderabbitai bot commented Mar 7, 2025

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

Mixficsol Mar 7, 2025

Uh oh!

Mixficsol Mar 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

fix: fix replication on pika node recovering #3038

fix: fix replication on pika node recovering #3038

Uh oh!

Conversation

wangshao1 commented Mar 7, 2025

Uh oh!

coderabbitai bot commented Mar 7, 2025

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

Mixficsol Mar 7, 2025

Choose a reason for hiding this comment

Uh oh!

Mixficsol Mar 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

CodeRabbit Configuration File (`.coderabbit.yaml`)