Properly return ErrCompacted/ErrFutureRev for get/list

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond · Oct 27, 2023 · 2104937 · 2104937
1 parent e438216
commit 2104937
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/pkg/logstructured/logstructured.go b/pkg/logstructured/logstructured.go
@@ -59,10 +59,6 @@ func (l *LogStructured) Get(ctx context.Context, key, rangeEnd string, limit, re
 
 func (l *LogStructured) get(ctx context.Context, key, rangeEnd string, limit, revision int64, includeDeletes bool) (int64, *server.Event, error) {
 	rev, events, err := l.log.List(ctx, key, rangeEnd, limit, revision, includeDeletes)
-	if err == server.ErrCompacted {
-		// ignore compacted when getting by revision
-		err = nil
-	}
 	if err != nil {
 		return 0, nil, err
 	}

diff --git a/pkg/logstructured/sqllog/sql.go b/pkg/logstructured/sqllog/sql.go
@@ -287,13 +287,21 @@ func (s *SQLLog) List(ctx context.Context, prefix, startKey string, limit, revis
 	}
 
 	if revision > 0 && len(result) == 0 {
-		// a zero length result won't have the compact revision so get it manually
+		// a zero length result won't have the compact or current revisions so get them manually
+		rev, err = s.d.CurrentRevision(ctx)
+		if err != nil {
+			return 0, nil, err
+		}
 		compact, err = s.d.GetCompactRevision(ctx)
 		if err != nil {
 			return 0, nil, err
 		}
 	}
 
+	if revision > rev {
+		return rev, result, server.ErrFutureRev
+	}
+
 	if revision > 0 && revision < compact {
 		return rev, result, server.ErrCompacted
 	}

diff --git a/pkg/server/get.go b/pkg/server/get.go
@@ -22,6 +22,7 @@ func (l *LimitedServer) get(ctx context.Context, r *etcdserverpb.RangeRequest) (
 	}
 	if kv != nil {
 		resp.Kvs = []*KeyValue{kv}
+		resp.Count = 1
 	}
 	return resp, nil
 }
diff --git a/pkg/server/types.go b/pkg/server/types.go
@@ -14,6 +14,7 @@ var (
 
 	ErrKeyExists = rpctypes.ErrGRPCDuplicateKey
 	ErrCompacted = rpctypes.ErrGRPCCompacted
+	ErrFutureRev = rpctypes.ErrGRPCFutureRev
 )
 
 type Backend interface {