Fix whitelist upload batching (#612)

mattermost · Apr 19, 2024 · ad14ade · ad14ade
1 parent 9c70367
commit ad14ade
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/server/api.go b/server/api.go
@@ -807,6 +807,8 @@ func (a *API) updateWhitelist(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	a.p.API.LogInfo("Whitelist updated", "size", len(ids))
+
 	w.WriteHeader(http.StatusOK)
 	w.Header().Set("Content-Type", "application/json")
 	if err := json.NewEncoder(w).Encode(&UpdateWhitelistResult{

diff --git a/server/store/sqlstore/store.go b/server/store/sqlstore/store.go
@@ -1006,11 +1006,12 @@ func (s *SQLStore) SetWhitelist(userIDs []string, batchSize int) error {
 	for i, id := range userIDs {
 		currentBatch = append(currentBatch, id)
 		if len(currentBatch) >= batchSize || i == len(userIDs)-1 {
+			// batch threshold met, or end of list
 			if err = s.storeUsersInWhitelist(currentBatch, tx); err != nil {
 				s.api.LogDebug("Error adding batched users to whitelist", "error", err.Error(), "userIds", currentBatch)
 				return err
 			}
-			clear(currentBatch)
+			currentBatch = nil
 		}
 	}