more updates

Author: Tim Middleton

.github/workflows/build-kind.yaml

@@ -94,7 +94,7 @@ jobs:
         kubectl port-forward -n $NAMESPACE pod/$POD 8080:8080 > build/_output/test-logs/port-forward.log 2>&1 &
         PORT_FORWARD_PID=$!
         # run curl requests
-        while : ; do curl -s -v http://localhost:8080/api/schools?q=[1-2] | jq length; sleep 0.5; done > build/_output/test-logs/curl.log 2>&1 &
+        while : ; do curl -s -v http://127.0.0.1:8080/api/schools?q=[1-2] | jq length; sleep 0.5; done > build/_output/test-logs/curl.log 2>&1 &
         CURL_PID=$!
         # Start the rolling restart
         ./scripts/kind/roll-cluster.sh | tee build/_output/test-logs/rolling-restart.log

coherence/session.go

@@ -484,7 +484,6 @@ func (s *Session) GetReadyTimeout() time.Duration {
 func (s *Session) ensureConnection() error {
 	s.connectMutex.Lock()
 	defer s.connectMutex.Unlock()
-	logMessage(DEBUG, "ensureConnection()")
 
 	if s.firstConnectAttempted {
 		// We have previously tried to connect so check that the connect state is connected

test/e2e/kind/main.go

@@ -44,7 +44,7 @@ var (
 func main() {
 	var (
 		count    = 250_000
-		testType = "runTest"
+		testType = "runSchoolsTest"
 		err      error
 	)
 	if err = initializeCoherence(); err != nil {
@@ -63,7 +63,7 @@ func main() {
 	if testType == "load" {
 		err = populateSchoolsCache(count)
 	} else {
-		err = runTest()
+		err = runSchoolsTest()
 	}
 	if err != nil {
 		log.Fatalf("failed to run %s: %v", testType, err)
@@ -90,7 +90,7 @@ func initializeCoherence() error {
 	return err
 }
 
-func runTest() error {
+func runSchoolsTest() error {
 	http.HandleFunc("/api/schools", schoolsHandler)
 
 	fmt.Println("Server running on port 8080")
@@ -102,6 +102,16 @@ func runTest() error {
 func schoolsHandler(w http.ResponseWriter, r *http.Request) {
 	ctx := context.Background()
 
+	defer func() {
+		if session.IsClosed() {
+			log.Printf("Session [%s] is closed, calling initializeCoherence()", session.ID())
+			err := initializeCoherence()
+			if err != nil {
+				log.Fatalf("failed to initialize coherence: %v", err)
+			}
+		}
+	}()
+
 	switch r.Method {
 
 	case http.MethodGet:
@@ -117,14 +127,13 @@ func schoolsHandler(w http.ResponseWriter, r *http.Request) {
 
 		var people = make([]School, 0)
 
-		if session.IsClosed() {
-			log.Printf("Session [%s] is closed, calling initializeCoherence()", session.ID())
-			err := initializeCoherence()
-			if err != nil {
-				log.Printf("failed to initialize coherence: %v", err)
-				http.Error(w, "not connected", http.StatusInternalServerError)
-				return
-			}
+		log.Println("Health check via size()")
+		_, err := schoolsCache.Size(ctx)
+		if err != nil {
+			session.Close()
+			log.Printf("failed to do health check: %v", err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
 		}
 
 		for ch := range schoolsCache.ValuesFilter(ctx, marketSegmentFilter) {