Skip to content

Commit

Permalink
Refactor function name and add comments
Browse files Browse the repository at this point in the history
Signed-off-by: constanca <[email protected]>
  • Loading branch information
constanca-m committed Jan 8, 2024
1 parent 3e55e7b commit 15de770
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions metricbeat/module/kubernetes/util/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ func startWatcher(
return false, nil
}

// addToWhichAreUsing adds resource identified by usingName to the list of resources using the watcher
// identified by resourceName
func addToWhichAreUsing(resourceName string, usingName string, resourceWatchers *Watchers) {
resourceWatchers.lock.Lock()
defer resourceWatchers.lock.Unlock()
Expand All @@ -263,9 +265,9 @@ func addToWhichAreUsing(resourceName string, usingName string, resourceWatchers
}
}

// removeToWhichAreUsing returns true if element was removed and new size of array.
// removeFromWhichAreUsing returns true if element was removed and new size of array.
// The cache should be locked when called.
func removeToWhichAreUsing(resourceName string, notUsingName string, resourceWatchers *Watchers) (bool, int) {
func removeFromWhichAreUsing(resourceName string, notUsingName string, resourceWatchers *Watchers) (bool, int) {
data, ok := resourceWatchers.watchersMap[resourceName]
removed := false
if ok {
Expand Down Expand Up @@ -793,7 +795,7 @@ func (e *enricher) Stop(resourceWatchers *Watchers) {

resourceWatcher := resourceWatchers.watchersMap[e.resourceName]
if resourceWatcher != nil && resourceWatcher.watcher != nil && resourceWatcher.whichAreUsing != nil && resourceWatcher.started {
_, size := removeToWhichAreUsing(e.resourceName, e.resourceName, resourceWatchers)
_, size := removeFromWhichAreUsing(e.resourceName, e.resourceName, resourceWatchers)
if size == 0 {
resourceWatcher.watcher.Stop()
resourceWatcher.started = false
Expand All @@ -804,7 +806,7 @@ func (e *enricher) Stop(resourceWatchers *Watchers) {
for _, extra := range extras {
extraWatcher := resourceWatchers.watchersMap[extra]
if extraWatcher != nil && extraWatcher.watcher != nil && extraWatcher.whichAreUsing != nil && extraWatcher.started {
_, size := removeToWhichAreUsing(extra, e.resourceName, resourceWatchers)
_, size := removeFromWhichAreUsing(extra, e.resourceName, resourceWatchers)
if size == 0 {
extraWatcher.watcher.Stop()
extraWatcher.started = false
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/kubernetes/util/kubernetes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@ func TestRemoveToWhichAreUsing(t *testing.T) {
resourceWatchers.lock.Lock()
defer resourceWatchers.lock.Unlock()

removed, size := removeToWhichAreUsing(DeploymentResource, DeploymentResource, resourceWatchers)
removed, size := removeFromWhichAreUsing(DeploymentResource, DeploymentResource, resourceWatchers)
require.True(t, removed)
require.Equal(t, 1, size)

removed, size = removeToWhichAreUsing(DeploymentResource, DeploymentResource, resourceWatchers)
removed, size = removeFromWhichAreUsing(DeploymentResource, DeploymentResource, resourceWatchers)
require.False(t, removed)
require.Equal(t, 1, size)

removed, size = removeToWhichAreUsing(DeploymentResource, PodResource, resourceWatchers)
removed, size = removeFromWhichAreUsing(DeploymentResource, PodResource, resourceWatchers)
require.True(t, removed)
require.Equal(t, 0, size)
}
Expand Down

0 comments on commit 15de770

Please sign in to comment.