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

[pkg/stanza] Windows input operator should resubscribe when remote host restarts #35175

Merged
merged 17 commits into from
Sep 24, 2024
Merged

[pkg/stanza] Windows input operator should resubscribe when remote host restarts #35175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
760c2c9
attempt to reconnect
kuiperda Sep 11, 2024
681ab5f
try using correct stop/start commands and 30s retry loop
kuiperda Sep 12, 2024
78167a4
try restart function
kuiperda Sep 12, 2024
f058898
try session start/stop again
kuiperda Sep 12, 2024
280a0ff
reset code
kuiperda Sep 12, 2024
34e422a
iterate on fix
kuiperda Sep 12, 2024
a1c26f5
close subscription
kuiperda Sep 12, 2024
a3bc0e1
Recreate subscription if failing to read events
kuiperda Sep 13, 2024
4546bea
Add logging
kuiperda Sep 13, 2024
ff7cd79
add chlog
kuiperda Sep 13, 2024
269c69a
check if connection is remote before resubscribing to remote
kuiperda Sep 16, 2024
365165b
try without variables and log error for testing
kuiperda Sep 16, 2024
18698fc
remove logging
kuiperda Sep 16, 2024
c5c1787
more specific logger info
kuiperda Sep 16, 2024
13a51df
match windows err
kuiperda Sep 19, 2024
0a42172
replace handle not open with variable
kuiperda Sep 20, 2024
4ac1c32
remove logging
kuiperda Sep 20, 2024
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
Prev Previous commit
remove logging
  • Loading branch information
@kuiperda
kuiperda committed Sep 23, 2024
commit 4ac1c327886977ad45c2ef8535b5cf41dac65bbc
5 changes: 1 addition & 4 deletions pkg/stanza/operator/input/windows/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,7 @@ func (i *Input) read(ctx context.Context) int {
events, err := i.subscription.Read(i.maxReads)
if err != nil {
i.Logger().Error("Failed to read events from subscription", zap.Error(err))
i.Logger().Info("Error is: ", zap.Error(err))
i.Logger().Info("windowserr is: ", zap.Error(windows.ERROR_INVALID_HANDLE))
i.Logger().Info("notopenerror is: ", zap.Error(ErrHandleNotOpen))
if i.isRemote() && (errors.Is(err, windows.ERROR_INVALID_HANDLE) || errors.Is(err, ErrHandleNotOpen)) {
if i.isRemote() && (errors.Is(err, windows.ERROR_INVALID_HANDLE) || errors.Is(err, errSubscriptionHandleNotOpen)) {
i.Logger().Info("Resubscribing, closing remote subscription")
closeErr := i.subscription.Close()
if closeErr != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/stanza/operator/input/windows/subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ func (s *Subscription) Close() error {
return nil
}

var ErrHandleNotOpen = fmt.Errorf("subscription handle is not open")
var errSubscriptionHandleNotOpen = errors.New("subscription handle is not open")

// Read will read events from the subscription.
func (s *Subscription) Read(maxReads int) ([]Event, error) {
if s.handle == 0 {
return nil, ErrHandleNotOpen
return nil, errSubscriptionHandleNotOpen
}

if maxReads < 1 {
Expand Down