Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor client fingerprinters to return a diff of node attributes #3781

Merged
merged 12 commits into from
Feb 2, 2018
Merged

Refactor client fingerprinters to return a diff of node attributes #3781

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5e8151d
refactor Fingerprint to request/response construct
chelseakomlo Jan 24, 2018
a76a404
add test case for available cgroups
chelseakomlo Jan 25, 2018
c21ac46
fixups from code review
chelseakomlo Jan 26, 2018
f5fc20a
create safe getters and setters for fingerprint response
chelseakomlo Jan 26, 2018
ae889b4
remove attributes from periodic fingerprints when state changes
chelseakomlo Jan 26, 2018
e8aaa93
locks for fingerprint reads/writes
chelseakomlo Jan 30, 2018
a9447ad
add applicable boolean to fingerprint response
chelseakomlo Jan 30, 2018
ba2ebbc
code review fixup
chelseakomlo Jan 31, 2018
e5ccc55
add detected to more drivers where the driver is found but unusable
chelseakomlo Feb 1, 2018
15cb768
fix up linting
chelseakomlo Feb 1, 2018
3202200
req/resp should be within config locks; rename for detected fingerprints
chelseakomlo Feb 1, 2018
8049aa0
update log message
chelseakomlo Feb 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/driver/exec_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ const (
)

func (d *ExecDriver) Fingerprint(req *cstructs.FingerprintRequest, resp *cstructs.FingerprintResponse) error {
// The exec driver will be detected in every case
resp.Detected = true

// Only enable if cgroups are available and we are root
if !cgroupsMounted(req.Node) {
if d.fingerprintSuccess == nil || *d.fingerprintSuccess {
Expand All @@ -35,6 +38,5 @@ func (d *ExecDriver) Fingerprint(req *cstructs.FingerprintRequest, resp *cstruct
}
resp.AddAttribute(execDriverAttr, "1")
d.fingerprintSuccess = helper.BoolToPtr(true)
resp.Detected = true
return nil
}
1 change: 1 addition & 0 deletions client/driver/java.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ func (d *JavaDriver) Fingerprint(req *cstructs.FingerprintRequest, resp *cstruct
}
d.fingerprintSuccess = helper.BoolToPtr(false)
resp.RemoveAttribute(javaDriverAttr)
resp.Detected = true
Copy link
Contributor

Choose a reason for hiding this comment

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

We should probably move this block to below checking for the java binary.

return nil
}

Expand Down