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(monitor): set monitors to nil after closing them (backport #3388) #3396

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 23, 2024

Which issue(s) this PR fixes:

Issue longhorn/longhorn#10035

What this PR does / why we need it:

Special notes for your reviewer:

Additional documentation or context


This is an automatic backport of pull request #3388 done by [Mergify](https://mergify.com).

Longhorn 10035

Signed-off-by: Derek Su <[email protected]>
(cherry picked from commit c921e2b)

# Conflicts:
#	controller/monitor/environment_check_monitor.go
No need to delay the environment check.

Longhorn 10035

Signed-off-by: Derek Su <[email protected]>
(cherry picked from commit c410f5d)
@mergify mergify bot added the conflicts label Dec 23, 2024
@mergify mergify bot requested a review from a team as a code owner December 23, 2024 15:06
Copy link
Author

mergify bot commented Dec 23, 2024

Cherry-pick of c921e2b has failed:

On branch mergify/bp/v1.6.x/pr-3388
Your branch is up to date with 'origin/v1.6.x'.

You are currently cherry-picking commit c921e2b6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   controller/monitor/disk_monitor.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   controller/monitor/environment_check_monitor.go

Cherry-pick of a65a6ce has failed:

On branch mergify/bp/v1.6.x/pr-3388
Your branch is ahead of 'origin/v1.6.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a65a6cea.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   controller/monitor/environment_check_monitor.go
	modified:   controller/monitor/fake_disk_monitor.go
	new file:   controller/monitor/fake_environment_check_monitor.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller/monitor/disk_monitor.go
	both modified:   controller/node_controller.go
	both modified:   controller/node_controller_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

coderabbitai bot commented Dec 23, 2024

Important

Review skipped

Bot user detected.

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.


🪧 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. (Beta)
  • @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.

@derekbit derekbit force-pushed the mergify/bp/v1.6.x/pr-3388 branch 2 times, most recently from 790b6dc to 039ca84 Compare December 23, 2024 15:20
Set monitors to nil after closing them, so the controller can recreate
them when the node is back.

Longhorn 10035

Signed-off-by: Derek Su <[email protected]>
(cherry picked from commit a65a6ce)
@derekbit derekbit force-pushed the mergify/bp/v1.6.x/pr-3388 branch from 039ca84 to d5c9d90 Compare December 23, 2024 15:21
@derekbit
Copy link
Member

Mistakenly add backport/v1.6.4 label. No need to backport the PR to v1.6.4.

@derekbit derekbit closed this Dec 23, 2024
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.

1 participant