Fix #978: mark started flag as false after failed start on reload. #979
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
krizhanovsky
approved these changes
Mar 22, 2018
| @@ -269,8 +271,7 @@ tfw_ctlfn_state_change(const char *old_state, const char *new_state) | |||
| TFW_LOG("Live reconfiguration of Tempesta.\n"); | |||
| } | |||
|
|
|||
| if (!(r = tfw_start(&tfw_mods))) | |||
| WRITE_ONCE(tfw_started, true); | |||
| r = tfw_start(&tfw_mods); | |||
There was a problem hiding this comment.
Current tfw_ctlfn_state_change() is good that all the modification of tfw_started are there and the patch distributes the variable updates over the code. Why not just to change these 2 line like?
r = tfw_start(&tfw_mods);
WRITE_ONCE(tfw_started, !r);There was a problem hiding this comment.
In case of true this variant is ok. but in case of false - it disables tfw_started flag in both ( reconfiguration failed and start failed) events, and we need to disable it only in event of failed start. In failed reconfiguration case Tempesta remain in started state, so we need to preserve tfw_started flag in true value.
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.
No description provided.