Calculate PITR node priority based on DefaultScore

Author: jcechace

cmd/pbm-agent/backup.go

@@ -302,7 +302,7 @@ func (a *Agent) deprioritizePITRNodes(
 
 		// Only set if not already present (preserve previous priorities)
 		if _, exists := coefficients[pl.Node]; !exists {
-			coefficients[pl.Node] = 0.6 // low priority, making it a last resort
+			coefficients[pl.Node] = prio.DefaultScore - 0.1
 		}
 	}
 

pbm/prio/priority.go

@@ -9,9 +9,9 @@ import (
 )
 
 const (
-	defaultScore     = 1.0
-	scoreForPrimary  = defaultScore / 2
-	scoreForHidden   = defaultScore * 2
+	DefaultScore     = 1.0
+	scoreForPrimary  = DefaultScore / 2
+	scoreForHidden   = DefaultScore * 2
 	scoreForExcluded = 0
 )
 
@@ -114,23 +114,23 @@ func CalcPriorityForNode(node *topo.NodeInfo) float64 {
 		return scoreForHidden
 	}
 
-	return defaultScore
+	return DefaultScore
 }
 
 // implicitPrioCalc provides priority calculation based on topology rules.
 // Instead of using explicitly specified priority numbers, topology rules are
 // applied for primary, secondary and hidden member.
 func implicitPrioCalc(a *topo.AgentStat, rule map[string]float64) float64 {
 	if coeff, ok := rule[a.Node]; ok && rule != nil {
-		return defaultScore * coeff
+		return DefaultScore * coeff
 	} else if a.State == defs.NodeStatePrimary {
 		return scoreForPrimary
 	} else if a.DelaySecs > 0 {
 		return scoreForExcluded
 	} else if a.Hidden {
 		return scoreForHidden
 	}
-	return defaultScore
+	return DefaultScore
 }
 
 // explicitPrioCalc uses priority numbers from configuration to calculate
@@ -139,7 +139,7 @@ func implicitPrioCalc(a *topo.AgentStat, rule map[string]float64) float64 {
 func explicitPrioCalc(a *topo.AgentStat, rule map[string]float64) float64 {
 	sc, ok := rule[a.Node]
 	if !ok || sc < 0 {
-		return defaultScore
+		return DefaultScore
 	}
 
 	return sc

pbm/prio/priority_test.go

@@ -396,8 +396,8 @@ func TestCalcPriorityForNode(t *testing.T) {
 		}
 
 		p := CalcPriorityForNode(nodeInfo)
-		if p != defaultScore {
-			t.Errorf("wrong priority for secondary: want=%v, got=%v", defaultScore, p)
+		if p != DefaultScore {
+			t.Errorf("wrong priority for secondary: want=%v, got=%v", DefaultScore, p)
 		}
 	})
 
@@ -470,8 +470,8 @@ func TestImplicitPrioCalc(t *testing.T) {
 
 		p := implicitPrioCalc(agentStat, nil)
 
-		if p != defaultScore {
-			t.Errorf("wrong priority for secondary: want=%v, got=%v", defaultScore, p)
+		if p != DefaultScore {
+			t.Errorf("wrong priority for secondary: want=%v, got=%v", DefaultScore, p)
 		}
 	})