Parse fdinfo and inotify stats from /proc/[pid]/fdinfo/[fd] #115

pirxthepilot · 2018-10-16T06:29:40Z

First attempt at adding functionality to support #107. Not quite sure if my approach here is correct - guidance/feedback would be very much appreciated. Also thought I'd let you guys review first before I write the tests.

Thanks!

pgier

Thanks for the contribution! I think this is a good start. To be more consistent with the rest of the package, the code should be in a file called proc_fdinfo.go, and it should parse the data read instead of returning strings and byte slice.

pgier · 2019-05-16T19:16:01Z

inotify.go

+	"regexp"
+	"strings"
+)
+


I think it would be good to create an additional struct here called FDInfo which contains pos, flags, and mnt_id since those fields appear to be consistently available. The FDInfo struct could contain a slice of InotifyStat containing the detailed information for inotify file descriptors.
And to be more consistent with the rest of the API, the file should be called proc_fdinfo.go.

pgier · 2019-05-16T19:18:18Z

inotify.go

+// InotifyStat represents a file descriptor's inotify watch count.
+type InotifyStat struct {
+	// File descriptor
+	FD string


This could be moved into the FDInfo struct.

pgier · 2019-05-16T19:19:28Z

inotify.go

+	// File descriptor
+	FD string
+	// List of inotify lines in the fdinfo file
+	Lines []string


Instead of just loading the line here, I think it would be better to parse the values into their expected fields/types. Or at least add the values to map for easy lookup.

pgier · 2019-05-16T19:36:00Z

proc.go

@@ -256,3 +256,18 @@ func (p Proc) fileDescriptors() ([]string, error) {
 func (p Proc) path(pa ...string) string {
 	return p.fs.Path(append([]string{strconv.Itoa(p.PID)}, pa...)...)
 }
+
+func (p Proc) fileDescriptorInfo(fd string) ([]byte, error) {


This needs to capitalized to be available from outside of the procfs package. Also, I think this should return a FDInfo with the data already parsed, to make it easier to use.

discordianfish · 2019-05-19T11:00:41Z

Agree with pgier and don't have more to add. And sorry for not responding earlier!

pirxthepilot · 2019-05-27T20:53:58Z

Hi folks, just pushed some updates based on your feedback. I replaced fileDescriptorInfo with FileDescriptorsInfo, which now returns a slice of FDInfo types. Also modified and moved InotifyWatchLen to proc.go as it felt more correct to me.

I'm sure this still needs some tweaks. Also, my go-foo isn't too good to begin with :) Hope it at least makes some sense!

pgier · 2019-05-29T21:46:39Z

@pirxthepilot Looks good, but would you mind rebasing on latest master? I think the staticcheck CI failures are related to an outdated Makefile or some other build config.

pirxthepilot · 2019-05-30T05:06:16Z

@pgier whoops, sorry bout that! done!

pgier

@pirxthepilot Would you mind adding some basic tests before we merge?

proc_fdinfo.go

pgier · 2019-06-18T19:37:31Z

@pirxthepilot I think this still needs unit tests before we merge.

pirxthepilot · 2019-06-19T09:20:06Z

@pgier sorry for the delayed response. I pushed a new commit with the requested changes. Just want to run it by you as I start writing the tests.

As for the tests, how should I go about adding fixtures? Do I just append data by hand in fixtures.ttar?

pgier

Looking at this again, I noticed a couple more minor things that might be improved.
For updating the fixtures there is some info in README.md. Just extract the fixtures, make the updates you want, then pack them up again.

proc_fdinfo.go

proc.go

proc_fdinfo.go

pirxthepilot · 2019-06-23T04:39:54Z

Changes made and tests written. I think the test in proc_test.go should provide coverage for the types and functions in proc_fdinfo.go, except for InotifyWatchLen, which I wrote a separate test for in proc_fdinfo_test.go. Let me know if you need anything else.

pgier

Thanks for the update, tests look good. It looks like you are using an out of date fixtures.ttar, you may need to rebase on latest master to avoid conflict in the fixtures.

proc.go

fixtures.ttar

proc_fdinfo.go

pgier · 2019-06-24T17:12:17Z

I think the fixtures issue is a separate issue and should be fixed by PR #185, so you can ignore that part.

Edit: if you temporarily change the base branch of the PR and then change it back to master, it should update the diff to remove the bad fixtures stuff.

Signed-off-by: Joon Guillen <joon@modulogeek.com>

- Use slices instead of arrays to get FileDescriptorsInfo - Move regex declarations into global scope Signed-off-by: Joon Guillen <joon@modulogeek.com>

pirxthepilot · 2019-06-26T07:14:44Z

Updated!

pgier

LGTM

…us#115) Signed-off-by: Joon Guillen <joon@modulogeek.com>

pgier · 2019-06-26T20:20:26Z

Ug, sorry, the commit message lost the signoff when I did a squash merge. I had to amend the commit and do a force push in #189.

…us#115) Signed-off-by: Joon Guillen <joon@modulogeek.com>

Add support for a bunch of low hanging fruits

pirxthepilot force-pushed the inotify branch from 1f5dd0c to 3057985 Compare October 16, 2018 06:31

pgier self-requested a review May 16, 2019 19:06

pgier requested changes May 16, 2019

View reviewed changes

pirxthepilot changed the title ~~Parse inotify stats from /proc/[pid]/fdinfo/[fd]~~ Parse fdinfo and inotify stats from /proc/[pid]/fdinfo/[fd] May 27, 2019

pirxthepilot force-pushed the inotify branch from a8a4605 to 63d2a7d Compare May 30, 2019 05:05

pgier requested changes Jun 5, 2019

View reviewed changes

proc_fdinfo.go Outdated Show resolved Hide resolved

pirxthepilot force-pushed the inotify branch 2 times, most recently from d97b4dd to 26c06f6 Compare June 19, 2019 09:15

pgier requested changes Jun 19, 2019

View reviewed changes

proc_fdinfo.go Show resolved Hide resolved

proc.go Outdated Show resolved Hide resolved

proc_fdinfo.go Outdated Show resolved Hide resolved

pirxthepilot force-pushed the inotify branch 2 times, most recently from 37bb438 to 1b9a28b Compare June 23, 2019 04:36

pgier requested changes Jun 24, 2019

View reviewed changes

proc.go Outdated Show resolved Hide resolved

fixtures.ttar Outdated Show resolved Hide resolved

proc_fdinfo.go Outdated Show resolved Hide resolved

pirxthepilot added 4 commits June 25, 2019 23:59

Parse inotify stats from /proc/[pid]/fdinfo/[fd]

8af32b6

Signed-off-by: Joon Guillen <joon@modulogeek.com>

Improvements to fdinfo/inotify support

1de3d23

Signed-off-by: Joon Guillen <joon@modulogeek.com>

Name changes

4dda1dd

Signed-off-by: Joon Guillen <joon@modulogeek.com>

New ProcFDInfos type, added tests, minor adjustments

a0c2eb2

Signed-off-by: Joon Guillen <joon@modulogeek.com>

pirxthepilot force-pushed the inotify branch 2 times, most recently from b0fbe08 to b6b6455 Compare June 26, 2019 07:09

Additional adjustments

891096e

- Use slices instead of arrays to get FileDescriptorsInfo - Move regex declarations into global scope Signed-off-by: Joon Guillen <joon@modulogeek.com>

pirxthepilot force-pushed the inotify branch from b6b6455 to 891096e Compare June 26, 2019 07:11

pgier approved these changes Jun 26, 2019

View reviewed changes

pgier merged commit 7708988 into prometheus:master Jun 26, 2019

pgier pushed a commit to pgier/procfs that referenced this pull request Jun 26, 2019

Parse fdinfo and inotify stats from /proc/[pid]/fdinfo/[fd] (promethe…

2facbc8

…us#115) Signed-off-by: Joon Guillen <joon@modulogeek.com>

This was referenced Jun 26, 2019

Parse fdinfo and inotify stats from /proc/[pid]/fdinfo/[fd] (#115) #189

Merged

Support for /proc/[pid]/fdinfo/[fd] #107

Closed

remijouannet pushed a commit to remijouannet/procfs that referenced this pull request Oct 20, 2022

Parse fdinfo and inotify stats from /proc/[pid]/fdinfo/[fd] (promethe…

eac35e8

…us#115) Signed-off-by: Joon Guillen <joon@modulogeek.com>

bobrik pushed a commit to bobrik/procfs that referenced this pull request Jan 14, 2023

Merge pull request prometheus#115 from RealKC/low_hanging_fruits

47bfba4

Add support for a bunch of low hanging fruits

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Parse fdinfo and inotify stats from /proc/[pid]/fdinfo/[fd] #115

Parse fdinfo and inotify stats from /proc/[pid]/fdinfo/[fd] #115

pirxthepilot commented Oct 16, 2018

pgier left a comment

pgier May 16, 2019

pgier May 16, 2019

pgier May 16, 2019

pgier May 16, 2019

discordianfish commented May 19, 2019

pirxthepilot commented May 27, 2019

pgier commented May 29, 2019

pirxthepilot commented May 30, 2019

pgier left a comment

pgier commented Jun 18, 2019

pirxthepilot commented Jun 19, 2019

pgier left a comment

pirxthepilot commented Jun 23, 2019 •

edited

pgier left a comment

pgier commented Jun 24, 2019 •

edited

pirxthepilot commented Jun 26, 2019

pgier left a comment

pgier commented Jun 26, 2019

Parse fdinfo and inotify stats from /proc/[pid]/fdinfo/[fd] #115

Parse fdinfo and inotify stats from /proc/[pid]/fdinfo/[fd] #115

Conversation

pirxthepilot commented Oct 16, 2018

pgier left a comment

Choose a reason for hiding this comment

pgier May 16, 2019

Choose a reason for hiding this comment

pgier May 16, 2019

Choose a reason for hiding this comment

pgier May 16, 2019

Choose a reason for hiding this comment

pgier May 16, 2019

Choose a reason for hiding this comment

discordianfish commented May 19, 2019

pirxthepilot commented May 27, 2019

pgier commented May 29, 2019

pirxthepilot commented May 30, 2019

pgier left a comment

Choose a reason for hiding this comment

pgier commented Jun 18, 2019

pirxthepilot commented Jun 19, 2019

pgier left a comment

Choose a reason for hiding this comment

pirxthepilot commented Jun 23, 2019 • edited

pgier left a comment

Choose a reason for hiding this comment

pgier commented Jun 24, 2019 • edited

pirxthepilot commented Jun 26, 2019

pgier left a comment

Choose a reason for hiding this comment

pgier commented Jun 26, 2019

pirxthepilot commented Jun 23, 2019 •

edited

pgier commented Jun 24, 2019 •

edited