-
Notifications
You must be signed in to change notification settings - Fork 479
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5958 from Algo-devops-service/relstable3.23.0
go-algorand 3.23.0-stable Release PR
- Loading branch information
Showing
40 changed files
with
1,290 additions
and
638 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| FROM ubuntu:20.04 as builder | ||
|
|
||
| ARG GO_VERSION="1.20.7" | ||
| ARG GO_VERSION="1.20.14" | ||
|
|
||
| ARG CHANNEL | ||
| ARG URL | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1 | ||
| 0 |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| // Copyright (C) 2019-2024 Algorand, Inc. | ||
| // This file is part of go-algorand | ||
| // | ||
| // go-algorand is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU Affero General Public License as | ||
| // published by the Free Software Foundation, either version 3 of the | ||
| // License, or (at your option) any later version. | ||
| // | ||
| // go-algorand is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU Affero General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU Affero General Public License | ||
| // along with go-algorand. If not, see <https://www.gnu.org/licenses/>. | ||
|
|
||
| package catchup | ||
|
|
||
| import ( | ||
| "errors" | ||
| "github.com/algorand/go-algorand/network" | ||
| "github.com/algorand/go-deadlock" | ||
| "time" | ||
| ) | ||
|
|
||
| // classBasedPeerSelector is a rankPooledPeerSelector that tracks and ranks classes of peers based on their response behavior. | ||
| // It is used to select the most appropriate peers to download blocks from - this is most useful when catching up | ||
| // and needing to figure out whether the blocks can be retrieved from relay nodes or require archive nodes. | ||
| // The ordering of the peerSelectors directly determines the priority of the classes of peers. | ||
| type classBasedPeerSelector struct { | ||
| mu deadlock.Mutex | ||
| peerSelectors []*wrappedPeerSelector | ||
| } | ||
|
|
||
| func makeClassBasedPeerSelector(peerSelectors []*wrappedPeerSelector) *classBasedPeerSelector { | ||
| return &classBasedPeerSelector{ | ||
| peerSelectors: peerSelectors, | ||
| } | ||
| } | ||
|
|
||
| func (c *classBasedPeerSelector) rankPeer(psp *peerSelectorPeer, rank int) (int, int) { | ||
| c.mu.Lock() | ||
| defer c.mu.Unlock() | ||
|
|
||
| oldRank, newRank := -1, -1 | ||
| for _, wp := range c.peerSelectors { | ||
| // See if the peer is in the class, ranking it appropriately if so | ||
| if psp.peerClass != wp.peerClass { | ||
| continue | ||
| } | ||
|
|
||
| oldRank, newRank = wp.peerSelector.rankPeer(psp, rank) | ||
| if oldRank < 0 || newRank < 0 { | ||
| // Peer not found in this selector | ||
| continue | ||
| } | ||
|
|
||
| // Peer was in this class, if there was any kind of download issue, we increment the failure count | ||
| if rank >= peerRankNoBlockForRound { | ||
| wp.downloadFailures++ | ||
| } | ||
|
|
||
| break | ||
| } | ||
|
|
||
| return oldRank, newRank | ||
| } | ||
|
|
||
| func (c *classBasedPeerSelector) peerDownloadDurationToRank(psp *peerSelectorPeer, blockDownloadDuration time.Duration) (rank int) { | ||
| c.mu.Lock() | ||
| defer c.mu.Unlock() | ||
|
|
||
| for _, wp := range c.peerSelectors { | ||
| rank = wp.peerSelector.peerDownloadDurationToRank(psp, blockDownloadDuration) | ||
| // If rank is peerRankInvalidDownload, we check the next class's rankPooledPeerSelector | ||
| if rank >= peerRankInvalidDownload { | ||
| continue | ||
| } | ||
| // Should be a legit ranking, we return it | ||
| return rank | ||
| } | ||
| // If we reached here, we have exhausted all classes without finding the peer | ||
| return peerRankInvalidDownload | ||
| } | ||
|
|
||
| func (c *classBasedPeerSelector) getNextPeer() (psp *peerSelectorPeer, err error) { | ||
| c.mu.Lock() | ||
| defer c.mu.Unlock() | ||
| return c.internalGetNextPeer(0) | ||
| } | ||
|
|
||
| // internalGetNextPeer is a helper function that should be called with the lock held | ||
| func (c *classBasedPeerSelector) internalGetNextPeer(recurseCount int8) (psp *peerSelectorPeer, err error) { | ||
| // Safety check to prevent infinite recursion | ||
| if recurseCount > 1 { | ||
| return nil, errPeerSelectorNoPeerPoolsAvailable | ||
| } | ||
| selectorDisabledCount := 0 | ||
| for _, wp := range c.peerSelectors { | ||
| if wp.downloadFailures > wp.toleranceFactor { | ||
| // peerSelector is disabled for now, we move to the next one | ||
| selectorDisabledCount++ | ||
| continue | ||
| } | ||
| psp, err = wp.peerSelector.getNextPeer() | ||
|
|
||
| if err != nil { | ||
| // This is mostly just future-proofing, as we don't expect any other errors from getNextPeer | ||
| if errors.Is(err, errPeerSelectorNoPeerPoolsAvailable) { | ||
| // We penalize this class the equivalent of one download failure (in case this is transient) | ||
| wp.downloadFailures++ | ||
| } | ||
| continue | ||
| } | ||
| return psp, nil | ||
| } | ||
| // If we reached here, we have exhausted all classes and still have no peers | ||
| // IFF all classes are disabled, we reset the downloadFailures for all classes and start over | ||
| if len(c.peerSelectors) != 0 && selectorDisabledCount == len(c.peerSelectors) { | ||
| for _, wp := range c.peerSelectors { | ||
| wp.downloadFailures = 0 | ||
| } | ||
| // Recurse to try again, we should have at least one class enabled now | ||
| return c.internalGetNextPeer(recurseCount + 1) | ||
| } | ||
| // If we reached here, we have exhausted all classes without finding a peer, not due to all classes being disabled | ||
| return nil, errPeerSelectorNoPeerPoolsAvailable | ||
| } | ||
|
|
||
| type wrappedPeerSelector struct { | ||
| peerSelector peerSelector // The underlying peerSelector for this class | ||
| peerClass network.PeerOption // The class of peers the peerSelector is responsible for | ||
| toleranceFactor int // The number of times we can net fail for any reason before we move to the next class's rankPooledPeerSelector | ||
| downloadFailures int // The number of times we have failed to download a block from this class's rankPooledPeerSelector since it was last reset | ||
| } | ||
|
|
||
| // makeCatchpointPeerSelector returns a classBasedPeerSelector that selects peers based on their class and response behavior. | ||
| // These are the preferred configurations for the catchpoint service. | ||
| func makeCatchpointPeerSelector(net peersRetriever) peerSelector { | ||
| wrappedPeerSelectors := []*wrappedPeerSelector{ | ||
| { | ||
| peerClass: network.PeersPhonebookRelays, | ||
| peerSelector: makeRankPooledPeerSelector(net, | ||
| []peerClass{{initialRank: peerRankInitialFirstPriority, peerClass: network.PeersPhonebookRelays}}), | ||
| toleranceFactor: 3, | ||
| }, | ||
| { | ||
| peerClass: network.PeersPhonebookArchivalNodes, | ||
| peerSelector: makeRankPooledPeerSelector(net, | ||
| []peerClass{{initialRank: peerRankInitialFirstPriority, peerClass: network.PeersPhonebookArchivalNodes}}), | ||
| toleranceFactor: 10, | ||
| }, | ||
| } | ||
|
|
||
| return makeClassBasedPeerSelector(wrappedPeerSelectors) | ||
| } |
Oops, something went wrong.