From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: mhagger@alum•mit.edu, git@vger•kernel.org
Subject: Re: [PATCH] refs.c: enable large transactions
Date: Tue, 21 Apr 2015 10:16:26 -0700 [thread overview]
Message-ID: <xmqqegndieqd.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1429576506-10790-1-git-send-email-sbeller@google.com> (Stefan Beller's message of "Mon, 20 Apr 2015 17:35:06 -0700")
Stefan Beller <sbeller@google•com> writes:
> + /*
> + * We may want to open many files in a large transaction, so come up with
> + * a reasonable maximum, keep some spares for stdin/out and other open
> + * files.
> + */
> + int remaining_fds = get_max_fd_limit() - 32;
Can this go negative? If it does so, does it matter? I think the
code doesn't barf, but starting from a negative "remaining" feels
cryptic, compared to starting from a zero "remaining".
> struct ref_update **updates = transaction->updates;
> struct string_list refs_to_delete = STRING_LIST_INIT_NODUP;
> struct string_list_item *ref_to_delete;
> @@ -3762,6 +3770,11 @@ int ref_transaction_commit(struct ref_transaction *transaction,
> update->refname);
> goto cleanup;
> }
> + if (remaining_fds > 0) {
> + remaining_fds--;
> + } else {
> + close_lock_file(update->lock->lk);
> + }
Any plan to add more code to these blocks in future updates?
Thanks.
> diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
> index 7a69f1a..636d3a1 100755
> --- a/t/t1400-update-ref.sh
> +++ b/t/t1400-update-ref.sh
> @@ -1071,7 +1071,7 @@ run_with_limited_open_files () {
>
> test_lazy_prereq ULIMIT_FILE_DESCRIPTORS 'run_with_limited_open_files true'
>
> -test_expect_failure ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches does not burst open file limit' '
> +test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches does not burst open file limit' '
> (
> for i in $(test_seq 33)
> do
> @@ -1082,7 +1082,7 @@ test_expect_failure ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches
> )
> '
>
> -test_expect_failure ULIMIT_FILE_DESCRIPTORS 'large transaction deleting branches does not burst open file limit' '
> +test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction deleting branches does not burst open file limit' '
> (
> for i in $(test_seq 33)
> do
next prev parent reply other threads:[~2015-04-21 17:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-16 23:17 [PATCH 0/3] Another approach to large transactions Stefan Beller
2015-04-16 23:17 ` [PATCH 1/3] refs.c: remove lock_fd from struct ref_lock Stefan Beller
2015-04-16 23:17 ` [PATCH 2/3] Move get_max_fd_limit(void) to git_compat_util.h Stefan Beller
2015-04-16 23:17 ` [PATCH 3/3] refs.c: enable large transactions Stefan Beller
2015-04-17 17:09 ` [PATCH 0/3] Another approach to " Junio C Hamano
2015-04-17 22:12 ` Junio C Hamano
2015-04-17 22:17 ` Stefan Beller
2015-04-17 23:31 ` Stefan Beller
2015-04-20 22:26 ` Stefan Beller
2015-04-20 22:51 ` Junio C Hamano
2015-04-20 23:07 ` Stefan Beller
2015-04-21 0:31 ` Stefan Beller
2015-04-21 0:35 ` [PATCH] refs.c: enable " Stefan Beller
2015-04-21 17:16 ` Junio C Hamano [this message]
2015-04-21 17:24 ` Stefan Beller
2015-04-21 18:00 ` Junio C Hamano
2015-04-21 19:06 ` [PATCHv2] " Stefan Beller
2015-04-21 19:56 ` Stefan Beller
2015-04-22 14:11 ` Michael Haggerty
2015-04-22 19:09 ` Stefan Beller
2015-04-22 20:12 ` Michael Haggerty
2015-04-21 17:22 ` [PATCH] " Junio C Hamano
2015-04-21 23:21 ` [PATCH 0/3] Another approach to " Jeff King
2015-04-22 19:14 ` Stefan Beller
2015-04-22 20:11 ` Jeff King
2015-04-21 17:19 ` Junio C Hamano
2015-04-21 17:31 ` Stefan Beller
2015-04-21 12:37 ` Michael Haggerty
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqegndieqd.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox