Merge pull request #32 from castaneai/fix-overlapping-checker

Fix overlapping checker
castaneai · Nov 5, 2024 · c4b6628 · c4b6628
2 parents 420aad7 + 3613939
commit c4b6628
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/loadtest/cmd/backend/main.go b/loadtest/cmd/backend/main.go
@@ -31,11 +31,13 @@ import (
 
 const (
 	minimatchComponentKey = attribute.Key("component")
+	roleKey               = attribute.Key("role")
 )
 
 type config struct {
 	RedisAddr                 string        `envconfig:"REDIS_ADDR" default:"127.0.0.1:6379"`
 	AssignmentRedisAddr       string        `envconfig:"REDIS_ADDR_ASSIGNMENT"`
+	RedisAddrReadReplica      string        `envconfig:"REDIS_ADDR_READ_REPLICA"`
 	TickRate                  time.Duration `envconfig:"TICK_RATE" default:"1s"`
 	TicketCacheTTL            time.Duration `envconfig:"TICKET_CACHE_TTL" default:"10s"`
 	OverlappingCheckRedisAddr string        `envconfig:"OVERLAPPING_CHECK_REDIS_ADDR"`
@@ -119,6 +121,16 @@ func newRedisStateStore(conf *config) (statestore.BackendStore, error) {
 		}
 		opts = append(opts, statestore.WithSeparatedAssignmentRedis(asRedis))
 	}
+	if conf.RedisAddrReadReplica != "" {
+		replica, err := rueidisotel.NewClient(rueidis.ClientOption{
+			InitAddress:  []string{conf.RedisAddrReadReplica},
+			DisableCache: true,
+		}, rueidisotel.MetricAttrs(minimatchComponentKey.String("backend"), roleKey.String("replica")))
+		if err != nil {
+			return nil, fmt.Errorf("failed to new read-replica redis client: %w", err)
+		}
+		opts = append(opts, statestore.WithRedisReadReplicaClient(replica))
+	}
 	locker, err := rueidislock.NewLocker(rueidislock.LockerOption{
 		ClientOption:   copt,
 		ExtendInterval: 200 * time.Millisecond,
@@ -218,6 +230,8 @@ func (a *assignerWithOverlappingChecker) Assign(ctx context.Context, matches []*
 		for _, ticket := range match.Tickets {
 			if _, ok := ticketIDMap[ticket.Id]; ok {
 				a.overlappingWithin.Add(ctx, 1)
+			} else {
+				ticketIDMap[ticket.Id] = struct{}{}
 			}
 		}
 	}

diff --git a/loadtest/cmd/frontend/main.go b/loadtest/cmd/frontend/main.go
@@ -31,13 +31,15 @@ import (
 
 const (
 	minimatchComponentKey = attribute.Key("component")
+	roleKey               = attribute.Key("role")
 )
 
 type config struct {
-	RedisAddr           string        `envconfig:"REDIS_ADDR" default:"127.0.0.1:6379"`
-	AssignmentRedisAddr string        `envconfig:"REDIS_ADDR_ASSIGNMENT"`
-	Port                string        `envconfig:"PORT" default:"50504"`
-	TicketCacheTTL      time.Duration `envconfig:"TICKET_CACHE_TTL" default:"10s"`
+	RedisAddr            string        `envconfig:"REDIS_ADDR" default:"127.0.0.1:6379"`
+	AssignmentRedisAddr  string        `envconfig:"REDIS_ADDR_ASSIGNMENT"`
+	RedisAddrReadReplica string        `envconfig:"REDIS_ADDR_READ_REPLICA"`
+	Port                 string        `envconfig:"PORT" default:"50504"`
+	TicketCacheTTL       time.Duration `envconfig:"TICKET_CACHE_TTL" default:"10s"`
 }
 
 func main() {
@@ -102,6 +104,16 @@ func newRedisStateStore(conf *config) (statestore.FrontendStore, error) {
 		}
 		opts = append(opts, statestore.WithSeparatedAssignmentRedis(asRedis))
 	}
+	if conf.RedisAddrReadReplica != "" {
+		replica, err := rueidisotel.NewClient(rueidis.ClientOption{
+			InitAddress:  []string{conf.RedisAddrReadReplica},
+			DisableCache: true,
+		}, rueidisotel.MetricAttrs(minimatchComponentKey.String("backend"), roleKey.String("replica")))
+		if err != nil {
+			return nil, fmt.Errorf("failed to new read-replica redis client: %w", err)
+		}
+		opts = append(opts, statestore.WithRedisReadReplicaClient(replica))
+	}
 	locker, err := rueidislock.NewLocker(rueidislock.LockerOption{
 		ClientOption: copt,
 	})

diff --git a/loadtest/skaffold.yaml b/loadtest/skaffold.yaml
@@ -33,17 +33,21 @@ deploy:
           frontend.deployment.replicas: 1
           frontend.deployment.env:
             - name: REDIS_ADDR
-              value: "10.23.1.3:6379"
-#            - name: REDIS_ADDR_ASSIGNMENT
-#              value: "10.23.1.11:6379"
+              value: "10.23.1.21:6379"
+            - name: REDIS_ADDR_ASSIGNMENT
+              value: "10.23.1.11:6379"
+            - name: REDIS_ADDR_READ_REPLICA
+              value: "10.23.1.20:6379"
           backend.deployment.replicas: 1
           backend.deployment.env:
             - name: REDIS_ADDR
-              value: "10.23.1.3:6379"
+              value: "10.23.1.21:6379"
             - name: OVERLAPPING_CHECK_REDIS_ADDR
               value: "10.23.1.11:6379"
-#            - name: REDIS_ADDR_ASSIGNMENT
-#              value: "10.23.1.11:6379"
+            - name: REDIS_ADDR_ASSIGNMENT
+              value: "10.23.1.11:6379"
+            - name: REDIS_ADDR_READ_REPLICA
+              value: "10.23.1.20:6379"
             - name: TICK_RATE
               value: "100ms"
           podMonitor.enabled: true