Merge pull request #89 from unicell/maglev

Add Maglev hashing to scheduler options in config.proto
google · Jun 12, 2020 · 3e9b09e · 3e9b09e
2 parents 5027e13 + e6d1760
commit 3e9b09e
Show file tree

Hide file tree

Showing 6 changed files with 173 additions and 84 deletions.
diff --git a/common/seesaw/seesaw.go b/common/seesaw/seesaw.go
@@ -316,6 +316,7 @@ const (
 	LBSchedulerLC
 	LBSchedulerWLC
 	LBSchedulerSH
+	LBSchedulerMH
 )
 
 var schedulerNames = map[LBScheduler]string{
@@ -325,6 +326,7 @@ var schedulerNames = map[LBScheduler]string{
 	LBSchedulerLC:   "lc",
 	LBSchedulerWLC:  "wlc",
 	LBSchedulerSH:   "sh",
+	LBSchedulerMH:   "mh",
 }
 
 // String returns the string representation of a LBScheduler.

diff --git a/engine/config/config.go b/engine/config/config.go
@@ -468,6 +468,8 @@ func addVservers(c *Cluster, p *pb.Cluster) error {
 				scheduler = seesaw.LBSchedulerWLC
 			case pb.VserverEntry_SH:
 				scheduler = seesaw.LBSchedulerSH
+			case pb.VserverEntry_MH:
+				scheduler = seesaw.LBSchedulerMH
 			default:
 				// TODO(angusc): Consider this VServer broken.
 				log.Errorf("%v: Unsupported scheduler %v", vs.GetName(), ve.GetScheduler())

diff --git a/engine/config/config_test.go b/engine/config/config_test.go
@@ -532,6 +532,46 @@ var vserverTests = []struct {
 			},
 		},
 	},
+	{
+		"1 Vserver with Unicast address and Maglev scheduler",
+		"vservers2.pb",
+		map[string]*Vserver{
+			"api.gateway1@as-hkg": {
+				"api.gateway1@as-hkg",
+				seesaw.Host{
+					Hostname: "gateway1-vip1.example.com.",
+					IPv4Addr: net.ParseIP("192.168.36.1").To4(),
+					IPv4Mask: net.CIDRMask(26, 32),
+					IPv6Addr: net.ParseIP("2015:cafe:36::a800:1ff:ffee:dd01"),
+					IPv6Mask: net.CIDRMask(64, 128),
+				},
+				map[string]*VserverEntry{
+					"443/TCP": {
+						Port:         443,
+						Proto:        seesaw.IPProtoTCP,
+						Scheduler:    seesaw.LBSchedulerMH,
+						Mode:         seesaw.LBModeDSR, // protobuf default
+						Healthchecks: make(map[string]*Healthcheck),
+					},
+				},
+				make(map[string]*seesaw.Backend),
+				make(map[string]*Healthcheck),
+				map[string]*seesaw.VIP{
+					"192.168.36.1 (Unicast)": {
+						seesaw.NewIP(net.ParseIP("192.168.36.1")),
+						seesaw.UnicastVIP,
+					},
+					"2015:cafe:36:0:a800:1ff:ffee:dd01 (Unicast)": {
+						seesaw.NewIP(net.ParseIP("2015:cafe:36::a800:1ff:ffee:dd01")),
+						seesaw.UnicastVIP,
+					},
+				},
+				true,
+				false,
+				nil,
+			},
+		},
+	},
 }
 
 func readHealthcheck(f string) (*pb.Healthcheck, error) {

diff --git a/engine/config/testdata/vservers2.pb b/engine/config/testdata/vservers2.pb
@@ -0,0 +1,20 @@
+seesaw_vip <
+  fqdn: "seesaw-vip1.example.com."
+  ipv4: "192.168.36.16/26"
+  status: PRODUCTION
+>
+vserver <
+  name: "api.gateway1@as-hkg"
+  rp: "foo"
+  entry_address <
+    fqdn: "gateway1-vip1.example.com."
+    ipv4: "192.168.36.1/26"
+    ipv6: "2015:cafe:36::a800:1ff:ffee:dd01/64"
+    status: PRODUCTION
+  >
+  vserver_entry <
+    protocol: TCP
+    port: 443
+    scheduler: MH
+  >
+>