Remove expired/unthrottled rules from topo rather than set them to 0 …

…expiration duration Signed-off-by: Shlomi Noach <[email protected]>
vitessio · Nov 25, 2024 · e3fda9a · e3fda9a
1 parent 0b51839
commit e3fda9a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/go/vt/schemamanager/tablet_executor.go b/go/vt/schemamanager/tablet_executor.go
@@ -249,14 +249,12 @@ func (exec *TabletExecutor) executeAlterMigrationThrottle(ctx context.Context, a
 			throttlerConfig.ThrottledApps = make(map[string]*topodatapb.ThrottledAppRule)
 		}
 		if req.ThrottledApp != nil && req.ThrottledApp.Name != "" {
-			// TODO(shlomi) in v22: replace the following line with the commented out block
-			throttlerConfig.ThrottledApps[req.ThrottledApp.Name] = req.ThrottledApp
-			// timeNow := time.Now()
-			// if protoutil.TimeFromProto(req.ThrottledApp.ExpiresAt).After(timeNow) {
-			// 	throttlerConfig.ThrottledApps[req.ThrottledApp.Name] = req.ThrottledApp
-			// } else {
-			// 	delete(throttlerConfig.ThrottledApps, req.ThrottledApp.Name)
-			// }
+			timeNow := time.Now()
+			if protoutil.TimeFromProto(req.ThrottledApp.ExpiresAt).After(timeNow) {
+				throttlerConfig.ThrottledApps[req.ThrottledApp.Name] = req.ThrottledApp
+			} else {
+				delete(throttlerConfig.ThrottledApps, req.ThrottledApp.Name)
+			}
 		}
 
 		return throttlerConfig

diff --git a/go/vt/vtctl/grpcvtctldserver/server.go b/go/vt/vtctl/grpcvtctldserver/server.go
@@ -2096,14 +2096,12 @@ func (s *VtctldServer) UpdateThrottlerConfig(ctx context.Context, req *vtctldata
 			throttlerConfig.CheckAsCheckSelf = false
 		}
 		if req.ThrottledApp != nil && req.ThrottledApp.Name != "" {
-			// TODO(shlomi) in v22: replace the following line with the commented out block
-			throttlerConfig.ThrottledApps[req.ThrottledApp.Name] = req.ThrottledApp
-			// 	timeNow := time.Now()
-			// if protoutil.TimeFromProto(req.ThrottledApp.ExpiresAt).After(timeNow) {
-			// 	throttlerConfig.ThrottledApps[req.ThrottledApp.Name] = req.ThrottledApp
-			// } else {
-			// 	delete(throttlerConfig.ThrottledApps, req.ThrottledApp.Name)
-			// }
+			timeNow := time.Now()
+			if protoutil.TimeFromProto(req.ThrottledApp.ExpiresAt).After(timeNow) {
+				throttlerConfig.ThrottledApps[req.ThrottledApp.Name] = req.ThrottledApp
+			} else {
+				delete(throttlerConfig.ThrottledApps, req.ThrottledApp.Name)
+			}
 		}
 		return throttlerConfig
 	}

diff --git a/go/vt/vtgate/vcursor_impl.go b/go/vt/vtgate/vcursor_impl.go
@@ -30,6 +30,7 @@ import (
 	"vitess.io/vitess/go/mysql/collations"
 	"vitess.io/vitess/go/mysql/config"
 	"vitess.io/vitess/go/mysql/sqlerror"
+	"vitess.io/vitess/go/protoutil"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/callerid"
 	"vitess.io/vitess/go/vt/discovery"
@@ -1343,14 +1344,12 @@ func (vc *vcursorImpl) ThrottleApp(ctx context.Context, throttledAppRule *topoda
 			throttlerConfig.ThrottledApps = make(map[string]*topodatapb.ThrottledAppRule)
 		}
 		if req.ThrottledApp != nil && req.ThrottledApp.Name != "" {
-			// TODO(shlomi) in v22: replace the following line with the commented out block
-			throttlerConfig.ThrottledApps[req.ThrottledApp.Name] = req.ThrottledApp
-			// timeNow := time.Now()
-			// if protoutil.TimeFromProto(req.ThrottledApp.ExpiresAt).After(timeNow) {
-			// 	throttlerConfig.ThrottledApps[req.ThrottledApp.Name] = req.ThrottledApp
-			// } else {
-			// 	delete(throttlerConfig.ThrottledApps, req.ThrottledApp.Name)
-			// }
+			timeNow := time.Now()
+			if protoutil.TimeFromProto(req.ThrottledApp.ExpiresAt).After(timeNow) {
+				throttlerConfig.ThrottledApps[req.ThrottledApp.Name] = req.ThrottledApp
+			} else {
+				delete(throttlerConfig.ThrottledApps, req.ThrottledApp.Name)
+			}
 		}
 		return throttlerConfig
 	}