git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Duy Nguyen <pclouds@gmail.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
	"Junio C Hamano" <gitster@pobox.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: Re: [PATCH v1 16/19] read-cache: unlink old sharedindex files
Date: Tue, 25 Oct 2016 17:43:46 +0700	[thread overview]
Message-ID: <CACsJy8C4Qd76LSYxk9BJtN3n3Knv_RCDgBOO-ybkNHFZK61ahQ@mail.gmail.com> (raw)
In-Reply-To: <20161023092648.12086-17-chriscool@tuxfamily.org>

On Sun, Oct 23, 2016 at 4:26 PM, Christian Couder
<christian.couder@gmail.com> wrote:
> +static int can_delete_shared_index(const char *shared_sha1_hex)
> +{
> +       struct stat st;
> +       unsigned long expiration;
> +       const char *shared_index = git_path("sharedindex.%s", shared_sha1_hex);
> +
> +       /* Check timestamp */
> +       expiration = get_shared_index_expire_date();
> +       if (!expiration)
> +               return 0;
> +       if (stat(shared_index, &st))
> +               return error_errno("could not stat '%s", shared_index);
> +       if (st.st_mtime > expiration)

I wonder if we should check ctime too, in case mtime is not reliable
(and ctime is less likely to be manipulated by user), just for extra
safety. If (st.st_mtime > expiration || st.st_ctime > expiration).

> +               return 0;
> +
> +       return 1;
> +}
> +
> +static void clean_shared_index_files(const char *current_hex)
> +{
> +       struct dirent *de;
> +       DIR *dir = opendir(get_git_dir());
> +
> +       if (!dir) {
> +               error_errno("unable to open git dir: %s", get_git_dir());

_()

> +               return;

Or just do "return error_errno(...)". The caller can ignore the return
value for now.

> +       }
> +
> +       while ((de = readdir(dir)) != NULL) {
> +               const char *sha1_hex;
> +               if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex))
> +                       continue;
> +               if (!strcmp(sha1_hex, current_hex))
> +                       continue;

Yeah.. make sure that the shared index linked to $GIT_DIR/index stay,
even if mtime is screwed up. I wonder if we should have the same
treatment for $GIT_DIR/index.lock though, as an extra safety measure.
If you call this function in write_locked_index, then
$GIT_DIR/index.lock is definitely there. Hmm.. maybe it _is_
current_hex, current_hex is not the value from $GIT_DIR/index...

> +               if (can_delete_shared_index(sha1_hex) > 0 &&
> +                   unlink(git_path("%s", de->d_name)))
> +                       error_errno("unable to unlink: %s", git_path("%s", de->d_name));

_()

>  static int write_shared_index(struct index_state *istate,
> @@ -2211,8 +2269,11 @@ static int write_shared_index(struct index_state *istate,
>         }
>         ret = rename_tempfile(&temporary_sharedindex,
>                               git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
> -       if (!ret)
> +       if (!ret) {
>                 hashcpy(si->base_sha1, si->base->sha1);
> +               clean_shared_index_files(sha1_to_hex(si->base->sha1));

This operation is technically garbage collection and should belong to
"git gc --auto", which is already called automatically in a few
places. Is it not called often enough that we need to do the cleaning
up right after a new shared index is created?
-- 
Duy

  reply	other threads:[~2016-10-25 10:56 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-23  9:26 [PATCH v1 00/19] Add configuration options for split-index Christian Couder
2016-10-23  9:26 ` [PATCH v1 01/19] split-index: s/eith/with/ typo fix Christian Couder
2016-10-23  9:26 ` [PATCH v1 02/19] config: add git_config_get_split_index() Christian Couder
2016-10-23  9:26 ` [PATCH v1 03/19] split-index: add {add,remove}_split_index() functions Christian Couder
2016-10-25  9:58   ` Duy Nguyen
2016-10-29 22:06     ` Christian Couder
2016-11-07 10:08       ` Duy Nguyen
2016-11-09  9:24         ` Duy Nguyen
2016-11-09 14:47           ` Christian Couder
2016-10-23  9:26 ` [PATCH v1 04/19] read-cache: add and then use tweak_split_index() Christian Couder
2016-10-23  9:26 ` [PATCH v1 05/19] update-index: warn in case of split-index incoherency Christian Couder
2016-10-25 10:00   ` Duy Nguyen
2016-10-29 22:19     ` Christian Couder
2016-11-01 19:05     ` Junio C Hamano
2016-11-01 23:00       ` Christian Couder
2016-11-02  1:37         ` Junio C Hamano
2016-10-23  9:26 ` [PATCH v1 06/19] t1700: add tests for core.splitIndex Christian Couder
2016-10-23  9:26 ` [PATCH v1 07/19] Documentation/config: add information " Christian Couder
2016-10-23  9:26 ` [PATCH v1 08/19] Documentation/git-update-index: talk about core.splitIndex config var Christian Couder
2016-10-23  9:26 ` [PATCH v1 09/19] config: add git_config_get_max_percent_split_change() Christian Couder
2016-10-25 10:06   ` Duy Nguyen
2016-10-29 22:24     ` Christian Couder
2016-11-01 19:13     ` Junio C Hamano
2016-11-05  0:27       ` Christian Couder
2016-10-23  9:26 ` [PATCH v1 10/19] read-cache: regenerate shared index if necessary Christian Couder
2016-10-23 16:07   ` Ramsay Jones
2016-10-29 22:40     ` Christian Couder
2016-10-25 10:16   ` Duy Nguyen
2016-10-29 22:58     ` Christian Couder
2016-10-23  9:26 ` [PATCH v1 11/19] t1700: add tests for splitIndex.maxPercentChange Christian Couder
2016-11-01 19:15   ` Junio C Hamano
2016-10-23  9:26 ` [PATCH v1 12/19] Documentation/config: add splitIndex.maxPercentChange Christian Couder
2016-11-01 19:19   ` Junio C Hamano
2016-11-05  0:45     ` Christian Couder
2016-11-06 17:16       ` Junio C Hamano
     [not found]         ` <CAP8UFD1YL+RgdqbV0V1OnC=sJHJFc_an02Q9JeDNapW+u1CZcA@mail.gmail.com>
2016-11-07  9:38           ` Duy Nguyen
2016-11-18 14:34             ` Christian Couder
2016-11-22 10:35               ` Duy Nguyen
2016-11-22 13:13                 ` Christian Couder
2016-11-22 13:20                   ` Duy Nguyen
2016-10-23  9:26 ` [PATCH v1 13/19] sha1_file: make check_and_freshen_file() non static Christian Couder
2016-10-23  9:26 ` [PATCH v1 14/19] read-cache: touch shared index files when used Christian Couder
2016-10-25 10:26   ` Duy Nguyen
2016-11-01 19:23     ` Junio C Hamano
2016-10-23  9:26 ` [PATCH v1 15/19] config: add git_config_get_date_string() from gc.c Christian Couder
2016-11-01 19:28   ` Junio C Hamano
2016-11-23 15:04     ` Christian Couder
2016-11-23 17:34       ` Junio C Hamano
2016-11-28 16:19         ` Christian Couder
2016-11-28 16:56           ` Junio C Hamano
2016-10-23  9:26 ` [PATCH v1 16/19] read-cache: unlink old sharedindex files Christian Couder
2016-10-25 10:43   ` Duy Nguyen [this message]
2016-10-27 10:25     ` Duy Nguyen
2016-10-27 12:14       ` Christian Couder
2016-10-27 16:13       ` Junio C Hamano
2016-10-29  3:30         ` Duy Nguyen
2016-10-23  9:26 ` [PATCH v1 17/19] t1700: test shared index file expiration Christian Couder
2016-10-23  9:26 ` [PATCH v1 18/19] Documentation/config: add splitIndex.sharedIndexExpire Christian Couder
2016-10-23  9:26 ` [PATCH v1 19/19] Documentation/git-update-index: explain splitIndex.* Christian Couder
2016-10-24 18:07 ` [PATCH v1 00/19] Add configuration options for split-index Junio C Hamano
2016-10-25  9:30   ` Duy Nguyen
2016-10-25 17:21     ` Junio C Hamano
2016-10-26  9:25       ` Duy Nguyen
2016-10-26 16:14         ` Junio C Hamano
2016-10-25 10:52 ` Duy Nguyen
2016-11-03 14:34   ` Christian Couder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CACsJy8C4Qd76LSYxk9BJtN3n3Knv_RCDgBOO-ybkNHFZK61ahQ@mail.gmail.com \
    --to=pclouds@gmail.com \
    --cc=avarab@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).