worker: don't record host scan on 'successfull failure'

worker/interactions.go

@@ -1,16 +1,14 @@
 package worker
 
-func isSuccessfulInteraction(err error) bool {
-	// No error always means success.
-	if err == nil {
-		return true
-	}
-	// List of errors that are considered successful interactions.
+func shouldRecordPriceTable(err error) bool {
+	// List of errors that are considered 'successful' failures. Meaning that
+	// the host was reachable but we were unable to obtain a price table due to
+	// reasons out of the host's control.
 	if isInsufficientFunds(err) {
-		return true
+		return false
 	}
 	if isBalanceInsufficient(err) {
-		return true
+		return false
 	}
-	return false
+	return true
 }

worker/pricetables.go

@@ -174,16 +174,18 @@ func (p *priceTable) fetch(ctx context.Context, rev *types.FileContractRevision)
 	hpt, err = h.FetchPriceTable(ctx, rev)
 
 	// record it in the background
-	go func(hpt api.HostPriceTable, success bool) {
-		p.hs.RecordPriceTables(context.Background(), []api.HostPriceTableUpdate{
-			{
-				HostKey:    p.hk,
-				Success:    success,
-				Timestamp:  time.Now(),
-				PriceTable: hpt,
-			},
-		})
-	}(hpt, isSuccessfulInteraction(err))
+	if shouldRecordPriceTable(err) {
+		go func(hpt api.HostPriceTable, success bool) {
+			p.hs.RecordPriceTables(context.Background(), []api.HostPriceTableUpdate{
+				{
+					HostKey:    p.hk,
+					Success:    success,
+					Timestamp:  time.Now(),
+					PriceTable: hpt,
+				},
+			})
+		}(hpt, err == nil)
+	}
 
 	// handle error after recording
 	if err != nil {

worker/worker.go

@@ -354,14 +354,16 @@ func (w *worker) rhpPriceTableHandler(jc jape.Context) {
 	var err error
 	var hpt api.HostPriceTable
 	defer func() {
-		w.bus.RecordPriceTables(jc.Request.Context(), []api.HostPriceTableUpdate{
-			{
-				HostKey:    rptr.HostKey,
-				Success:    isSuccessfulInteraction(err),
-				Timestamp:  time.Now(),
-				PriceTable: hpt,
-			},
-		})
+		if shouldRecordPriceTable(err) {
+			w.bus.RecordPriceTables(jc.Request.Context(), []api.HostPriceTableUpdate{
+				{
+					HostKey:    rptr.HostKey,
+					Success:    err == nil,
+					Timestamp:  time.Now(),
+					PriceTable: hpt,
+				},
+			})
+		}
 	}()
 
 	// apply timeout
@@ -1487,14 +1489,15 @@ func (w *worker) scanHost(ctx context.Context, timeout time.Duration, hostKey ty
 			HostKey:    hostKey,
 			PriceTable: pt,
 			Subnets:    subnets,
-			Success:    isSuccessfulInteraction(err),
+			Success:    err == nil,
 			Settings:   settings,
 			Timestamp:  time.Now(),
 		},
 	})
 	if scanErr != nil {
 		logger.Errorw("failed to record host scan", zap.Error(scanErr))
 	}
+	logger.With(zap.Error(err)).Debugw("scanned host", "success", err == nil)
 	return settings, pt, duration, err
 }