all: Avoid watching empty sets of keys

TheThingsNetwork · Jul 26, 2023 · 19b668c · 19b668c
1 parent c9022ba
commit 19b668c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/pkg/applicationserver/redis/registry.go b/pkg/applicationserver/redis/registry.go
@@ -505,8 +505,13 @@ func (r *DeviceRegistry) BatchDelete(
 				}
 			}
 		}
-		if err := tx.Watch(ctx, euiKeys...).Err(); err != nil {
-			return err
+		// If the provided end device identifiers are not registered, it is possible
+		// that the `euiKeys` set will be empty. `WATCH` does not allow an empty set
+		// of keys to be provided, and as such must be manually skipped.
+		if len(euiKeys) > 0 {
+			if err := tx.Watch(ctx, euiKeys...).Err(); err != nil {
+				return err
+			}
 		}
 		if _, err := tx.TxPipelined(ctx, func(p redis.Pipeliner) error {
 			p.Del(ctx, append(uidKeys, euiKeys...)...)

diff --git a/pkg/joinserver/redis/registry.go b/pkg/joinserver/redis/registry.go
@@ -879,8 +879,13 @@ func (r *DeviceRegistry) BatchDelete(
 				}
 			}
 		}
-		if err := tx.Watch(ctx, keys...).Err(); err != nil {
-			return err
+		// If the provided end device identifiers are not registered, it is possible
+		// that the `keys` set will be empty. `WATCH` does not allow an empty set of
+		// keys to be provided, and as such must be manually skipped.
+		if len(keys) > 0 {
+			if err := tx.Watch(ctx, keys...).Err(); err != nil {
+				return err
+			}
 		}
 		if _, err := tx.TxPipelined(ctx, func(p redis.Pipeliner) error {
 			p.Del(ctx, append(uidKeys, keys...)...)

diff --git a/pkg/networkserver/redis/registry.go b/pkg/networkserver/redis/registry.go
@@ -1024,8 +1024,13 @@ func (r *DeviceRegistry) BatchDelete(
 				}
 			}
 		}
-		if err := tx.Watch(ctx, euiKeys...).Err(); err != nil {
-			return err
+		// If the provided end device identifiers are not registered, it is possible
+		// that the `euiKeys` set will be empty. `WATCH` does not allow an empty set
+		// of keys to be provided, and as such must be manually skipped.
+		if len(euiKeys) > 0 {
+			if err := tx.Watch(ctx, euiKeys...).Err(); err != nil {
+				return err
+			}
 		}
 		if _, err := tx.TxPipelined(ctx, func(p redis.Pipeliner) error {
 			p.Del(ctx, append(uidKeys, euiKeys...)...)