drop category

Author: menghanl

balancer/xds/edsbalancer/edsbalancer.go

@@ -138,7 +138,7 @@ func (xdsB *EDSBalancer) updateDrops(dropPolicies []*edspb.ClusterLoadAssignment
 		case percentpb.FractionalPercent_MILLION:
 			denominator = 1000000
 		}
-		newDrops = append(newDrops, newDropper(numerator, denominator))
+		newDrops = append(newDrops, newDropper(numerator, denominator, dropPolicy.GetCategory()))
 
 		// The following reading xdsB.drops doesn't need mutex because it can only
 		// be updated by the code following.

balancer/xds/edsbalancer/edsbalancer_test.go

@@ -480,22 +480,22 @@ func TestDropPicker(t *testing.T) {
 		{
 			name: "one drop",
 			drops: []*dropper{
-				newDropper(1, 2),
+				newDropper(1, 2, ""),
 			},
 		},
 		{
 			name: "two drops",
 			drops: []*dropper{
-				newDropper(1, 3),
-				newDropper(1, 2),
+				newDropper(1, 3, ""),
+				newDropper(1, 2, ""),
 			},
 		},
 		{
 			name: "three drops",
 			drops: []*dropper{
-				newDropper(1, 3),
-				newDropper(1, 4),
-				newDropper(1, 2),
+				newDropper(1, 3, ""),
+				newDropper(1, 4, ""),
+				newDropper(1, 2, ""),
 			},
 		},
 	}

balancer/xds/edsbalancer/util.go

@@ -25,9 +25,10 @@ type dropper struct {
 	numerator   uint32
 	denominator uint32
 	w           wrr.WRR
+	category    string
 }
 
-func newDropper(numerator, denominator uint32) *dropper {
+func newDropper(numerator, denominator uint32, category string) *dropper {
 	w := newRandomWRR()
 	w.Add(true, int64(numerator))
 	w.Add(false, int64(denominator-numerator))
@@ -36,6 +37,7 @@ func newDropper(numerator, denominator uint32) *dropper {
 		numerator:   numerator,
 		denominator: denominator,
 		w:           w,
+		category:    category,
 	}
 }
 

balancer/xds/edsbalancer/util_test.go

@@ -106,7 +106,7 @@ func TestDropper(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			d := newDropper(tt.args.numerator, tt.args.denominator)
+			d := newDropper(tt.args.numerator, tt.args.denominator, "")
 			var (
 				dCount    int
 				wantCount = int(tt.args.numerator) * repeat