Merge branch 'master' into containedctx

Author: asmyasnikov

CHANGELOG.md

@@ -1,4 +1,5 @@
 * Refactored internals for enabling `containedctx` linter
+* Fixed the hanging semaphore issue on coordination session reconnect
 
 ## v3.65.3
 * Fixed data race in `internal/conn.grpcClientStream` 

internal/coordination/conversation/conversation.go

@@ -424,7 +424,12 @@ func (c *Controller) OnAttach() {
 				delete(c.conflicts, req.conflictKey)
 			}
 
-			req.requestSent = nil
+			// If the request has been canceled, re-send the cancellation message, otherwise re-send the original one.
+			if req.canceled {
+				req.cancelRequestSent = nil
+			} else {
+				req.requestSent = nil
+			}
 			notify = true
 		}
 	}