Skip to content

Commit

Permalink
fix: bump memlimit check to 30s interval (#14939)
Browse files Browse the repository at this point in the history
(cherry picked from commit 23d9531)

# Conflicts:
#	internal/beatcmd/beat.go
  • Loading branch information
kruskall authored and mergify[bot] committed Dec 13, 2024
1 parent 9419937 commit 3728b17
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions internal/beatcmd/beat.go
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,14 @@ func (b *Beat) Run(ctx context.Context) error {
return adjustMaxProcs(ctx, 30*time.Second, logger)
})

<<<<<<< HEAD

Check failure on line 351 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

syntax error: unexpected <<, expected }

Check failure on line 351 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

syntax error: unexpected <<, expected }

Check failure on line 351 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / lint

expected statement, found '<<'

Check failure on line 351 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / system-test

syntax error: unexpected <<, expected }

Check failure on line 351 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / system-test

syntax error: unexpected <<, expected }
=======
slogger := slog.New(zapslog.NewHandler(logger.Core()))
if err := adjustMemlimit(30*time.Second, slogger); err != nil {
return err
}

>>>>>>> 23d9531d (fix: bump memlimit check to 30s interval (#14939))

Check failure on line 358 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

invalid character U+0023 '#'

Check failure on line 358 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

invalid character U+0023 '#'

Check failure on line 358 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / lint

expected statement, found '>>'

Check failure on line 358 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / lint

illegal character U+0023 '#'

Check failure on line 358 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / system-test

invalid character U+0023 '#'

Check failure on line 358 in internal/beatcmd/beat.go

View workflow job for this annotation

GitHub Actions / system-test

invalid character U+0023 '#'
logSystemInfo(b.Info)

cleanup, err := b.registerElasticsearchVersionCheck()
Expand Down

0 comments on commit 3728b17

Please sign in to comment.