Merge pull request containerd#78 from lifupan/fix_send

Fix send

Author: lifupan

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ttrpc"
-version = "0.4.13"
+version = "0.4.14"
 authors = ["The AntFin Kata Team <kata@list.alibaba-inc.com>"]
 edition = "2018"
 license = "Apache-2.0"

src/sync/server.rs

@@ -111,7 +111,7 @@ fn start_method_handler_thread(
                     // notify the connection dealing main thread to stop.
                     control_tx
                         .send(())
-                        .unwrap_or_else(|err| debug!("Failed to try send {:?}", err));
+                        .unwrap_or_else(|err| debug!("Failed to send {:?}", err));
                     break;
                 }
                 result = read_message(fd);
@@ -121,7 +121,7 @@ fn start_method_handler_thread(
                 // notify the connection dealing main thread to stop.
                 control_tx
                     .send(())
-                    .unwrap_or_else(|err| debug!("Failed to try send {:?}", err));
+                    .unwrap_or_else(|err| debug!("Failed to send {:?}", err));
                 break;
             }
 
@@ -130,7 +130,7 @@ fn start_method_handler_thread(
                 trace!("notify client handler to create much more worker threads!");
                 control_tx
                     .send(())
-                    .unwrap_or_else(|err| debug!("Failed to try send {:?}", err));
+                    .unwrap_or_else(|err| debug!("Failed to send {:?}", err));
             }
 
             let mh;
@@ -149,7 +149,8 @@ fn start_method_handler_thread(
                         // have exited.
                         control_tx
                             .send(())
-                            .unwrap_or_else(|err| debug!("Failed to try send {:?}", err));
+                            .unwrap_or_else(|err| debug!("Failed to send {:?}", err));
+                        trace!("Socket error send control_tx");
                         break;
                     }
                     _ => {
@@ -176,7 +177,7 @@ fn start_method_handler_thread(
                     // exited.
                     control_tx
                         .send(())
-                        .unwrap_or_else(|err| debug!("Failed to try send {:?}", err));
+                        .unwrap_or_else(|err| debug!("Failed to send {:?}", err));
                     break;
                 }
                 continue;
@@ -199,7 +200,7 @@ fn start_method_handler_thread(
                     // exited.
                     control_tx
                         .send(())
-                        .unwrap_or_else(|err| debug!("Failed to try send {:?}", err));
+                        .unwrap_or_else(|err| debug!("Failed to send {:?}", err));
                     break;
                 }
                 continue;
@@ -217,7 +218,7 @@ fn start_method_handler_thread(
                 // exited.
                 control_tx
                     .send(())
-                    .unwrap_or_else(|err| debug!("Failed to try send {:?}", err));
+                    .unwrap_or_else(|err| debug!("Failed to send {:?}", err));
                 break;
             }
         }
@@ -471,6 +472,9 @@ impl Server {
                                     break;
                                 }
                             }
+                            // drop the control_rx, thus all of the method handler threads would
+                            // terminated.
+                            drop(control_rx);
                             // drop the res_tx, thus the res_rx would get terminated notification.
                             drop(res_tx);
                             handler.join().unwrap_or(());