Merge pull request #728 from mpuncel/mpuncel/wait-for-exists-watch-po…

…d-status Mpuncel/wait for exists watch pod status
square · Jan 19, 2017 · 38c9708 · 38c9708
2 parents 783f36a + a763b04
commit 38c9708
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 37 deletions.
diff --git a/pkg/grpc/podstore/podstore.go b/pkg/grpc/podstore/podstore.go
@@ -92,6 +92,16 @@ func (s store) WatchPodStatus(req *podstore_protos.WatchPodStatusRequest, stream
 	go func() {
 		for {
 			status, queryMeta, err := s.podStatusStore.WaitForStatus(podUniqueKey, waitIndex)
+
+			if queryMeta != nil {
+				waitIndex = queryMeta.LastIndex
+			}
+
+			if statusstore.IsNoStatus(err) && req.WaitForExists {
+				// the client wants 404 to be ignored, start
+				// the watch again with our new index
+				continue
+			}
 			select {
 			case podStatusResultCh <- podStatusResult{
 				status:    status,
@@ -102,9 +112,6 @@ func (s store) WatchPodStatus(req *podstore_protos.WatchPodStatusRequest, stream
 					return
 				}
 
-				if queryMeta != nil {
-					waitIndex = queryMeta.LastIndex
-				}
 			case <-innerQuit:
 				// Client canceled
 				return

diff --git a/pkg/grpc/podstore/podstore_test.go b/pkg/grpc/podstore/podstore_test.go
@@ -111,9 +111,7 @@ func TestWatchPodStatus(t *testing.T) {
 	req := &podstore_protos.WatchPodStatusRequest{
 		StatusNamespace: consul.PreparerPodStatusNamespace.String(),
 		PodUniqueKey:    podUniqueKey.String(),
-		// Set it 1 above last index so we wait for the key to exist. (The test status
-		// store starts at 1234 for some reason)
-		WaitIndex: 1235,
+		WaitForExists:   true,
 	}
 
 	watchErrCh := make(chan error)

diff --git a/pkg/grpc/podstore/protos/podstore.pb.go b/pkg/grpc/podstore/protos/podstore.pb.go
diff --git a/pkg/grpc/podstore/protos/podstore.proto b/pkg/grpc/podstore/protos/podstore.proto
@@ -23,6 +23,7 @@ message WatchPodStatusRequest {
   string pod_unique_key = 1;
   uint64 wait_index = 2; // the WaitIndex to pass to watch requests
   string status_namespace = 3;
+  bool wait_for_exists = 4; // If set, the server will wait for a not-existing key to exist (rather than return a Not Found error)
 }
 
 message PodStatusResponse {