fix wouldblock, more debug

Signed-off-by: Eloi DEMOLIS <[email protected]>
sozu-proxy · Oct 20, 2023 · f22cf0a · f22cf0a
1 parent 7b090a0
commit f22cf0a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/lib/src/protocol/kawa_h1/mod.rs b/lib/src/protocol/kawa_h1/mod.rs
@@ -648,10 +648,13 @@ impl<Front: SocketHandler, L: ListenerHandler + L7ListenerHandler> Http<Front, L
                 );
                 return SessionResult::Close;
             }
-            SocketResult::WouldBlock | SocketResult::Closed => {
+            SocketResult::Closed => {
                 warn!("=====back_readable:{:?}/{}", socket_state, self.response_stream.is_initial());
                 self.backend_readiness.event.remove(Ready::READABLE);
             }
+            SocketResult::WouldBlock => {
+                self.backend_readiness.event.remove(Ready::READABLE);
+            }
             SocketResult::Continue => {}
         }
 
@@ -1251,6 +1254,9 @@ impl<Front: SocketHandler, L: ListenerHandler + L7ListenerHandler> Http<Front, L
 
         self.backend_readiness.interest = Ready::WRITABLE | Ready::HUP | Ready::ERROR;
         self.backend_connection_status = BackendConnectionStatus::Connecting(Instant::now());
+        if !self.backend_readiness.event.is_empty() {
+            warn!("======connect_with_event:{:?}", self.backend_readiness);
+        }
 
         match old_backend_token {
             Some(backend_token) => {
@@ -1446,8 +1452,9 @@ impl<Front: SocketHandler, L: ListenerHandler + L7ListenerHandler> Http<Front, L
             if self.backend_readiness.event.is_hup() && !self.test_backend_socket() {
                 //retry connecting the backend
                 error!(
-                    "{} error connecting to backend, trying again",
-                    self.log_context()
+                    "{} error connecting to backend, trying again {}",
+                    self.log_context(),
+                    self.connection_attempts
                 );
 
                 self.connection_attempts += 1;

diff --git a/lib/src/socket.rs b/lib/src/socket.rs
@@ -214,7 +214,10 @@ impl SocketHandler for FrontRustls {
             while !self.session.wants_read() {
                 match self.session.reader().read(&mut buf[size..]) {
                     Ok(0) => break,
-                    Ok(sz) => size += sz,
+                    Ok(sz) => {
+                        size += sz;
+                        can_read = false;
+                    }
                     Err(e) => match e.kind() {
                         ErrorKind::WouldBlock => {
                             break;