Skip to content

Deflake directory iterator for windows#24469

Merged
mattklein123 merged 3 commits intoenvoyproxy:mainfrom
ravenblackx:stat2
Dec 9, 2022
Merged

Deflake directory iterator for windows#24469
mattklein123 merged 3 commits intoenvoyproxy:mainfrom
ravenblackx:stat2

Conversation

@ravenblackx
Copy link
Contributor

@ravenblackx ravenblackx commented Dec 9, 2022

Commit Message: Deflake directory iterator for windows
Additional Description: #24176 made windows CI flaky - I mistakenly used a flag without checking if the prerequisite other flag that makes that flag meaningful was present. This fixes that.
Relevant documentation:

dwReserved0

If the dwFileAttributes member includes the FILE_ATTRIBUTE_REPARSE_POINT attribute, this member specifies the reparse point tag.

Otherwise, this value is undefined and should not be used.

Risk Level: Negative.
Testing: CI should stop being flaky. Cannot test directly, no Windows.
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: It's Windows-only.

Signed-off-by: Raven Black <ravenblack@dropbox.com>
jmarantz
jmarantz previously approved these changes Dec 9, 2022
Copy link
Contributor

@jmarantz jmarantz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm modulo comment request.

Could merge w/o that of course to ease the flakes.

} else if (find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
return {std::string(find_data.cFileName), FileType::Directory, absl::nullopt};
} else if (find_data.dwReserved0 & IO_REPARSE_TAG_SYMLINK) {
} else if ((find_data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add the link from the description into the source code here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Signed-off-by: Raven Black <ravenblack@dropbox.com>
Sync past mobile_docs CI failure.

Signed-off-by: Raven Black <ravenblack@dropbox.com>
@mattklein123 mattklein123 merged commit c99a89c into envoyproxy:main Dec 9, 2022
@ravenblackx ravenblackx deleted the stat2 branch December 16, 2022 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants