[PATCH] fetch-pack: write effective filter to trace2
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Jul 15, 2022, 17:29 UTC
- Message-ID
- <20220715172943.2681492-1-jonathantanmy@google.com>
Administrators of a managed Git environment (like the one at $DAYJOB) might want to quantify the performance change of fetches with and without partial clone from the client's point of view. Therefore, log the effective filter being sent to the server whenever a fetch (or clone) occurs. Note that this is not necessarily the same as what's specified on the CLI, because during a fetch, the configured filter is used whenever a filter is not specified on the CLI.
This is implemented for protocol v0, v1, and v2.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com> --- fetch-pack.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/fetch-pack.c b/fetch-pack.c index cb6647d657..dec8743bec 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -392,7 +392,10 @@ static int find_common(struct fetch_negotiator *negotiator, if (server_supports_filtering && args->filter_options.choice) { const char *spec = expand_list_objects_filter_spec(&args->filter_options); + trace2_data_string("fetch", the_repository, "fetch/effective-filter", spec); packet_buf_write(&req_buf, "filter %s", spec); + } else { + trace2_data_string("fetch", the_repository, "fetch/effective-filter", "none"); } packet_buf_flush(&req_buf); state_len = req_buf.len; @@ -1328,9 +1331,12 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, const char *spec = expand_list_objects_filter_spec(&args->filter_options); print_verbose(args, _("Server supports filter")); + trace2_data_string("fetch", the_repository, "fetch/effective-filter", spec); packet_buf_write(&req_buf, "filter %s", spec); - } else if (args->filter_options.choice) { - warning("filtering not recognized by server, ignoring"); + } else { + if (args->filter_options.choice) + warning("filtering not recognized by server, ignoring"); + trace2_data_string("fetch", the_repository, "fetch/effective-filter", "none"); } if (server_supports_feature("fetch", "packfile-uris", 0)) {
-- 2.37.0.170.g444d1eabd0-goog