From: Ben Peart Date: Fri, 28 Sep 2018 13:39:12 GMT Subject: Re: [PATCH v6 4/7] config: add new index.threads config setting Message-ID: In-Reply-To: <20180928002627.GO27036@localhost> On 9/27/2018 8:26 PM, SZEDER Gábor wrote: > On Wed, Sep 26, 2018 at 03:54:39PM -0400, Ben Peart wrote: >> Add support for a new index.threads config setting which will be used to >> control the threading code in do_read_index(). A value of 0 will tell the >> index code to automatically determine the correct number of threads to use. >> A value of 1 will make the code single threaded. A value greater than 1 >> will set the maximum number of threads to use. >> >> For testing purposes, this setting can be overwritten by setting the >> GIT_TEST_INDEX_THREADS= environment variable to a value greater than 0. >> >> Signed-off-by: Ben Peart >> --- > >> diff --git a/t/README b/t/README >> index aa33ac4f26..0fcecf4500 100644 >> --- a/t/README >> +++ b/t/README >> @@ -332,6 +332,11 @@ This is used to allow tests 1, 4-9 in t1700-split-index.sh to succeed >> as they currently hard code SHA values for the index which are no longer >> valid due to the addition of the EOIE extension. >> >> +GIT_TEST_INDEX_THREADS= enables exercising the multi-threaded loading >> +of the index for the whole test suite by bypassing the default number of >> +cache entries and thread minimums. Settting this to 1 will make the > > s/ttt/tt/ > >> +index loading single threaded. >> + >> Naming Tests >> ------------ >> >> diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh >> index 1f168378c8..ab205954cf 100755 >> --- a/t/t1700-split-index.sh >> +++ b/t/t1700-split-index.sh >> @@ -8,6 +8,7 @@ test_description='split index mode tests' >> sane_unset GIT_TEST_SPLIT_INDEX >> sane_unset GIT_FSMONITOR_TEST >> GIT_TEST_DISABLE_EOIE=true; export GIT_TEST_DISABLE_EOIE >> +GIT_TEST_INDEX_THREADS=1; export GIT_TEST_INDEX_THREADS > > Why does multithreading have to be disabled in this test? > If multi-threading is enabled, it will write out the IEOT extension which changes the SHA and causes the test to fail. I will update the logic in this case to not write out the IEOT extension as it isn't needed. >> test_expect_success 'enable split index' ' >> git config splitIndex.maxPercentChange 100 && >> -- >> 2.18.0.windows.1 >>