From 9d0a516a903677da029be11fe95d87bf22e8e07f Mon Sep 17 00:00:00 2001 From: Len Gamburg Date: Thu, 8 Feb 2024 09:53:51 -0500 Subject: [PATCH 1/4] Fixed previous PR typo --- pkg/util/winutil/etw/etw.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/util/winutil/etw/etw.go b/pkg/util/winutil/etw/etw.go index 6bdc7703460f2..e65c4f40e88f1 100644 --- a/pkg/util/winutil/etw/etw.go +++ b/pkg/util/winutil/etw/etw.go @@ -161,8 +161,7 @@ func StartEtw(subscriptionName string, etwProviders ProviderType, sub Subscriber // See above note about http-centrism func StopEtw(subscriptionName string) { subs := getSubscribers() - - if len(subscribers) != 0 { + if len(subs) != 0 { C.StopEtwSubscription() for _, s := range subs { s.OnStop() From f9600d89373512aaaf0e0c08612e6043c752970d Mon Sep 17 00:00:00 2001 From: Len Gamburg Date: Thu, 8 Feb 2024 13:39:30 -0500 Subject: [PATCH 2/4] [skip-ci] Add release notes --- ...-etw-race-incident-25148-v2-13185809525258bc.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml diff --git a/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml b/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml new file mode 100644 index 0000000000000..d705505beda93 --- /dev/null +++ b/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml @@ -0,0 +1,12 @@ +# Each section from every release note are combined when the +# CHANGELOG.rst is rendered. So the text needs to be worded so that +# it does not depend on any information only available in another +# section. This may mean repeating some details, but each section +# must be readable independently of the other. +# +# Each section note must be formatted as reStructuredText. +--- +fixes: + - | + Fix recent PR #22664 which in turn fixes race condition in ETW package. + The previous PR introduces minor error which addressed in this PR From d5b645bb53327a32e6217cb14ef64f290cf37e22 Mon Sep 17 00:00:00 2001 From: Len Gamburg <98782554+iglendd@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:58:58 -0500 Subject: [PATCH 3/4] Update releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml [er suggesion Co-authored-by: jhgilbert --- .../legacy-etw-race-incident-25148-v2-13185809525258bc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml b/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml index d705505beda93..4cf77e4f681e7 100644 --- a/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml +++ b/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml @@ -8,5 +8,5 @@ --- fixes: - | - Fix recent PR #22664 which in turn fixes race condition in ETW package. + Fix recent PR #22664 which in turn fixes a race condition in the ETW package. The previous PR introduces minor error which addressed in this PR From 54d9105bef3eb9efe17b0e530604e6048bde3e1f Mon Sep 17 00:00:00 2001 From: Len Gamburg <98782554+iglendd@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:04:51 -0500 Subject: [PATCH 4/4] Update releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml Co-authored-by: jhgilbert --- .../legacy-etw-race-incident-25148-v2-13185809525258bc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml b/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml index 4cf77e4f681e7..392ae277c4a1a 100644 --- a/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml +++ b/releasenotes/notes/legacy-etw-race-incident-25148-v2-13185809525258bc.yaml @@ -9,4 +9,4 @@ fixes: - | Fix recent PR #22664 which in turn fixes a race condition in the ETW package. - The previous PR introduces minor error which addressed in this PR + The previous PR introduced a minor error addressed in this PR.