From patchwork Sat Feb 23 23:38:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Tan X-Patchwork-Id: 10827655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A22D317E9 for ; Sat, 23 Feb 2019 23:39:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E9DB2C35D for ; Sat, 23 Feb 2019 23:39:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AA822C37E; Sat, 23 Feb 2019 23:39:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0189B2C35D for ; Sat, 23 Feb 2019 23:39:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727923AbfBWXjI (ORCPT ); Sat, 23 Feb 2019 18:39:08 -0500 Received: from mail-pl1-f201.google.com ([209.85.214.201]:52103 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbfBWXjH (ORCPT ); Sat, 23 Feb 2019 18:39:07 -0500 Received: by mail-pl1-f201.google.com with SMTP id f10so4387852plr.18 for ; Sat, 23 Feb 2019 15:39:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=bJhW754qe07OnuZcLV28LYcPl0aiVIopN6BGE7qNgmA=; b=mv537SeJjIQbaIvDwNIV5pjE0Cwj+NDk92Ob9kqYupaaXblU5dpzGKSya3hsEABNmV pn2sQcs4Fapf1GCxnpFkiMBgqbHzwneuf/j6YBNl6/IyaWrDYcMRZbWODNWTr+DkrlDm 8ttZAO9b6Kx+q6b4k2YC65MVZWq8DD27D5BzPjLpyK6/yW5sIVhWrE1hZnPVzMs0uy+D GIXk0C7R4xhjfmlFJ0S9/zuvb/l9KSdPuVfbFrF3fBV7/K+SRAo3S2fFgUsvg2HgSuxZ fqrjtOtEUvCzQJp4Xy5wrSpcegpCGItqhMNzCfy5TW5x8oLF96ShXaYXV6nYA4ACmBAc wSpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=bJhW754qe07OnuZcLV28LYcPl0aiVIopN6BGE7qNgmA=; b=aLyvB+M+LLXQRCL27KggpTwXeLPhWOoSvZDyrmm0hD/bjl585wdfVHCKWn0Y9AsteW /gFKCC/ZTowuS3RaA/l0uSOobPL4kMijQ01/WWA3exPebK8doQAdPzE32nq+Fnl+3FwJ 8IUdPQDFU86Vg8yOec3gRJikdm4Py7++5yV42KTuUkZnmnSEI5r0iCMUs6OB/VyweBSS WPkKgH24oC3XCfoLdFYcdkR5NXXESOZaHIRJffKX9lpRQ3hvYfQPDuUiM1kGwpES1RaZ GeVIkfErZRSg5T8ebi/KDUu5+YN9hcZHjZISOK2c9RDR8O8RGD3Wb+xkHO9BJylGc6HJ iTRg== X-Gm-Message-State: AHQUAubgC6VnkgvmVpMJ2ToG089NosE2Kdh6a3Fu9xcmcYxQRKrf9aCf SXNN0WHSxZWb8McSNiqW4kfQhrHysXOzAZjRGEaL8yfCuQ7ucLNgxmRLGf7VeWB43jyKIXlnRx1 AtBpACcIq9qjuQgbfbqIZPJJ8SiQHHq2ZWTBN3+CsoliooEhv2IxOnU+/8tA7JE3U/XdRSuotwq Dc X-Google-Smtp-Source: AHgI3IaQl9f7rpnmSKnY2S7PrwnK9eLlALaE4BNXAkj8Sd6W5yhYjnwHLfkPMduIm+w7y56hKYCjCmhIxWnhizwk523x X-Received: by 2002:a62:42d6:: with SMTP id h83mr4206120pfd.52.1550965146689; Sat, 23 Feb 2019 15:39:06 -0800 (PST) Date: Sat, 23 Feb 2019 15:38:55 -0800 In-Reply-To: Message-Id: <5ed3a4442e38165d0c45d53de5c8620b58a01015.1550963965.git.jonathantanmy@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.19.0.271.gfe8321ec05.dirty Subject: [WIP 1/7] http: use --stdin and --keep when downloading pack From: Jonathan Tan To: git@vger.kernel.org Cc: Jonathan Tan , gitster@pobox.com, peff@peff.net, christian.couder@gmail.com, avarab@gmail.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When Git fetches a pack using dumb HTTP, it does at least 2 things differently from when it fetches using fetch-pack or receive-pack: (1) it reuses the server's name for the packfile (which incorporates a hash) for the packfile, and (2) it does not create a .keep file to avoid race conditions with repack. A subsequent patch will allow downloading packs over HTTP(S) as part of a fetch. These downloads will not necessarily be from a Git repository, and thus may not have a hash as part of its name. Also, generating a .keep file will be necessary to avoid race conditions with repack (until the fetch has successfully written the new refs). Thus, teach http to pass --stdin and --keep to index-pack, the former so that we have no reliance on the server's name for the packfile, and the latter so that we have the .keep file. Signed-off-by: Jonathan Tan --- http-push.c | 7 ++++++- http-walker.c | 5 ++++- http.c | 42 ++++++++++++++++++++---------------------- http.h | 2 +- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/http-push.c b/http-push.c index b22c7caea0..409b266b0c 100644 --- a/http-push.c +++ b/http-push.c @@ -586,11 +586,16 @@ static void finish_request(struct transfer_request *request) fprintf(stderr, "Unable to get pack file %s\n%s", request->url, curl_errorstr); } else { + char *lockfile; + preq = (struct http_pack_request *)request->userData; if (preq) { - if (finish_http_pack_request(preq) == 0) + if (finish_http_pack_request(preq, + &lockfile) == 0) { + unlink(lockfile); fail = 0; + } release_http_pack_request(preq); } } diff --git a/http-walker.c b/http-walker.c index 8ae5d76c6a..804dc82304 100644 --- a/http-walker.c +++ b/http-walker.c @@ -425,6 +425,7 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne int ret; struct slot_results results; struct http_pack_request *preq; + char *lockfile; if (fetch_indices(walker, repo)) return -1; @@ -457,7 +458,9 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne goto abort; } - ret = finish_http_pack_request(preq); + ret = finish_http_pack_request(preq, &lockfile); + if (!ret) + unlink(lockfile); release_http_pack_request(preq); if (ret) return ret; diff --git a/http.c b/http.c index a32ad36ddf..5f8e602cd2 100644 --- a/http.c +++ b/http.c @@ -2200,13 +2200,13 @@ void release_http_pack_request(struct http_pack_request *preq) free(preq); } -int finish_http_pack_request(struct http_pack_request *preq) +int finish_http_pack_request(struct http_pack_request *preq, char **lockfile) { struct packed_git **lst; struct packed_git *p = preq->target; - char *tmp_idx; - size_t len; struct child_process ip = CHILD_PROCESS_INIT; + int tmpfile_fd; + int ret = 0; close_pack_index(p); @@ -2218,35 +2218,33 @@ int finish_http_pack_request(struct http_pack_request *preq) lst = &((*lst)->next); *lst = (*lst)->next; - if (!strip_suffix(preq->tmpfile.buf, ".pack.temp", &len)) - BUG("pack tmpfile does not end in .pack.temp?"); - tmp_idx = xstrfmt("%.*s.idx.temp", (int)len, preq->tmpfile.buf); + tmpfile_fd = xopen(preq->tmpfile.buf, O_RDONLY); argv_array_push(&ip.args, "index-pack"); - argv_array_pushl(&ip.args, "-o", tmp_idx, NULL); - argv_array_push(&ip.args, preq->tmpfile.buf); + argv_array_push(&ip.args, "--stdin"); + argv_array_pushf(&ip.args, "--keep=git %"PRIuMAX, (uintmax_t)getpid()); ip.git_cmd = 1; - ip.no_stdin = 1; - ip.no_stdout = 1; + ip.in = tmpfile_fd; + ip.out = -1; - if (run_command(&ip)) { - unlink(preq->tmpfile.buf); - unlink(tmp_idx); - free(tmp_idx); - return -1; + if (start_command(&ip)) { + ret = -1; + goto cleanup; } - unlink(sha1_pack_index_name(p->sha1)); + *lockfile = index_pack_lockfile(ip.out); + close(ip.out); - if (finalize_object_file(preq->tmpfile.buf, sha1_pack_name(p->sha1)) - || finalize_object_file(tmp_idx, sha1_pack_index_name(p->sha1))) { - free(tmp_idx); - return -1; + if (finish_command(&ip)) { + ret = -1; + goto cleanup; } install_packed_git(the_repository, p); - free(tmp_idx); - return 0; +cleanup: + close(tmpfile_fd); + unlink(preq->tmpfile.buf); + return ret; } struct http_pack_request *new_http_pack_request( diff --git a/http.h b/http.h index 4eb4e808e5..20d1c85d0b 100644 --- a/http.h +++ b/http.h @@ -212,7 +212,7 @@ struct http_pack_request { extern struct http_pack_request *new_http_pack_request( struct packed_git *target, const char *base_url); -extern int finish_http_pack_request(struct http_pack_request *preq); +int finish_http_pack_request(struct http_pack_request *preq, char **lockfile); extern void release_http_pack_request(struct http_pack_request *preq); /* Helpers for fetching object */