Skip to content

Commit

Permalink
disable sending resourceVersion for now
Browse files Browse the repository at this point in the history
  • Loading branch information
sercand committed Jun 30, 2016
1 parent c46ba95 commit 37d82b9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.idea
kuberesolver.iml
17 changes: 9 additions & 8 deletions resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (r *kubeResolver) Resolve(target string) (naming.Watcher, error) {
stopCh := make(chan struct{})

go Until(func() {
err := r.ResolveWrapper(target, stopCh, resultChan)
err := r.resolveWrapper(target, stopCh, resultChan)
grpclog.Printf("kuberesolver/resolve.go: ResolveWrapper ended with error=%v", err)
}, time.Second, stopCh)

Expand All @@ -47,17 +47,17 @@ func (r *kubeResolver) Resolve(target string) (naming.Watcher, error) {
return w, nil
}

func (r *kubeResolver) ResolveWrapper(target string, stopCh <-chan struct{}, resultCh chan<- watchResult) error {
func (r *kubeResolver) resolveWrapper(target string, stopCh <-chan struct{}, resultCh chan<- watchResult) error {
u, err := url.Parse(fmt.Sprintf("%s/api/v1/watch/namespaces/%s/endpoints/%s",
r.k8sClient.host, r.namespace, target))
if err != nil {
return err
}
// Calls to the Kubernetes endpoints watch API must include the resource
// version to ensure watches only return updates since the last watch.
q := u.Query()
q.Set("resourceVersion", r.resourceVersion)
u.RawQuery = q.Encode()
// q := u.Query()
// q.Set("resourceVersion", "0")
//u.RawQuery = q.Encode()

grpclog.Printf("kuberesolver/resolve.go: ResolveWrapper start url=%s", u.String())

Expand All @@ -72,8 +72,9 @@ func (r *kubeResolver) ResolveWrapper(target string, stopCh <-chan struct{}, res
return err
}
if resp.StatusCode != http.StatusOK {
defer resp.Body.Close()
return fmt.Errorf("invalid response code")
grpclog.Printf("kuberesolver/resolve.go: ResolveWrapper invalid response code=%d", resp.StatusCode)
// defer resp.Body.Close()
// return fmt.Errorf("invalid response code %d", resp.StatusCode)
}
sw := newStreamWatcher(resp.Body)
for {
Expand All @@ -83,7 +84,7 @@ func (r *kubeResolver) ResolveWrapper(target string, stopCh <-chan struct{}, res
return nil
case up, more := <-sw.ResultChan():
if more {
r.resourceVersion = up.Object.Metadata.ResourceVersion
// r.resourceVersion = up.Object.Metadata.ResourceVersion
resultCh <- watchResult{err: nil, ep: &up}
} else {
grpclog.Printf("kuberesolver/resolver.go: ResolveWrapper stop ResultChan")
Expand Down

0 comments on commit 37d82b9

Please sign in to comment.