fix(tari-pulse): await shutdown signal in main loop #6696
Merged
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
Test Results (CI) 3 files 129 suites 35m 43s ⏱️ Results for commit 5bbd47f. ♻️ This comment has been updated with latest results. |
There was a problem hiding this comment.
Hi, looking good.
Please change
// Interval to check if the base node is still in sync with the network
pub tari_pulse_interval: Duration,to
/// Interval to check if the base node is still in sync with the network
#[serde(with = "serializers::seconds")]
pub tari_pulse_interval: Duration,
MCozhusheck
changed the title
hansieodendaal
previously approved these changes
Nov 21, 2024
Comment on lines
144
to
146
| interval = time::interval(Duration::from_secs(interval_in_secs * 2)); | ||
| interval.tick().await; | ||
| continue; |
There was a problem hiding this comment.
Ditto no need to wait again
Suggested change
| interval = time::interval(Duration::from_secs(interval_in_secs * 2)); | |
| interval.tick().await; | |
| continue; | |
| interval = time::interval(Duration::from_secs(interval_in_secs * 2)); | |
| continue; |
There was a problem hiding this comment.
same as above, we need to .await first for next invoke to actually sleep.
This must be changed in |
hansieodendaal
added a commit
to hansieodendaal/tari
that referenced
this pull request
Nov 21, 2024
Fixed the base node shutdown on Ubuntu whereas pressing Ctrl-C multiple times rendered the command line interface in an undefined state. This was not issue on Windows. Note: The change to 'base_layer\core\src\base_node\tari_pulse_service\mod.rs' is just to enable testing (get rid of the repeated command-line spam), and will be fixed in tari-project#6696.
4 tasks
SWvheerden
reviewed
Nov 22, 2024
| let interval_in_secs = interval.period().as_secs(); | ||
| if interval_in_secs > (60 * 30) { | ||
| warn!(target: LOG_TARGET, "Reached maximum retry interval of 30 minutes. Exiting"); | ||
| break; |
There was a problem hiding this comment.
I would not break here, just leave the interval at max 30 mins
There was a problem hiding this comment.
Also after removing this tick().await after assign new interval the loop continues to max value right away.
There was a problem hiding this comment.
Looks like after assigning new interval we have to tick().await to make sure that the next iteration of the loop actually awaits
SWvheerden
pushed a commit
that referenced
this pull request
Nov 22, 2024
Description --- Fixed the base node shutdown on Ubuntu (and hopefully on MacOS) whereas pressing Ctrl-C multiple times rendered the command line interface in an undefined state. This was not issue on Windows. **Note:** The change to 'base_layer\core\src\base_node\tari_pulse_service\mod.rs' is an interim change to enable testing (getting rid of the repeated command-line spam) but not required for the base node to shut down. More changes in #6696. Motivation and Context --- The base node did not shut down properly on Ubuntu and MacOs. How Has This Been Tested? --- System-level testing on Windows and Ubuntu (WSL). What process can a PR reviewer use to test or verify this change? --- System-level testing - still outstanding on MacOS <!-- Checklist --> <!-- 1. Is the title of your PR in the form that would make nice release notes? The title, excluding the conventional commit tag, will be included exactly as is in the CHANGELOG, so please think about it carefully. --> Breaking Changes --- - [x] None - [ ] Requires data directory on base node to be deleted - [ ] Requires hard fork - [ ] Other - Please specify <!-- Does this include a breaking change? If so, include this line as a footer --> <!-- BREAKING CHANGE: Description what the user should do, e.g. delete a database, resync the chain -->
Co-authored-by: Hansie Odendaal <39146854+hansieodendaal@users.noreply.github.com>
SWvheerden
approved these changes
Nov 26, 2024
hansieodendaal
added a commit
to hansieodendaal/tari
that referenced
this pull request
Nov 28, 2024
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
Await shutdown signal and reduce error logging when node failed to compare blocks hashes.
Motivation and Context
Error logs were spamming on not supported network, greatly reducing readability and shutdown signal wasn't working propely.
How Has This Been Tested?
Run local node on esmeralda network (which is not supported yet) and watch for error logs. Also check shutdown behavior.
What process can a PR reviewer use to test or verify this change?
Same as above
Breaking Changes