Merge pull request #1133 from sozu-proxy/devel/edemolis/fix/pipe-soft…

…lock Fix worker soft lock
sozu-proxy · Aug 29, 2024 · a830613 · a830613
2 parents 409af59 + 5ab35c2
commit a830613
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/src/protocol/pipe.rs b/lib/src/protocol/pipe.rs
@@ -513,6 +513,8 @@ impl<Front: SocketHandler, L: ListenerHandler> Pipe<Front, L> {
                 if self.frontend_buffer.available_data() == 0 {
                     self.frontend_readiness.interest.insert(Ready::READABLE);
                     self.backend_readiness.interest.remove(Ready::WRITABLE);
+                    count!("back_bytes_out", sz as i64);
+                    metrics.backend_bout += sz;
                     return SessionResult::Continue;
                 }
 
@@ -531,6 +533,7 @@ impl<Front: SocketHandler, L: ListenerHandler> Pipe<Front, L> {
             }
         }
 
+        count!("back_bytes_out", sz as i64);
         metrics.backend_bout += sz;
 
         if !self.check_connections() {

diff --git a/lib/src/socket.rs b/lib/src/socket.rs
@@ -287,9 +287,7 @@ impl SocketHandler for FrontRustls {
             }
 
             match self.session.writer().write(&buf[buffered_size..]) {
-                Ok(0) => {
-                    break;
-                }
+                Ok(0) => {} // zero byte written means that the Rustls buffers are full, we will try to write on the socket and try again
                 Ok(sz) => {
                     buffered_size += sz;
                 }
@@ -363,7 +361,7 @@ impl SocketHandler for FrontRustls {
         let mut is_closed = false;
 
         match self.session.writer().write_vectored(bufs) {
-            Ok(0) => {}
+            Ok(0) => {} // zero byte written means that the Rustls buffers are full, we will try to write on the socket and try again
             Ok(sz) => {
                 buffered_size += sz;
             }