| Message ID | f76ba554ed25fb9877a223ef6481834f1831c8ca.1572967644.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | unpack-trees: skip stat on fsmonitor-valid files | expand |
> Sent: Tuesday, November 5, 2019 8:27 AM > From: Utsav Shah <utsav@dropbox.com> > > diff --git a/t/t7113-post-index-change-hook.sh b/t/t7113-post-index-change- > hook.sh > index f011ad7eec..5ca2279d0d 100755 > --- a/t/t7113-post-index-change-hook.sh > +++ b/t/t7113-post-index-change-hook.sh > @@ -50,9 +50,6 @@ test_expect_success 'test status, add, commit, others > trigger hook without flags > git checkout -- dir1/file1.txt && > test_path_is_file testsuccess && rm -f testsuccess && > test_path_is_missing testfailure && > - git update-index && > - test_path_is_missing testsuccess && > - test_path_is_missing testfailure && > git reset --soft && > test_path_is_missing testsuccess && > test_path_is_missing testfailure Looking into this change and I wonder if instead we should be updating refresh_fsmonitor to only update istate->cache_changed if there was an entry where CE_FSMONITOR_VALID was turned off. The reason I bring this up is because with this change, the post-index-change hook will behave differently depending on fsmonitor. It will pass if GIT_TEST_FSMONITOR is unset or set to fsmonitor-watchman. But when set to fsmonitor-all it will fail because it is going down the code path that invalidates all the entries and sets istate->cache_changed. > diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index > d8df990972..9cac3d3d8e 100755 > --- a/t/t7519-status-fsmonitor.sh > +++ b/t/t7519-status-fsmonitor.sh > @@ -106,6 +106,8 @@ EOF > > # test that "update-index --fsmonitor-valid" sets the fsmonitor valid bit > test_expect_success 'update-index --fsmonitor-valid" sets the fsmonitor > valid bit' ' > + write_script .git/hooks/fsmonitor-test<<-\EOF && > + EOF > git update-index --fsmonitor && > git update-index --fsmonitor-valid dir1/modified && > git update-index --fsmonitor-valid dir2/modified && @@ -164,6 > +166,8 @@ EOF > > # test that newly added files are marked valid test_expect_success 'newly > added files are marked valid' ' > + write_script .git/hooks/fsmonitor-test<<-\EOF && > + EOF > git add new && > git add dir1/new && > git add dir2/new && > @@ -218,11 +222,12 @@ test_expect_success '*only* files returned by the > integration script get flagged # Ensure commands that call refresh_index() to > move the index back in time # properly invalidate the fsmonitor cache > test_expect_success 'refresh_index() invalidates fsmonitor cache' ' > - write_script .git/hooks/fsmonitor-test<<-\EOF && > - EOF > clean_repo && > + write_integration_script && > dirty_repo && > git add . && > + write_script .git/hooks/fsmonitor-test<<-\EOF && > + EOF > git commit -m "to reset" && > git reset HEAD~1 && > git status >actual && We need to take a close look at all the tests in t7519-status-fsmonitor.sh and see if we are doing the right thing with these changes because before most commands that read the index would only apply the bits from the fsmonitor bitmap to the cache entries. Whereas now, it does that but also applies what the fsmonitor hooks returns so the content of .git/hooks/fsmonitor-test is now affecting tests and commands where it was not before. So if .git/hooks/fsmonitor-test has paths even git ls-files gets those paths marked dirty and that command is being used to validate the state of the CE_FSMONITOR_VALID. So I think in most cases for these tests we want the .git/hooks/fsmonitor-test to be empty before calling git ls-files so that doesn't change the index state. > > if (old && same(old, a)) { > int update = 0; > - if (o->reset && o->update && !ce_uptodate(old) && > !ce_skip_worktree(old)) { > + if (o->reset && o->update && !ce_uptodate(old) && > !ce_skip_worktree(old) && > + !(old->ce_flags & CE_FSMONITOR_VALID)) { > struct stat st; > if (lstat(old->name, &st) || > ie_match_stat(o->src_index, old, &st, > CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) FYI I have been testing with the ce_uptodate macro checking the CE_FSMONITOR_VALID flag instead and only have failures when using the fsmonitor-watchman script which I'm not sure if all the tests were ever passing using it.
On Tue, Nov 5, 2019 at 1:40 PM Kevin Willford <Kevin.Willford@microsoft.com> wrote: > > > Sent: Tuesday, November 5, 2019 8:27 AM > > From: Utsav Shah <utsav@dropbox.com> > > > > diff --git a/t/t7113-post-index-change-hook.sh b/t/t7113-post-index-change- > > hook.sh > > index f011ad7eec..5ca2279d0d 100755 > > --- a/t/t7113-post-index-change-hook.sh > > +++ b/t/t7113-post-index-change-hook.sh > > @@ -50,9 +50,6 @@ test_expect_success 'test status, add, commit, others > > trigger hook without flags > > git checkout -- dir1/file1.txt && > > test_path_is_file testsuccess && rm -f testsuccess && > > test_path_is_missing testfailure && > > - git update-index && > > - test_path_is_missing testsuccess && > > - test_path_is_missing testfailure && > > git reset --soft && > > test_path_is_missing testsuccess && > > test_path_is_missing testfailure > > Looking into this change and I wonder if instead we should be updating > refresh_fsmonitor to only update istate->cache_changed if there was an > entry where CE_FSMONITOR_VALID was turned off. > > The reason I bring this up is because with this change, the post-index-change > hook will behave differently depending on fsmonitor. It will pass if > GIT_TEST_FSMONITOR is unset or set to fsmonitor-watchman. But when set > to fsmonitor-all it will fail because it is going down the code path that > invalidates all the entries and sets istate->cache_changed. Thanks, this observation was correct. v3 of this patch will check if the index actually needs to mark its cache as changed, and this test passes without modification. > > > diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index > > d8df990972..9cac3d3d8e 100755 > > --- a/t/t7519-status-fsmonitor.sh > > +++ b/t/t7519-status-fsmonitor.sh > > @@ -106,6 +106,8 @@ EOF > > > > # test that "update-index --fsmonitor-valid" sets the fsmonitor valid bit > > test_expect_success 'update-index --fsmonitor-valid" sets the fsmonitor > > valid bit' ' > > + write_script .git/hooks/fsmonitor-test<<-\EOF && > > + EOF > > git update-index --fsmonitor && > > git update-index --fsmonitor-valid dir1/modified && > > git update-index --fsmonitor-valid dir2/modified && @@ -164,6 > > +166,8 @@ EOF > > > > # test that newly added files are marked valid test_expect_success 'newly > > added files are marked valid' ' > > + write_script .git/hooks/fsmonitor-test<<-\EOF && > > + EOF > > git add new && > > git add dir1/new && > > git add dir2/new && > > @@ -218,11 +222,12 @@ test_expect_success '*only* files returned by the > > integration script get flagged # Ensure commands that call refresh_index() to > > move the index back in time # properly invalidate the fsmonitor cache > > test_expect_success 'refresh_index() invalidates fsmonitor cache' ' > > - write_script .git/hooks/fsmonitor-test<<-\EOF && > > - EOF > > clean_repo && > > + write_integration_script && > > dirty_repo && > > git add . && > > + write_script .git/hooks/fsmonitor-test<<-\EOF && > > + EOF > > git commit -m "to reset" && > > git reset HEAD~1 && > > git status >actual && > > We need to take a close look at all the tests in > t7519-status-fsmonitor.sh and see if we are doing the right thing with > these changes because before most commands that read the > index would only apply the bits from the fsmonitor bitmap to > the cache entries. Whereas now, it does that but also applies what the > fsmonitor hooks returns so the content of .git/hooks/fsmonitor-test is > now affecting tests and commands where it was not before. > > So if .git/hooks/fsmonitor-test has paths even git ls-files gets those > paths marked dirty and that command is being used to validate the state of > the CE_FSMONITOR_VALID. So I think in most cases for these tests we > want the .git/hooks/fsmonitor-test to be empty before calling git ls-files > so that doesn't change the index state. I audited these tests very closely, and to the best of my knowledge, the modifications made are valid. For test failures of test_expect_success 'update-index --fsmonitor-valid sets the fsmonitor valid bit' test_expect_success 'newly added files are marked valid' It's relatively straightforward that our patch now runs the fsmonitor hook so we need to make sure the hook doesn't return anything. The trickiest case was "refresh_index()" test, and I've made a slight change to make it clearer why that test was failing. @@ -218,11 +222,12 @@ test_expect_success '*only* files returned by the integration script get flagged # Ensure commands that call refresh_index() to move the index back in time # properly invalidate the fsmonitor cache test_expect_success 'refresh_index() invalidates fsmonitor cache' ' - write_script .git/hooks/fsmonitor-test<<-\EOF && - EOF clean_repo && dirty_repo && + write_integration_script && git add . && + write_script .git/hooks/fsmonitor-test<<-\EOF && + EOF git commit -m "to reset" && git reset HEAD~1 && git status >actual && With patch v2, git add was failing to add all files, since it now consults the fsmonitor hook which wrongly implied that no files were modified. This was rectified by the write_integration_script. After that, we immediately ensure that the test fsmonitor doesn't return any files, and the test passes. > > > > > if (old && same(old, a)) { > > int update = 0; > > - if (o->reset && o->update && !ce_uptodate(old) && > > !ce_skip_worktree(old)) { > > + if (o->reset && o->update && !ce_uptodate(old) && > > !ce_skip_worktree(old) && > > + !(old->ce_flags & CE_FSMONITOR_VALID)) { > > struct stat st; > > if (lstat(old->name, &st) || > > ie_match_stat(o->src_index, old, &st, > > CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) > > FYI I have been testing with the ce_uptodate macro checking the > CE_FSMONITOR_VALID flag instead and only have failures when using > the fsmonitor-watchman script which I'm not sure if all the tests were > ever passing using it. > Yeah, I see the same results. The one part that I don't fully understand if safe is copying over the o->src_index->fsmonitor_last_update to the result index in unpack-trees. I don't understand the implications of that, and if that's the only field worth copying over, or if we should be copying over other fields like the bitmap as well.
> From: Utsav Shah <utsav@dropbox.com> > Sent: Tuesday, November 5, 2019 9:36 PM > > The one part that I don't fully understand if safe is copying over the > o->src_index->fsmonitor_last_update to the result index in > unpack-trees. I don't understand the implications of that, and if that's the > only field worth copying over, or if we should be copying over other fields > like the bitmap as well. The data from the bitmap has already been applied to the index entries at this point so it is no longer needed after that. fsmonitor_last_update is really just being used as the flag to fill the bitmap and write out the fsmonitor extension. The fill_fsmonitor_bitmap will use the current CE_FSMONITOR_VALID flags for the index entries to create the bitmap. if (istate->fsmonitor_last_update) fill_fsmonitor_bitmap(istate); void fill_fsmonitor_bitmap(struct index_state *istate) { unsigned int i, skipped = 0; istate->fsmonitor_dirty = ewah_new(); for (i = 0; i < istate->cache_nr; i++) { if (istate->cache[i]->ce_flags & CE_REMOVE) skipped++; else if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID)) ewah_set(istate->fsmonitor_dirty, i - skipped); } } if (!strip_extensions && istate->fsmonitor_last_update) { struct strbuf sb = STRBUF_INIT; write_fsmonitor_extension(&sb, istate); err = write_index_ext_header(&c, &eoie_c, newfd, CACHE_EXT_FSMONITOR, sb.len) < 0 || ce_write(&c, newfd, sb.buf, sb.len) < 0; strbuf_release(&sb); if (err) return -1; }
diff --git a/fsmonitor.c b/fsmonitor.c index 1f4aa1b150..4362bc6ee9 100644 --- a/fsmonitor.c +++ b/fsmonitor.c @@ -55,9 +55,10 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data, } istate->fsmonitor_dirty = fsmonitor_dirty; - if (istate->fsmonitor_dirty->bit_size > istate->cache_nr) - BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)", - (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr); + if (!istate->split_index && istate->fsmonitor_dirty->bit_size > istate->cache_nr) + BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %"PRIuMAX")", + (uintmax_t)istate->fsmonitor_dirty->bit_size, (uintmax_t)istate->cache_nr); + trace_printf_key(&trace_fsmonitor, "read fsmonitor extension successful"); return 0; @@ -83,9 +84,9 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate) uint32_t ewah_size = 0; int fixup = 0; - if (istate->fsmonitor_dirty->bit_size > istate->cache_nr) - BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)", - (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr); + if (!istate->split_index && istate->fsmonitor_dirty->bit_size > istate->cache_nr) + BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %"PRIuMAX")", + (uintmax_t)istate->fsmonitor_dirty->bit_size, (uintmax_t)istate->cache_nr); put_be32(&hdr_version, INDEX_EXTENSION_VERSION); strbuf_add(sb, &hdr_version, sizeof(uint32_t)); @@ -189,6 +190,9 @@ void refresh_fsmonitor(struct index_state *istate) } if (bol < query_result.len) fsmonitor_refresh_callback(istate, buf + bol); + + if (istate->untracked) + istate->untracked->use_fsmonitor = 1; } else { /* Mark all entries invalid */ for (i = 0; i < istate->cache_nr; i++) @@ -257,9 +261,7 @@ void tweak_fsmonitor(struct index_state *istate) (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr); ewah_each_bit(istate->fsmonitor_dirty, fsmonitor_ewah_callback, istate); - /* Now mark the untracked cache for fsmonitor usage */ - if (istate->untracked) - istate->untracked->use_fsmonitor = 1; + refresh_fsmonitor(istate); } ewah_free(istate->fsmonitor_dirty); diff --git a/t/t7113-post-index-change-hook.sh b/t/t7113-post-index-change-hook.sh index f011ad7eec..5ca2279d0d 100755 --- a/t/t7113-post-index-change-hook.sh +++ b/t/t7113-post-index-change-hook.sh @@ -50,9 +50,6 @@ test_expect_success 'test status, add, commit, others trigger hook without flags git checkout -- dir1/file1.txt && test_path_is_file testsuccess && rm -f testsuccess && test_path_is_missing testfailure && - git update-index && - test_path_is_missing testsuccess && - test_path_is_missing testfailure && git reset --soft && test_path_is_missing testsuccess && test_path_is_missing testfailure diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index d8df990972..9cac3d3d8e 100755 --- a/t/t7519-status-fsmonitor.sh +++ b/t/t7519-status-fsmonitor.sh @@ -106,6 +106,8 @@ EOF # test that "update-index --fsmonitor-valid" sets the fsmonitor valid bit test_expect_success 'update-index --fsmonitor-valid" sets the fsmonitor valid bit' ' + write_script .git/hooks/fsmonitor-test<<-\EOF && + EOF git update-index --fsmonitor && git update-index --fsmonitor-valid dir1/modified && git update-index --fsmonitor-valid dir2/modified && @@ -164,6 +166,8 @@ EOF # test that newly added files are marked valid test_expect_success 'newly added files are marked valid' ' + write_script .git/hooks/fsmonitor-test<<-\EOF && + EOF git add new && git add dir1/new && git add dir2/new && @@ -218,11 +222,12 @@ test_expect_success '*only* files returned by the integration script get flagged # Ensure commands that call refresh_index() to move the index back in time # properly invalidate the fsmonitor cache test_expect_success 'refresh_index() invalidates fsmonitor cache' ' - write_script .git/hooks/fsmonitor-test<<-\EOF && - EOF clean_repo && + write_integration_script && dirty_repo && git add . && + write_script .git/hooks/fsmonitor-test<<-\EOF && + EOF git commit -m "to reset" && git reset HEAD~1 && git status >actual && diff --git a/unpack-trees.c b/unpack-trees.c index 33ea7810d8..fc5ceb932c 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1504,6 +1504,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options o->merge_size = len; mark_all_ce_unused(o->src_index); + if (o->src_index->fsmonitor_last_update) + o->result.fsmonitor_last_update = o->src_index->fsmonitor_last_update; + /* * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries */ @@ -2384,7 +2387,8 @@ int oneway_merge(const struct cache_entry * const *src, if (old && same(old, a)) { int update = 0; - if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) { + if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old) && + !(old->ce_flags & CE_FSMONITOR_VALID)) { struct stat st; if (lstat(old->name, &st) || ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))