Commit d1cb0b7a authored by Chao Xu's avatar Chao Xu

returns StatusError in GetAllEventsSinceThreadUnsafe

parent c1012d8c
...@@ -22,6 +22,7 @@ import ( ...@@ -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 ...@@ -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
......
...@@ -21,6 +21,7 @@ import ( ...@@ -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) { ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment