github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

returns StatusError in GetAllEventsSinceThreadUnsafe

Browse Source
This commit is contained in:
Chao Xu
2015-10-05 13:24:54 -07:00
parent c1012d8c93
commit d1cb0b7a7a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/storage/watch_cache.go
View File

@@ -22,6 +22,7 @@ import (
"strconv" "strconv"
"sync" "sync"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
@@ -265,7 +266,7 @@ func (w *watchCache) GetAllEventsSinceThreadUnsafe(resourceVersion uint64) ([]wa
return result, nil return result, nil
} }
if resourceVersion < oldest { if resourceVersion < oldest {
return nil, fmt.Errorf("too old resource version: %d (%d)", resourceVersion, oldest) return nil, errors.NewInternalError(fmt.Errorf("too old resource version: %d (%d)", resourceVersion, oldest))
} }
// Binary seatch the smallest index at which resourceVersion is not smaller than // Binary seatch the smallest index at which resourceVersion is not smaller than

4
pkg/storage/watch_cache_test.go
View File

@@ -21,6 +21,7 @@ import (
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
@@ -120,6 +121,9 @@ func TestEvents(t *testing.T) {
if err == nil { if err == nil {
t.Errorf("expected error too old") t.Errorf("expected error too old")
} }
if _, ok := err.(*errors.StatusError); !ok {
t.Errorf("expected error to be of type StatusError")
}
} }
{ {
result, err := store.GetAllEventsSince(2) result, err := store.GetAllEventsSince(2)