Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increate timeout to 1 min for testnet #746

Open
wants to merge 3 commits into
base: dev-upgrade
Choose a base branch
from

Conversation

benjamin202410
Copy link
Collaborator

@benjamin202410 benjamin202410 commented Nov 25, 2024

Proposed changes

Merge from master branch with mining time fix and vote fix

Types of changes

What types of changes does your code introduce to XDC network?
Put an in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)
  • Regular KTLO or any of the maintaince work. e.g code style
  • CICD Improvement

Impacted Components

Which part of the codebase this PR will touch base on,

Put an in the boxes that apply

  • Consensus
  • Account
  • Network
  • Geth
  • Smart Contract
  • External components
  • Not sure (Please specify below)

Checklist

Put an in the boxes once you have confirmed below actions (or provide reasons on not doing so) that

  • This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
  • Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
  • Tested the backwards compatibility.
  • Tested with XDC nodes running this version co-exist with those running the previous version.
  • Relevant documentation has been updated as part of this PR
  • N/A

wgr523 and others added 2 commits November 18, 2024 23:59
* fix: reduce mine period reset (waiting) time

* fix: reset time negative problem

* fix: too many time reset=0, and change log level

* update log format

---------

Co-authored-by: liam.lai <liam.lai@us>
increate timeout to 1 min for testnet
fix test and update log level
@benjamin202410 benjamin202410 force-pushed the increate-timeout-to-1-min-for-testnet branch from b5ca27b to ce9bc9f Compare November 25, 2024 09:12
@@ -302,12 +304,14 @@ func (w *worker) update() {
if atomic.LoadInt32(&w.mining) == 1 {
w.commitNewWork()
}
timeout.Reset(time.Duration(minePeriod) * time.Second)
resetTime := getResetTime(w.chain, minePeriod, &prevReset0TimeMillisec)
timeout.Reset(resetTime)
Copy link
Collaborator

@gzliudan gzliudan Nov 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reset should always be invoked on stopped or expired channels


// Handle ChainHeadEvent
case <-w.chainHeadCh:
w.commitNewWork()
timeout.Reset(time.Duration(minePeriod) * time.Second)
resetTime := getResetTime(w.chain, minePeriod, &prevReset0TimeMillisec)
timeout.Reset(resetTime)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reset should be invoked only on stopped or expired timers with drained channels

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants