check last_pruned instead of is_pruning #2748
Open
+32
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
…ocking single-threaded behavior
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This pull request modifies the pruning process for connector-credential pairs, focusing on using a 'last_pruned' timestamp instead of an 'is_pruning' boolean to address potential race conditions and improve concurrent request handling.
- Updated
backend/danswer/server/documents/cc_pair.pyto return the last pruning timestamp instead of checking if pruning is in progress - Modified
backend/tests/integration/common_utils/managers/cc_pair.pyto use 'last_pruned' timestamp in CCPairManager for pruning status checks - Changed
backend/tests/integration/tests/pruning/test_pruning.pyto use ThreadingHTTPServer for improved concurrent request handling - Adjusted
backend/tests/integration/connector_job_tests/slack/test_prune.pyto capture a timestamp before pruning for more accurate status checks
4 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings
Comment on lines
+291
to
+298
| if not isinstance(response_str, str): | ||
| return None | ||
|
|
||
| try: | ||
| return datetime.fromisoformat(response_str) | ||
| except ValueError: | ||
| # Handle invalid datetime format | ||
| pass |
There was a problem hiding this comment.
style: The error handling for invalid datetime format could be improved. Consider logging the error or raising a specific exception for better debugging.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Potential workaround for race condition in wait for prune and some buggy blocking behavior in default HTTPServer.
How Has This Been Tested?
[Describe the tests you ran to verify your changes]
Accepted Risk
[Any know risks or failure modes to point out to reviewers]
Related Issue(s)
[If applicable, link to the issue(s) this PR addresses]
Checklist: