Repository navigation
Conversation
Python 3.14 (PEP 765) warns at compile time about a return in a finally block. Every gp* utility that imports gppylib.operations.buildMirrorSegments prints it on stderr: buildMirrorSegments.py:293: SyntaxWarning: 'return' in a 'finally' block This breaks tests that compare the output of those utilities, such as contrib/sslinfo, where "gpstop -arf" is run from the test and the two extra lines make the result differ from the expected file. In _update_config(), "return backout_map" was in the finally block that restores the SIGINT handler. A return there discards any exception from the try block, so a failure of updateSystemConfig() was silently ignored and None was returned. The caller then went on with the recovery, and _revert_config_update() failed later with a TypeError from len(None). Return after the finally block. The SIGINT handler is restored in the same way, and an exception from updateSystemConfig() is now raised to the caller with its own message, as every other step of the recovery does. This is the only return, break or continue in a finally block in the repository. Assisted-by: Claude Code Backpatch-through: REL_2_STABLE
Member
Author
|
This change has been verified in Ubuntu 26.04 on #2096 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Python 3.14 (PEP 765) warns at compile time about a return in a finally block. Every gp* utility that imports gppylib.operations.buildMirrorSegments prints it on stderr:
buildMirrorSegments.py:293: SyntaxWarning: 'return' in a 'finally' block
This breaks tests that compare the output of those utilities, such as contrib/sslinfo, where "gpstop -arf" is run from the test and the two extra lines make the result differ from the expected file.
In _update_config(), "return backout_map" was in the finally block that restores the SIGINT handler. A return there discards any exception from the try block, so a failure of updateSystemConfig() was silently ignored and None was returned. The caller then went on with the recovery, and _revert_config_update() failed later with a TypeError from len(None).
Return after the finally block. The SIGINT handler is restored in the same way, and an exception from updateSystemConfig() is now raised to the caller with its own message, as every other step of the recovery does.
This is the only return, break or continue in a finally block in the repository.
Assisted-by: Claude Code
Backpatch-through: REL_2_STABLE
Fixes #ISSUE_Number
What does this PR do?
Type of Change
Breaking Changes
Test Plan
make installcheckmake -C src/test installcheck-cbdb-parallelImpact
Performance:
User-facing changes:
Dependencies:
Checklist
Additional Context
CI Skip Instructions