lib/fs: Correct wrapping order for meaningful log-caller #7209
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
calmh
previously approved these changes
Dec 21, 2020
Comment on lines
+263
to
+265
| // wrapFilesystem should always be used when wrapping a Filesystem. | ||
| // It ensures proper wrapping order, which right now means: | ||
| // `logFilesystem` needs to be the outermost wrapper for caller lookup. |
There was a problem hiding this comment.
We have two different wrapping orders of logfs and walkfs, depending on whether we want to debug above or below walkfs... Probably that does not matter, and maybe we should remove the walkfs trace option as this is potentially confusing
There was a problem hiding this comment.
Having both fs and walkfs has merits: The former will just print one debug line that it will start walking now, the latter will also print every filesystem operation that occurs while walking - I think I remember I needed that huge walking verbosity once. And the unwrapping added in this PR is correct for both cases: It's appropriate for the filesystem calls originating in the walking code to give the fs walking code as the caller.
calmh
reviewed
Dec 21, 2020
lib/ignore/ignore_test.go
Outdated
| @@ -1192,3 +1192,31 @@ func TestEmptyPatterns(t *testing.T) { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| func TestUnignoredParent(t *testing.T) { | |||
3ba9b0b to
b8a9f2a
Compare
calmh
approved these changes
Dec 21, 2020
calmh
added a commit
to calmh/syncthing
that referenced
this pull request
Dec 21, 2020
* main: (27 commits) lib/fs: Correct wrapping order for meaningful log-caller (syncthing#7209) all: Handle errors opening db/creating file-set (ref syncthing#5907) (syncthing#7150) cmd/relaypoolsrv: Allow validation of relay join requests by certificate (fixes syncthing#7196) (syncthing#7217) lib: Close underlying conn in protocol (fixes syncthing#7165) (syncthing#7212) lib/db: Prevent IndexID creation race (syncthing#7211) gui: Reflect change in untrusted in sharing tab (syncthing#7201) lib/db: Remove index ids when dropping folder (syncthing#7200) lib/model: Fix flaky test and add some scanning debug (syncthing#7214) lib: Consistently set suture logging (syncthing#7202) lib/model: Unflake TestIgnoreDeleteUnignore (syncthing#7208) gui: Apply changes to untrusted (ref syncthing#6443) (syncthing#7206) lib/config: Remove deprecated pending entries from config (ref syncthing#6443) (syncthing#7204) all: Store pending devices and folders in database (fixes syncthing#7178) (syncthing#6443) gui, man, authors: Update docs, translations, and contributors gui: Sort folders and devices in advanced config modal (syncthing#7192) model: Actually print folder description in "Overriding" log message gui: version.tags is an array, which is truthy when empty build: Switch to gopsutil's v3 module (syncthing#7191) build: Update notify (fixes syncthing#7076) (syncthing#7189) lib/api: Returns tags in version as list (syncthing#7190) ...
hiqua
pushed a commit
to hiqua/syncthing
that referenced
this pull request
Jan 11, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With
fsdebug logging we print information about what called the fs method. However for case- and mtime-fileysstems, this information is entirely useless, as it just points at the overriding method in those wrappers (e.g. chmod just says it was called by chmod). To prevent that I added a utility function that ensures proper wrapping order: