Merge branch 'dev' into version-bump-1.3.1

StephenButtolph · web-flow · commit 15acfa799368 · 2021-03-29T16:18:57.000-04:00
diff --git a/chains/atomic/shared_memory.go b/chains/atomic/shared_memory.go
@@ -317,29 +317,37 @@ func (s *state) getKeys(traits [][]byte, startTrait, startKey []byte, limit int)
 		}
 
 		lastTrait = trait
-		lastKey = startKey
+		var err error
+		lastKey, err = s.appendTraitKeys(&keys, &tracked, &limit, trait, startKey)
+		if err != nil {
+			return nil, nil, nil, err
+		}
 
-		traitDB := prefixdb.New(trait, s.indexDB)
-		iter := traitDB.NewIteratorWithStart(startKey)
-		for iter.Next() {
-			if limit == 0 {
-				iter.Release()
-				return keys, lastTrait, lastKey, nil
-			}
-
-			key := iter.Key()
-			lastKey = key
-
-			id := hashing.ComputeHash256Array(key)
-			if tracked.Contains(id) {
-				continue
-			}
-
-			tracked.Add(id)
-			keys = append(keys, key)
-			limit--
+		if limit == 0 {
+			break
 		}
-		iter.Release()
 	}
 	return keys, lastTrait, lastKey, nil
 }
+
+func (s *state) appendTraitKeys(keys *[][]byte, tracked *ids.Set, limit *int, trait, startKey []byte) ([]byte, error) {
+	lastKey := startKey
+
+	traitDB := prefixdb.New(trait, s.indexDB)
+	iter := traitDB.NewIteratorWithStart(startKey)
+	defer iter.Release()
+	for iter.Next() && *limit > 0 {
+		key := iter.Key()
+		lastKey = key
+
+		id := hashing.ComputeHash256Array(key)
+		if tracked.Contains(id) {
+			continue
+		}
+
+		tracked.Add(id)
+		*keys = append(*keys, key)
+		*limit--
+	}
+	return lastKey, iter.Error()
+}
diff --git a/main/keys.go b/main/keys.go
@@ -58,7 +58,7 @@ const (
 	networkHealthMaxTimeSinceMsgSentKey     = "network-health-max-time-since-msg-sent"
 	networkHealthMaxPortionSendQueueFillKey = "network-health-max-portion-send-queue-full"
 	networkHealthMaxSendFailRateKey         = "network-health-max-send-fail-rate"
-	networkHealthMaxTimeSinceNoReqsKey      = "network-health-max-time-since-no-requests"
+	networkHealthMaxOutstandingDurationKey  = "network-health-max-outstanding-request-duration"
 	sendQueueSizeKey                        = "send-queue-size"
 	benchlistFailThresholdKey               = "benchlist-fail-threshold"
 	benchlistPeerSummaryEnabledKey          = "benchlist-peer-summary-enabled"
diff --git a/main/params.go b/main/params.go
@@ -164,7 +164,7 @@ func avalancheFlagSet() *flag.FlagSet {
 	fs.String(httpsCertFileKey, "", "TLS certificate file for the HTTPs server")
 	fs.String(httpAllowedOrigins, "*", "Origins to allow on the HTTP port. Defaults to * which allows all origins. Example: https://*.avax.network https://*.avax-test.network")
 	fs.Bool(apiAuthRequiredKey, false, "Require authorization token to call HTTP APIs")
-	fs.String(apiAuthPasswordFileKey, "", "Password file used to initially create/validate API authorization tokens. Can be changed via API call.")
+	fs.String(apiAuthPasswordFileKey, "", "Password file used to initially create/validate API authorization tokens. Leading and trailing whitespace is removed from the password. Can be changed via API call.")
 	// Enable/Disable APIs
 	fs.Bool(adminAPIEnabledKey, false, "If true, this node exposes the Admin API")
 	fs.Bool(infoAPIEnabledKey, true, "If true, this node exposes the Info API")
@@ -187,7 +187,7 @@ func avalancheFlagSet() *flag.FlagSet {
 	// Router Health
 	fs.Float64(routerHealthMaxDropRateKey, 1, "Node reports unhealthy if the router drops more than this portion of messages.")
 	fs.Uint(routerHealthMaxOutstandingRequestsKey, 1024, "Node reports unhealthy if there are more than this many outstanding consensus requests (Get, PullQuery, etc.) over all chains")
-	fs.Duration(networkHealthMaxTimeSinceNoReqsKey, 5*time.Minute, "Node reports unhealthy if there is at least 1 outstanding request continuously for this duration")
+	fs.Duration(networkHealthMaxOutstandingDurationKey, 5*time.Minute, "Node reports unhealthy if there has been a request outstanding for this duration")
 
 	// Staking
 	fs.Uint(stakingPortKey, 9651, "Port of the consensus server")
@@ -513,7 +513,7 @@ func setNodeConfig(v *viper.Viper) error {
 		if err != nil {
 			return fmt.Errorf("api-auth-password-file %q failed to be read with: %w", passwordFile, err)
 		}
-		Config.APIAuthPassword = string(pwBytes)
+		Config.APIAuthPassword = strings.TrimSpace(string(pwBytes))
 		if !password.SufficientlyStrong(Config.APIAuthPassword, password.OK) {
 			return errors.New("api-auth-password is not strong enough")
 		}
@@ -541,14 +541,14 @@ func setNodeConfig(v *viper.Viper) error {
 	Config.ConsensusRouter = &router.ChainRouter{}
 	Config.RouterHealthConfig.MaxDropRate = v.GetFloat64(routerHealthMaxDropRateKey)
 	Config.RouterHealthConfig.MaxOutstandingRequests = int(v.GetUint(routerHealthMaxOutstandingRequestsKey))
-	Config.RouterHealthConfig.MaxTimeSinceNoOutstandingRequests = v.GetDuration(networkHealthMaxTimeSinceNoReqsKey)
+	Config.RouterHealthConfig.MaxOutstandingDuration = v.GetDuration(networkHealthMaxOutstandingDurationKey)
 	Config.RouterHealthConfig.MaxRunTimeRequests = v.GetDuration(networkMaximumTimeoutKey)
 	Config.RouterHealthConfig.MaxDropRateHalflife = healthCheckAveragerHalflife
 	switch {
 	case Config.RouterHealthConfig.MaxDropRate < 0 || Config.RouterHealthConfig.MaxDropRate > 1:
 		return fmt.Errorf("%s must be in [0,1]", routerHealthMaxDropRateKey)
-	case Config.RouterHealthConfig.MaxTimeSinceNoOutstandingRequests <= 0:
-		return fmt.Errorf("%s must be positive", networkHealthMaxTimeSinceNoReqsKey)
+	case Config.RouterHealthConfig.MaxOutstandingDuration <= 0:
+		return fmt.Errorf("%s must be positive", networkHealthMaxOutstandingDurationKey)
 	}
 
 	// IPCs
diff --git a/node/node.go b/node/node.go
@@ -476,9 +476,8 @@ func (n *Node) initIPCs() error {
 }
 
 // Initializes the Platform chain.
-// Its genesis data specifies the other chains that should
-// be created.
-func (n *Node) initChains(genesisBytes []byte, avaxAssetID ids.ID) error {
+// Its genesis data specifies the other chains that should be created.
+func (n *Node) initChains(genesisBytes []byte) {
 	n.Log.Info("initializing chains")
 
 	// Create the Platform Chain
@@ -489,8 +488,6 @@ func (n *Node) initChains(genesisBytes []byte, avaxAssetID ids.ID) error {
 		VMAlias:       platformvm.ID.String(),
 		CustomBeacons: n.beacons,
 	})
-
-	return nil
 }
 
 // initAPIServer initializes the server that handles HTTP calls
@@ -908,9 +905,8 @@ func (n *Node) Initialize(
 	if err := n.initAliases(n.Config.GenesisBytes); err != nil { // Set up aliases
 		return fmt.Errorf("couldn't initialize aliases: %w", err)
 	}
-	if err := n.initChains(n.Config.GenesisBytes, n.Config.AvaxAssetID); err != nil { // Start the Platform chain
-		return fmt.Errorf("couldn't initialize chains: %w", err)
-	}
+	// Start the Platform chain
+	n.initChains(n.Config.GenesisBytes)
 	return nil
 }
 
diff --git a/snow/engine/avalanche/issuer.go b/snow/engine/avalanche/issuer.go
@@ -110,7 +110,7 @@ func (i *issuer) Update() {
 	}
 
 	// Issue a repoll
-	i.t.errs.Add(i.t.repoll())
+	i.t.repoll()
 }
 
 type vtxIssuer struct{ i *issuer }
diff --git a/snow/engine/avalanche/transitive.go b/snow/engine/avalanche/transitive.go
@@ -365,15 +365,10 @@ func (t *Transitive) attemptToIssueTxs() error {
 // If there are pending transactions from the VM, issue them.
 // If we're not already at the limit for number of concurrent polls, issue a new
 // query.
-func (t *Transitive) repoll() error {
-	if t.polls.Len() >= t.Params.ConcurrentRepolls || t.errs.Errored() {
-		return nil
-	}
-
-	for i := t.polls.Len(); i < t.Params.ConcurrentRepolls; i++ {
+func (t *Transitive) repoll() {
+	for i := t.polls.Len(); i < t.Params.ConcurrentRepolls && !t.errs.Errored(); i++ {
 		t.issueRepoll()
 	}
-	return nil
 }
 
 // issueFromByID issues the branch ending with vertex [vtxID] to consensus.
diff --git a/snow/engine/avalanche/transitive_test.go b/snow/engine/avalanche/transitive_test.go
@@ -1109,7 +1109,8 @@ func TestEngineIssueRepoll(t *testing.T) {
 		}
 	}
 
-	if err := te.repoll(); err != nil {
+	te.repoll()
+	if err := te.errs.Err; err != nil {
 		t.Fatal(err)
 	}
 }
diff --git a/snow/engine/avalanche/voter.go b/snow/engine/avalanche/voter.go
@@ -73,7 +73,7 @@ func (v *voter) Update() {
 	}
 
 	v.t.Ctx.Log.Debug("Avalanche engine can't quiesce")
-	v.t.errs.Add(v.t.repoll())
+	v.t.repoll()
 }
 
 func (v *voter) bubbleVotes(votes ids.UniqueBag) (ids.UniqueBag, error) {
diff --git a/snow/networking/router/chain_router.go b/snow/networking/router/chain_router.go
@@ -101,7 +101,7 @@ func (cr *ChainRouter) Initialize(
 	cr.healthConfig = healthConfig
 
 	// Register metrics
-	rMetrics, err := newRouterMetrics(cr.log, metricsNamespace, metricsRegisterer)
+	rMetrics, err := newRouterMetrics(metricsNamespace, metricsRegisterer)
 	if err != nil {
 		return err
 	}
@@ -787,22 +787,14 @@ func (cr *ChainRouter) HealthCheck() (interface{}, error) {
 	healthy = healthy && numOutstandingReqs <= cr.healthConfig.MaxOutstandingRequests
 	details["outstandingRequests"] = numOutstandingReqs
 
-	now := cr.clock.Time()
-	if numOutstandingReqs == 0 {
-		cr.lastTimeNoOutstanding = now
-	}
-	timeSinceNoOutstandingRequests := now.Sub(cr.lastTimeNoOutstanding)
-	healthy = healthy && timeSinceNoOutstandingRequests <= cr.healthConfig.MaxTimeSinceNoOutstandingRequests
-	details["timeSinceNoOutstandingRequests"] = timeSinceNoOutstandingRequests.String()
-	cr.metrics.timeSinceNoOutstandingRequests.Set(float64(timeSinceNoOutstandingRequests.Milliseconds()))
-
 	// check for long running requests
+	now := cr.clock.Time()
 	processingRequest := now
 	if longestRunning, exists := cr.timedRequests.Oldest(); exists {
 		processingRequest = longestRunning.(requestEntry).time
 	}
 	timeReqRunning := now.Sub(processingRequest)
-	healthy = healthy && timeReqRunning <= cr.healthConfig.MaxTimeSinceNoOutstandingRequests
+	healthy = healthy && timeReqRunning <= cr.healthConfig.MaxOutstandingDuration
 	details["longestRunningRequest"] = timeReqRunning.String()
 	cr.metrics.longestRunningRequest.Set(float64(timeReqRunning.Milliseconds()))
 
diff --git a/snow/networking/router/chain_router_metrics.go b/snow/networking/router/chain_router_metrics.go
@@ -4,20 +4,18 @@
 package router
 
 import (
-	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
 // routerMetrics about router messages
 type routerMetrics struct {
-	outstandingRequests            prometheus.Gauge
-	msgDropRate                    prometheus.Gauge
-	timeSinceNoOutstandingRequests prometheus.Gauge
-	longestRunningRequest          prometheus.Gauge
+	outstandingRequests   prometheus.Gauge
+	msgDropRate           prometheus.Gauge
+	longestRunningRequest prometheus.Gauge
 }
 
-func newRouterMetrics(log logging.Logger, namespace string, registerer prometheus.Registerer) (*routerMetrics, error) {
+func newRouterMetrics(namespace string, registerer prometheus.Registerer) (*routerMetrics, error) {
 	rMetrics := &routerMetrics{}
 	rMetrics.outstandingRequests = prometheus.NewGauge(
 		prometheus.GaugeOpts{
@@ -33,13 +31,6 @@ func newRouterMetrics(log logging.Logger, namespace string, registerer prometheu
 			Help:      "Rate of messages dropped",
 		},
 	)
-	rMetrics.timeSinceNoOutstandingRequests = prometheus.NewGauge(
-		prometheus.GaugeOpts{
-			Namespace: namespace,
-			Name:      "time_since_no_outstanding_requests",
-			Help:      "Time with no requests being processed in milliseconds",
-		},
-	)
 	rMetrics.longestRunningRequest = prometheus.NewGauge(
 		prometheus.GaugeOpts{
 			Namespace: namespace,
@@ -52,7 +43,6 @@ func newRouterMetrics(log logging.Logger, namespace string, registerer prometheu
 	errs.Add(
 		registerer.Register(rMetrics.outstandingRequests),
 		registerer.Register(rMetrics.msgDropRate),
-		registerer.Register(rMetrics.timeSinceNoOutstandingRequests),
 		registerer.Register(rMetrics.longestRunningRequest),
 	)
 	return rMetrics, errs.Err
diff --git a/snow/networking/router/health.go b/snow/networking/router/health.go
@@ -16,9 +16,8 @@ type HealthConfig struct {
 	// Must be > 0
 	MaxOutstandingRequests int
 
-	// Reports unhealthy if there is at least 1 outstanding request continuously
-	// for longer than this
-	MaxTimeSinceNoOutstandingRequests time.Duration
+	// Reports unhealthy if there is a request outstanding for longer than this
+	MaxOutstandingDuration time.Duration
 
 	// Reports unhealthy if there is at least 1 outstanding not processed
 	// before this mark
diff --git a/snow/networking/router/msg_manager.go b/snow/networking/router/msg_manager.go
@@ -37,7 +37,6 @@ type msgManager struct {
 	vdrs                           validators.Set
 	maxNonStakerPendingMsgs        uint32
 	poolMessages, reservedMessages uint32
-	stakerMsgPortion               float64
 	msgTracker                     tracker.CountingTracker
 	stakerCPUPortion               float64
 	cpuTracker                     tracker.TimeTracker
diff --git a/snow/networking/router/service_queue.go b/snow/networking/router/service_queue.go
@@ -41,7 +41,6 @@ type multiLevelQueue struct {
 	queues        []singleLevelQueue
 	cpuRanges     []float64       // CPU Utilization ranges that should be attributed to a corresponding queue
 	cpuAllotments []time.Duration // Allotments of CPU time per cycle that should be spent on each level of queue
-	cpuPortion    float64
 
 	// Message throttling
 	maxPendingMsgs  uint32
diff --git a/utils/logging/log.go b/utils/logging/log.go
@@ -363,7 +363,7 @@ func (fw *fileWriter) Close() error {
 
 func (fw *fileWriter) Rotate() error {
 	fw.fileIndex = (fw.fileIndex + 1) % fw.config.RotationSize
-	writer, file, err := fw.create(fw.fileIndex)
+	writer, file, err := fw.create()
 	if err != nil {
 		return err
 	}
@@ -372,7 +372,7 @@ func (fw *fileWriter) Rotate() error {
 	return nil
 }
 
-func (fw *fileWriter) create(fileIndex int) (*bufio.Writer, *os.File, error) {
+func (fw *fileWriter) create() (*bufio.Writer, *os.File, error) {
 	filename := filepath.Join(fw.config.Directory, fmt.Sprintf("%d.log", fw.fileIndex))
 	file, err := perms.Create(filename, perms.ReadWrite)
 	if err != nil {
@@ -384,7 +384,7 @@ func (fw *fileWriter) create(fileIndex int) (*bufio.Writer, *os.File, error) {
 
 func (fw *fileWriter) Initialize(config Config) error {
 	fw.config = config
-	writer, file, err := fw.create(fw.fileIndex)
+	writer, file, err := fw.create()
 	if err != nil {
 		return err
 	}
diff --git a/vms/platformvm/service.go b/vms/platformvm/service.go
@@ -2035,7 +2035,7 @@ func (service *Service) getStakeHelper(tx *Tx, addrs ids.ShortSet) (uint64, []av
 	var (
 		totalAmountStaked uint64
 		err               error
-		stakedOuts        []avax.TransferableOutput
+		stakedOuts        = make([]avax.TransferableOutput, 0, len(outs))
 	)
 	// Go through all of the staked outputs
 	for _, stake := range outs {
@@ -2064,15 +2064,6 @@ func (service *Service) getStakeHelper(tx *Tx, addrs ids.ShortSet) (uint64, []av
 			// This output isn't owned by one of the given addresses. Ignore.
 			continue
 		}
-		// Parse the owners of this output to their formatted string representations
-		ownersStrs := []string{}
-		for _, addr := range secpOut.Addrs {
-			addrStr, err := service.vm.FormatLocalAddress(addr)
-			if err != nil {
-				return 0, nil, fmt.Errorf("couldn't format address %s: %w", addr, err)
-			}
-			ownersStrs = append(ownersStrs, addrStr)
-		}
 		totalAmountStaked, err = math.Add64(totalAmountStaked, stake.Out.Amount())
 		if err != nil {
 			return 0, stakedOuts, err
diff --git a/vms/platformvm/static_service.go b/vms/platformvm/static_service.go
@@ -233,7 +233,6 @@ func (ss *StaticService) BuildGenesis(_ *http.Request, args *BuildGenesisArgs, r
 		weight := uint64(0)
 		stake := make([]*avax.TransferableOutput, len(validator.Staked))
 		sortAPIUTXOs(validator.Staked)
-		memo := []byte(nil)
 		for i, apiUTXO := range validator.Staked {
 			addrID, err := bech32ToID(apiUTXO.Address)
 			if err != nil {
@@ -264,11 +263,6 @@ func (ss *StaticService) BuildGenesis(_ *http.Request, args *BuildGenesisArgs, r
 				return errStakeOverflow
 			}
 			weight = newWeight
-			messageBytes, err := formatting.Decode(args.Encoding, apiUTXO.Message)
-			if err != nil {
-				return fmt.Errorf("problem decoding validator UTXO message bytes: %w", err)
-			}
-			memo = append(memo, messageBytes...)
 		}
 
 		if weight == 0 {
diff --git a/vms/platformvm/vm.go b/vms/platformvm/vm.go
diff --git a/vms/platformvm/vm_test.go b/vms/platformvm/vm_test.go

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func (i *issuer) Update() {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`// Issue a repoll`
`113`		`- i.t.errs.Add(i.t.repoll())`
	`113`	`+ i.t.repoll()`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`type vtxIssuer struct{ i *issuer }`
Original file line number	Diff line number	Diff line change
`@@ -1109,7 +1109,8 @@ func TestEngineIssueRepoll(t *testing.T) {`
`1109`	`1109`	`}`
`1110`	`1110`	`}`
`1111`	`1111`
`1112`		`- if err := te.repoll(); err != nil {`
	`1112`	`+ te.repoll()`
	`1113`	`+ if err := te.errs.Err; err != nil {`
`1113`	`1114`	`t.Fatal(err)`
`1114`	`1115`	`}`
`1115`	`1116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func (v *voter) Update() {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`v.t.Ctx.Log.Debug("Avalanche engine can't quiesce")`
`76`		`- v.t.errs.Add(v.t.repoll())`
	`76`	`+ v.t.repoll()`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`func (v *voter) bubbleVotes(votes ids.UniqueBag) (ids.UniqueBag, error) {`