Add a file lock to the data directory on startup to prevent multiple agents. #18483
Conversation
This file contains 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
|
Pinging @elastic/ingest-management (Team:Ingest Management) |
botelastic
bot
added
needs_team
blakerouse
commented
May 13, 2020
| @@ -42,7 +42,7 @@ func NewDownloader(config *artifact.Config) *Downloader { | |||
| func (e *Downloader) Download(_ context.Context, programName, version string) (string, error) { | |||
| // create a destination directory root/program | |||
| destinationDir := filepath.Join(e.config.TargetDirectory, programName) | |||
| if err := os.MkdirAll(destinationDir, os.ModeDir); err != nil { | |||
| if err := os.MkdirAll(destinationDir, 0755); err != nil { | |||
There was a problem hiding this comment.
This is a drive-by fix on Mac os.ModeDir does not create the directory with the proper permissions. 0755 must be used.
💚 Build Succeeded
Expand to view the summary
Build stats
|
michalpristas
requested changes
May 14, 2020
| if err := locker.TryLock(); err != nil { | ||
| return err | ||
| } | ||
| defer locker.Unlock() |
There was a problem hiding this comment.
can you make sure this is handled even if we are killed. defer statements are skipped if SIGINT or SIGTERM are received and it can prevent us from restarting
There was a problem hiding this comment.
I have verified that this does get called in all the cases defined below with signals.
signals := make(chan os.Signal, 1)
signal.Notify(signals, syscall.SIGINT, syscall.SIGKILL, syscall.SIGTERM, syscall.SIGQUIT)
<-signals
So the defer does get called. I did find a bug in periodic that was preventing app.Start from returning to catch the signals. I have fixed that in my most recent commit.
michalpristas
approved these changes
May 14, 2020
4 tasks
blakerouse
added a commit
to blakerouse/beats
that referenced
this pull request
May 14, 2020
…agents. (elastic#18483) * Add a file lock to the data directory on startup to prevent multiple agents. * Add export comments to AppLocker. * Fix periodic to not block startup. (cherry picked from commit e1a4741)
v1v
added a commit
to v1v/beats
that referenced
this pull request
May 15, 2020
…w-oss * upstream/master: (27 commits) Disable host fields for "cloud", panw, cef modules (elastic#18223) [docs] Rename monitoring collection from legacy internal collection to legacy collection (elastic#18504) Introduce auto detection of format (elastic#18095) Add additional fields to address issue elastic#18465 for googlecloud audit log (elastic#18472) Fix libbeat import path in seccomp policy template (elastic#18418) Address Okta input issue elastic#18530 (elastic#18534) [Ingest Manager] Avoid Chown on windows (elastic#18512) Fix Cisco ASA/FTD msgs that use a host name as NAT address (elastic#18376) [CI] Optimise stash/unstash performance (elastic#18473) Libbeat: Remove global loggers from libbeat/metric and libbeat/cloudid (elastic#18500) Fix PANW bad mapping of client/source and server/dest packets and bytes (elastic#18525) Add a file lock to the data directory on startup to prevent multiple agents. (elastic#18483) Followup to 12606 (elastic#18316) changed input from syslog to tcp/udp due to unsupported RFC (elastic#18447) Improve ECS field mappings in Sysmon module. (elastic#18381) [Elastic Agent] Cleaner output of inspect command (elastic#18405) [Elastic Agent] Pick up version from libbeat (elastic#18350) Update communitybeats.asciidoc (elastic#18470) [Metricbeat] Change visualization interval from 15m to >=15m (elastic#18466) docs: Fix typo in kerberos docs (elastic#18503) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Adds an
agent.lockto thepath.datadirectory.Why is it important?
Prevents the ability to run multiple agents on the same host.
Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration filesAuthor's Checklist
How to test this PR locally
Try to start two
elastic-agentat the same time on the same host and see that the second one started errors out withanother elastic-agent is already running.Related issues