Skip to content

fix: Resolve core issues at runtime#3051

Closed
Mixficsol wants to merge 2 commits intoOpenAtomFoundation:3.5from
Mixficsol:3.5
Closed

fix: Resolve core issues at runtime#3051
Mixficsol wants to merge 2 commits intoOpenAtomFoundation:3.5from
Mixficsol:3.5

Conversation

@Mixficsol
Copy link
Copy Markdown
Collaborator

@Mixficsol Mixficsol commented Mar 19, 2025

在 GetHistogram () 方法中的 histogram_family_->Add 这里会出现 core dump,因为 histogram_family_ 会每分钟重置一次,由于在重置的时候没有对 histogram_family_ 有上锁的操作,这里会产生在调用 Add 的情况下 histogram_family_ 是空指针导致进程崩溃

prometheus::Histogram& PikaCmdTableManager::GetHistogram(const std::string& opt) {
  {
    std::shared_lock<std::shared_mutex> read_lock(histograms_mutex_);
    auto it = histograms_.find(opt);
    if (it != histograms_.end()) {
      return *(it->second);
    }
  }
  std::unique_lock<std::shared_mutex> write_lock(histograms_mutex_);
  auto& new_histogram = histogram_family_->Add(  // 这里可能会产生崩溃
    {{"command", opt}}, 
    prometheus::Histogram::BucketBoundaries{0.5, 1, 2, 3, 5, 7, 10, 15, 20, 30, 40, 50, 65, 75, 85, 100, 125, 140, 150, 160, 175, 185, 200, 300, 400, 500, 750, 1000, 2000, 5000, 10000}
  );
  histograms_[opt] = &new_histogram; // 这里可能会产生崩溃
  return new_histogram;
}

prometheus::Family<prometheus::Histogram>* PikaCmdTableManager::GetHistograms() {
  std::shared_lock<std::shared_mutex> read_lock(histograms_mutex_);  // 增加了读锁保护 histogram_family_
  return histogram_family_;
}

在修复后,新增加了在重置 histogram_family_ 上了一个互斥锁进行保护

void PikaCmdTableManager::ResetCommandCount() {
  {
    std::unique_lock<std::shared_mutex> write_lock(slow_command_mutex_); 
    slow_command_count_.clear();
  }

  {
    std::unique_lock<std::shared_mutex> write_lock(histograms_mutex_); // 在重置的时候新加的互斥锁保护 histogram_family_ 是线程安全的  
    InitHistograms();                
  }
}

void PikaCmdTableManager::InitHistograms() {
  histograms_.clear();
  prometheus_registry_ = std::make_shared<prometheus::Registry>();
  histogram_family_ = &prometheus::BuildHistogram()
      .Name("pika_command_duration_seconds")
      .Help("Execution time of Pika commands in seconds")
      .Register(*prometheus_registry_);
}

PikaCmdTableManager::PikaCmdTableManager() {
  cmds_ = std::make_unique<CmdTable>();
  cmds_->reserve(300);
  InitHistograms();
}

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 19, 2025

Important

Review skipped

Draft detected.

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.

@github-actions github-actions Bot added the ☢️ Bug Something isn't working label Mar 19, 2025
@Mixficsol Mixficsol closed this Mar 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

☢️ Bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant