git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Jeff King" <peff@peff.net>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v5 17/22] read-cache: unlink old sharedindex files
Date: Mon,  6 Mar 2017 10:41:58 +0100	[thread overview]
Message-ID: <20170306094203.28250-18-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20170306094203.28250-1-chriscool@tuxfamily.org>

Everytime split index is turned on, it creates a "sharedindex.XXXX"
file in the git directory. This change makes sure that shared index
files that haven't been used for a long time are removed when a new
shared index file is created.

The new "splitIndex.sharedIndexExpire" config variable is created
to tell the delay after which an unused shared index file can be
deleted. It defaults to "2.weeks.ago".

A previous commit made sure that each time a split index file is
created the mtime of the shared index file it references is updated.
This makes sure that recently used shared index file will not be
deleted.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 read-cache.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/read-cache.c b/read-cache.c
index 13375fa0ff..16c05f359b 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2199,6 +2199,65 @@ static int write_split_index(struct index_state *istate,
 	return ret;
 }
 
+static const char *shared_index_expire = "2.weeks.ago";
+
+static unsigned long get_shared_index_expire_date(void)
+{
+	static unsigned long shared_index_expire_date;
+	static int shared_index_expire_date_prepared;
+
+	if (!shared_index_expire_date_prepared) {
+		git_config_get_expiry("splitindex.sharedindexexpire",
+				      &shared_index_expire);
+		shared_index_expire_date = approxidate(shared_index_expire);
+		shared_index_expire_date_prepared = 1;
+	}
+
+	return shared_index_expire_date;
+}
+
+static int should_delete_shared_index(const char *shared_index_path)
+{
+	struct stat st;
+	unsigned long expiration;
+
+	/* Check timestamp */
+	expiration = get_shared_index_expire_date();
+	if (!expiration)
+		return 0;
+	if (stat(shared_index_path, &st))
+		return error_errno(_("could not stat '%s"), shared_index_path);
+	if (st.st_mtime > expiration)
+		return 0;
+
+	return 1;
+}
+
+static int clean_shared_index_files(const char *current_hex)
+{
+	struct dirent *de;
+	DIR *dir = opendir(get_git_dir());
+
+	if (!dir)
+		return error_errno(_("unable to open git dir: %s"), get_git_dir());
+
+	while ((de = readdir(dir)) != NULL) {
+		const char *sha1_hex;
+		const char *shared_index_path;
+		if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex))
+			continue;
+		if (!strcmp(sha1_hex, current_hex))
+			continue;
+		shared_index_path = git_path("%s", de->d_name);
+		if (should_delete_shared_index(shared_index_path) > 0 &&
+		    unlink(shared_index_path))
+			warning_errno(_("unable to unlink: %s"), shared_index_path);
+	}
+	closedir(dir);
+
+	return 0;
+}
+
 static struct tempfile temporary_sharedindex;
 
 static int write_shared_index(struct index_state *istate,
@@ -2220,8 +2279,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));
+	}
+
 	return ret;
 }
 
-- 
2.12.0.206.g74921e51d6.dirty


  parent reply	other threads:[~2017-03-06  9:49 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-06  9:41 [PATCH v5 00/22] Add configuration options for split-index Christian Couder
2017-03-06  9:41 ` [PATCH v5 01/22] config: mark an error message up for translation Christian Couder
2017-03-06  9:41 ` [PATCH v5 02/22] t1700: change here document style Christian Couder
2017-03-06  9:41 ` [PATCH v5 03/22] config: add git_config_get_split_index() Christian Couder
2017-03-06  9:41 ` [PATCH v5 04/22] split-index: add {add,remove}_split_index() functions Christian Couder
2017-03-06  9:41 ` [PATCH v5 05/22] read-cache: add and then use tweak_split_index() Christian Couder
2017-03-06  9:41 ` [PATCH v5 06/22] update-index: warn in case of split-index incoherency Christian Couder
2017-03-06  9:41 ` [PATCH v5 07/22] t1700: add tests for core.splitIndex Christian Couder
2017-03-06  9:41 ` [PATCH v5 08/22] Documentation/config: add information " Christian Couder
2017-03-06  9:41 ` [PATCH v5 09/22] Documentation/git-update-index: talk about core.splitIndex config var Christian Couder
2017-03-06  9:41 ` [PATCH v5 10/22] config: add git_config_get_max_percent_split_change() Christian Couder
2017-03-06  9:41 ` [PATCH v5 11/22] read-cache: regenerate shared index if necessary Christian Couder
2017-03-06  9:41 ` [PATCH v5 12/22] t1700: add tests for splitIndex.maxPercentChange Christian Couder
2017-03-06  9:41 ` [PATCH v5 13/22] Documentation/config: add splitIndex.maxPercentChange Christian Couder
2017-03-06  9:41 ` [PATCH v5 14/22] sha1_file: make check_and_freshen_file() non static Christian Couder
2017-03-06  9:41 ` [PATCH v5 15/22] read-cache: touch shared index files when used Christian Couder
2017-03-06  9:41 ` [PATCH v5 16/22] config: add git_config_get_expiry() from gc.c Christian Couder
2017-03-06  9:41 ` Christian Couder [this message]
2017-03-06  9:41 ` [PATCH v5 18/22] t1700: test shared index file expiration Christian Couder
2017-03-06  9:42 ` [PATCH v5 19/22] read-cache: refactor read_index_from() Christian Couder
2017-03-06  9:42 ` [PATCH v5 20/22] read-cache: use freshen_shared_index() in read_index_from() Christian Couder
2017-03-06  9:42 ` [PATCH v5 21/22] Documentation/config: add splitIndex.sharedIndexExpire Christian Couder
2017-03-06  9:42 ` [PATCH v5 22/22] Documentation/git-update-index: explain splitIndex.* 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=20170306094203.28250-18-chriscool@tuxfamily.org \
    --to=christian.couder@gmail.com \
    --cc=avarab@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.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).