fix unthrottle logic

Author: meiji163

pkg/http/api.go

@@ -273,12 +273,21 @@ response:
 	api.respondGeneric(w, r, err)
 }
 
-// ThrottleApp unthrottles given app.
+// UnthrottleApp unthrottles given app.
 func (api *APIImpl) UnthrottleApp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	appName := ps.ByName("app")
-	err := api.consensusService.UnthrottleApp(appName)
-
-	api.respondGeneric(w, r, err)
+	appWithStorePrefix := appName + "/"
+
+	for app := range api.consensusService.ThrottledAppsMap() {
+		if app == appName || strings.HasPrefix(app, appWithStorePrefix) {
+			err := api.consensusService.UnthrottleApp(app)
+			if err != nil {
+				api.respondGeneric(w, r, err)
+				return
+			}
+		}
+	}
+	api.respondGeneric(w, r, nil)
 }
 
 // ThrottledApps returns a snapshot of all currently throttled apps

pkg/throttle/throttler.go

@@ -524,24 +524,19 @@ func (throttler *Throttler) ThrottleApp(appName string, expireAt time.Time, rati
 }
 
 func (throttler *Throttler) UnthrottleApp(appName string) {
-	appWithStore := appName + "/"
-	for app, _ := range throttler.throttledApps.Items() {
-		if app == appName || strings.HasPrefix(app, appWithStore) {
-			throttler.throttledApps.Delete(app)
-		}
-	}
+	throttler.throttledApps.Delete(appName)
 }
 
 func (throttler *Throttler) IsAppThrottled(appName, storeName string) bool {
 	appWithStore := fmt.Sprintf("%s/%s", appName, storeName)
 	keys := []string{appWithStore, appName}
-	// check if app is throttled globally
+	// check if app is throttled for this store or globally
 	for _, key := range keys {
 		if object, found := throttler.throttledApps.Get(key); found {
 			appThrottle := object.(*base.AppThrottle)
 			if appThrottle.ExpireAt.Before(time.Now()) {
 				// throttling cleanup hasn't purged yet, but it is expired
-				return false
+				continue
 			}
 			// handle ratio
 			if rand.Float64() < appThrottle.Ratio {