[PATCH v4 3/4] transport-helper: call do_take_over() in connect_helper
- From
Jiang Xin <worldhello.net@gmail.com>
- Date
- Dec 14, 2023, 14:13 UTC
- Message-ID
- <af8fd2a4eb8783be4a62973bfd2135da4568570e.1702562879.git.zhiyou.jx@alibaba-inc.com>
- In-Reply-To
- <cover.1702562879.git.zhiyou.jx@alibaba-inc.com>
From: Jiang Xin <zhiyou.jx@alibaba-inc.com>
After successfully connecting to the smart transport by calling process_connect_service() in connect_helper(), run do_take_over() to replace the old vtable with a new one which has methods ready for the smart transport connection.
The connect_helper() function is used as the connect method of the vtable in "transport-helper.c", and it is called by transport_connect() in "transport.c" to setup a connection. The only place that we call transport_connect() so far is in "builtin/archive.c". Without running do_take_over(), it may fail to call transport_disconnect() in run_remote_archiver() of "builtin/archive.c". This is because for a stateless connection or a service like "git-upload-pack-archive", the remote helper may receive a SIGPIPE signal and exit early. To have a graceful disconnect method by calling do_take_over() will solve this issue.
The subsequent commit will introduce remote archive over a stateless-rpc connection.
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> --- transport-helper.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c index 51088cc03a..3b036ae1ca 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -672,6 +672,8 @@ static int connect_helper(struct transport *transport, const char *name, fd[0] = data->helper->out; fd[1] = data->helper->in; + + do_take_over(transport); return 0; }
-- 2.41.0.232.g2f6f0bca4f.agit.8.0.4.dev