github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121049 from siyuanfoundation/refactor

Browse Source 
k8s.io/apiserver/storage/etcd: refactor etcd GetList.
This commit is contained in:
Kubernetes Prow Robot 2023-10-31 10:49:33 +01:00 committed by GitHub
commit e8d45596df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
View File

@ -627,16 +627,12 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
limitOption = &options[len(options)-1] limitOption = &options[len(options)-1]
} }
newItemFunc := getNewItemFunc(listObj, v) if opts.Recursive {
rangeEnd := clientv3.GetPrefixRangeEnd(keyPrefix)
options = append(options, clientv3.WithRange(rangeEnd))
}
var fromRV *uint64 newItemFunc := getNewItemFunc(listObj, v)
if len(opts.ResourceVersion) > 0 {
parsedRV, err := s.versioner.ParseResourceVersion(opts.ResourceVersion)
if err != nil {
return apierrors.NewBadRequest(fmt.Sprintf("invalid resource version: %v", err))
}
fromRV = &parsedRV
}
var continueRV, withRev int64 var continueRV, withRev int64
var continueKey string var continueKey string
@ -657,28 +653,26 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
if continueRV > 0 { if continueRV > 0 {
withRev = continueRV withRev = continueRV
} }
default: case len(opts.ResourceVersion) > 0:
if fromRV != nil { parsedRV, err := s.versioner.ParseResourceVersion(opts.ResourceVersion)
if err != nil {
return apierrors.NewBadRequest(fmt.Sprintf("invalid resource version: %v", err))
}
switch opts.ResourceVersionMatch { switch opts.ResourceVersionMatch {
case metav1.ResourceVersionMatchNotOlderThan: case metav1.ResourceVersionMatchNotOlderThan:
// The not older than constraint is checked after we get a response from etcd, // The not older than constraint is checked after we get a response from etcd,
// and returnedRV is then set to the revision we get from the etcd response. // and returnedRV is then set to the revision we get from the etcd response.
case metav1.ResourceVersionMatchExact: case metav1.ResourceVersionMatchExact:
withRev = int64(*fromRV) withRev = int64(parsedRV)
case "": // legacy case case "": // legacy case
if opts.Recursive && opts.Predicate.Limit > 0 && *fromRV > 0 { if opts.Recursive && opts.Predicate.Limit > 0 && parsedRV > 0 {
withRev = int64(*fromRV) withRev = int64(parsedRV)
} }
default: default:
return fmt.Errorf("unknown ResourceVersionMatch value: %v", opts.ResourceVersionMatch) return fmt.Errorf("unknown ResourceVersionMatch value: %v", opts.ResourceVersionMatch)
} }
} }
}
if opts.Recursive {
rangeEnd := clientv3.GetPrefixRangeEnd(keyPrefix)
options = append(options, clientv3.WithRange(rangeEnd))
}
if withRev != 0 { if withRev != 0 {
options = append(options, clientv3.WithRev(withRev)) options = append(options, clientv3.WithRev(withRev))
} }
@ -717,6 +711,11 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
if len(getResp.Kvs) == 0 && getResp.More { if len(getResp.Kvs) == 0 && getResp.More {
return fmt.Errorf("no results were found, but etcd indicated there were more values remaining") return fmt.Errorf("no results were found, but etcd indicated there were more values remaining")
} }
// indicate to the client which resource version was returned, and use the same resource version for subsequent requests.
if withRev == 0 {
withRev = getResp.Header.Revision
options = append(options, clientv3.WithRev(withRev))
}
// avoid small allocations for the result slice, since this can be called in many // avoid small allocations for the result slice, since this can be called in many
// different contexts and we don't know how significantly the result will be filtered // different contexts and we don't know how significantly the result will be filtered
@ -776,14 +775,6 @@ func (s *store) GetList(ctx context.Context, key string, opts storage.ListOption
*limitOption = clientv3.WithLimit(limit) *limitOption = clientv3.WithLimit(limit)
} }
preparedKey = string(lastKey) + "\x00" preparedKey = string(lastKey) + "\x00"
if withRev == 0 {
withRev = getResp.Header.Revision
options = append(options, clientv3.WithRev(withRev))
}
}
// indicate to the client which resource version was returned
if withRev == 0 {
withRev = getResp.Header.Revision
} }
if v.IsNil() { if v.IsNil() {

12
test/integration/apiserver/apiserver_test.go
View File

@ -527,12 +527,6 @@ func testListOptionsCase(t *testing.T, rsClient appsv1.ReplicaSetInterface, watc
} }
return return
} }
if opts.ResourceVersion == invalidResourceVersion {
if err == nil || !strings.Contains(err.Error(), "Invalid value") {
t.Fatalf("expecting invalid value error, but got: %v", err)
}
return
}
if opts.Continue == invalidContinueToken { if opts.Continue == invalidContinueToken {
if err == nil || !strings.Contains(err.Error(), "continue key is not valid") { if err == nil || !strings.Contains(err.Error(), "continue key is not valid") {
t.Fatalf("expected continue key not valid error, but got: %v", err) t.Fatalf("expected continue key not valid error, but got: %v", err)
@ -546,6 +540,12 @@ func testListOptionsCase(t *testing.T, rsClient appsv1.ReplicaSetInterface, watc
} }
return return
} }
if opts.ResourceVersion == invalidResourceVersion {
if err == nil || !strings.Contains(err.Error(), "Invalid value") {
t.Fatalf("expecting invalid value error, but got: %v", err)
}
return
}
// Check for too old errors // Check for too old errors
isExact := opts.ResourceVersionMatch == metav1.ResourceVersionMatchExact isExact := opts.ResourceVersionMatch == metav1.ResourceVersionMatchExact