Disable agent when opcache is in reset pending state (#988)#1000
Merged
intuibase merged 2 commits intoelastic:mainfrom Jun 21, 2023
Merged
Conversation
SergeyKleyman
approved these changes
Jun 21, 2023
| return false; | ||
| } | ||
|
|
||
| zval *restartPending = zend_hash_str_find(Z_ARRVAL(rv), ZEND_STRL("restart_pending")); |
Contributor
There was a problem hiding this comment.
There's also restart_in_progress key - should we check for that as well?
Contributor
Author
There was a problem hiding this comment.
restart_pending has wider scope, it is more secure
|
|
||
| int result = call_internal_function(NULL, "opcache_get_status", parameters, 1, &rv); | ||
| if (result == resultFailure) { | ||
| zval_ptr_dtor(&rv); |
Contributor
There was a problem hiding this comment.
Maybe it's worth using goto finally approach to avoid duplicating cleaning code (zval_ptr_dtor(&rv);)?
Contributor
Author
There was a problem hiding this comment.
true, i'll update it when we will introduce c++
| ELASTIC_APM_SET_RESULT_CODE_AND_GOTO_FAILURE(); | ||
| } | ||
|
|
||
| if (detectOpcacheRestartPending()) { |
Contributor
There was a problem hiding this comment.
What do you think about adding tracerPhpPartState_disabled to enum TracerPhpPartState and set state to it here?
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
2 participants
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.
Fixes #988