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

raise if __exit__ fail #2294

Merged
merged 4 commits into from
Jan 27, 2025
Merged

raise if __exit__ fail #2294

merged 4 commits into from
Jan 27, 2025

Conversation

myakove
Copy link
Collaborator

@myakove myakove commented Jan 27, 2025

When we call __exit__ we do not raise if delete fail which is bad and can hide error.
Added raise ResourceTeardownError if delete do not reurn True in __exit__.

Summary by CodeRabbit

  • New Features

    • Enhanced error handling for resource teardown with the introduction of ResourceTeardownError.
    • Improved timeout management for resources with new timeout handling mechanisms.
  • Bug Fixes

    • Added more robust error reporting during resource cleanup, raising errors when cleanup fails.
  • Refactor

    • Updated import statements and error handling logic for better code organization.
  • Tests

    • Introduced new tests for context manager functionality and error handling during resource teardown.

Copy link

coderabbitai bot commented Jan 27, 2025

Walkthrough

This pull request introduces a new exception class ResourceTeardownError in the ocp_resources/exceptions.py file and modifies the error handling logic in the ocp_resources/resource.py file. The changes include reorganizing import statements and enhancing the __exit__ method to raise ResourceTeardownError if resource cleanup fails. Additionally, new test cases are added in tests/test_resources.py to verify the functionality of the context manager and the new exception.

Changes

File Change Summary
ocp_resources/exceptions.py Added new ResourceTeardownError exception class with custom initialization and string representation.
ocp_resources/resource.py - Updated import statements.
- Modified __exit__ method to raise ResourceTeardownError if cleanup fails.
- Added imports for new exceptions: ForbiddenError, TimeoutExpiredError, TimeoutSampler, TimeoutWatch, MissingResourceResError.
tests/test_resources.py - Added TestSecretExit class with deploy and clean_up methods.
- Added tests: test_resource_context_manager and test_resource_context_manager_exit.
- Reorganized import statements.

Possibly related PRs

Suggested labels

size/XL, verified, can-be-merged, approved-rnetser

Suggested reviewers

  • dbasunag
  • rnetser
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ 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. (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.

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.

@redhat-qe-bot1
Copy link

Report bugs in Issues

The following are automatically added:

  • Add reviewers from OWNER file (in the root of the repository) under reviewers section.
  • Set PR size label.
  • New issue is created for the PR. (Closed when PR is merged/closed)
  • Run pre-commit if .pre-commit-config.yaml exists in the repo.

Available user actions:

  • To mark PR as WIP comment /wip to the PR, To remove it from the PR comment /wip cancel to the PR.
  • To block merging of PR comment /hold, To un-block merging of PR comment /hold cancel.
  • To mark PR as verified comment /verified to the PR, to un-verify comment /verified cancel to the PR.
    verified label removed on each new commit push.
  • To cherry pick a merged PR comment /cherry-pick <target branch to cherry-pick to> in the PR.
    • Multiple target branches can be cherry-picked, separated by spaces. (/cherry-pick branch1 branch2)
    • Cherry-pick will be started when PR is merged
  • To build and push container image command /build-and-push-container in the PR (tag will be the PR number).
    • You can add extra args to the Podman build command
      • Example: /build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>
  • To add a label by comment use /<label name>, to remove, use /<label name> cancel
  • To assign reviewers based on OWNERS file use /assign-reviewers
  • To check if PR can be merged use /check-can-merge
  • to assign reviewer to PR use /assign-reviewer @<reviewer>
Supported /retest check runs
  • /retest tox: Retest tox
  • /retest python-module-install: Retest python-module-install
  • /retest all: Retest all
Supported labels
  • hold
  • verified
  • wip
  • lgtm

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🧹 Nitpick comments (1)
ocp_resources/resource.py (1)

571-572: Add docstring to explain the new error handling behavior.

The new error handling in __exit__ should be documented to explain when and why ResourceTeardownError is raised.

Add a docstring to explain the behavior:

     def __exit__(
         self,
         exc_type: type[BaseException] | None = None,
         exc_val: BaseException | None = None,
         exc_tb: TracebackType | None = None,
     ) -> None:
+        """Exit the runtime context and clean up the resource.
+
+        Args:
+            exc_type: The type of the exception that was raised.
+            exc_val: The instance of the exception that was raised.
+            exc_tb: The traceback of the exception that was raised.
+
+        Raises:
+            ResourceTeardownError: If resource cleanup fails.
+        """
         if self.teardown:
             if not self.clean_up():
+                # Raise an error if cleanup fails to ensure resource teardown issues are not silently ignored
                 raise ResourceTeardownError(resource=self)
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0318516 and 2d74df9.

📒 Files selected for processing (2)
  • ocp_resources/exceptions.py (2 hunks)
  • ocp_resources/resource.py (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: tox
  • GitHub Check: python-module-install

ocp_resources/exceptions.py Outdated Show resolved Hide resolved
ocp_resources/exceptions.py Outdated Show resolved Hide resolved
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

♻️ Duplicate comments (1)
ocp_resources/exceptions.py (1)

58-63: ⚠️ Potential issue

Fix method name and add missing type hints and docstring.

The ResourceTeardownError class has several issues:

  1. Method name is incorrect: _str__ instead of __str__.
  2. Typo in error message: "excute" instead of "execute".
  3. Missing type hint for __str__ return type.
  4. Missing docstring.

Apply this diff to fix the issues:

 class ResourceTeardownError(Exception):
+    """Exception raised when resource teardown fails."""
+
     def __init__(self, resource: Any):
         self.resource = resource

-    def _str__(self):
-        return f"Failed to excute teardown for resource {self.resource}"
+    def __str__(self) -> str:
+        return f"Failed to execute teardown for resource {self.resource}"
🧹 Nitpick comments (1)
ocp_resources/resource.py (1)

746-752: Fix typo in warning message.

There's a typo in the warning message: "Timeour" should be "Timeout".

Apply this diff to fix the typo:

-            self.logger.warning(f"Timeour expired while waiting for {self.kind} {self.name} to be deleted")
+            self.logger.warning(f"Timeout expired while waiting for {self.kind} {self.name} to be deleted")
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2d74df9 and bfcffb7.

📒 Files selected for processing (3)
  • ocp_resources/exceptions.py (1 hunks)
  • ocp_resources/resource.py (3 hunks)
  • tests/test_resources.py (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: tox
  • GitHub Check: python-module-install
🔇 Additional comments (4)
tests/test_resources.py (3)

12-17: Well-structured test helper class!

The TestSecretExit class is well designed for testing error cases, with clean_up always returning False to simulate cleanup failures.


96-100: Good test coverage for the happy path!

The test verifies that resources are properly cleaned up when the context manager exits successfully.


102-105: Good test coverage for the error path!

The test properly verifies that ResourceTeardownError is raised when resource cleanup fails.

ocp_resources/resource.py (1)

571-572: Good enhancement to error handling!

The change improves error visibility by raising ResourceTeardownError when resource cleanup fails.

rnetser
rnetser previously approved these changes Jan 27, 2025
@rnetser rnetser enabled auto-merge (squash) January 27, 2025 14:23
@myakove
Copy link
Collaborator Author

myakove commented Jan 27, 2025

/verified

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 1af8eb2 and d75364c.

📒 Files selected for processing (1)
  • ocp_resources/resource.py (3 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: python-module-install
  • GitHub Check: tox
🔇 Additional comments (2)
ocp_resources/resource.py (2)

9-14: LGTM! Well-organized import statements.

The new imports are logically organized and support the enhanced error handling functionality, particularly the addition of ResourceTeardownError for improved resource cleanup error reporting.

Also applies to: 19-34, 37-38, 44-46


571-572: LGTM! Appropriate error handling in exit.

Raising the error in __exit__ rather than clean_up is the right choice because:

  1. It maintains separation of concerns - clean_up focuses on cleanup logic while __exit__ handles error reporting
  2. It follows the context manager protocol where __exit__ is responsible for handling exceptions
  3. It allows clean_up to be used independently without forcing error handling behavior

ocp_resources/resource.py Show resolved Hide resolved
@rnetser rnetser merged commit 5081fcf into main Jan 27, 2025
6 checks passed
@rnetser rnetser deleted the raise-in-__exit__ branch January 27, 2025 14:35
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.

6 participants