Merge pull request #1628 from ydb-platform/blackduck

Blackduck

Author: rekby

CHANGELOG.md

@@ -1,3 +1,6 @@
+* Fixed potential infinity loop for local dc detection
+* Fixed nil pointer dereferenced in a topic listener
+
 ## v3.99.2
 * Fixed panic when error returned from parsing sql params
 * Fixed explicit null dereferenced issue in internal/credentials/static.go (CWE-476)

internal/balancer/local_dc.go

@@ -7,6 +7,7 @@ import (
 	"math/rand"
 	"net"
 	"net/url"
+	"slices"
 	"strings"
 	"sync"
 
@@ -157,21 +158,12 @@ func getRandomEndpoints(endpoints []endpoint.Endpoint, count int) []endpoint.End
 		return endpoints
 	}
 
-	got := make(map[int]bool, maxEndpointsCheckPerLocation)
+	endpoints = slices.Clone(endpoints)
+	rand.Shuffle(len(endpoints), func(i, j int) {
+		endpoints[i], endpoints[j] = endpoints[j], endpoints[i]
+	})
 
-	res := make([]endpoint.Endpoint, 0, maxEndpointsCheckPerLocation)
-	for len(got) < count {
-		//nolint:gosec
-		index := rand.Intn(len(endpoints))
-		if got[index] {
-			continue
-		}
-
-		got[index] = true
-		res = append(res, endpoints[index])
-	}
-
-	return res
+	return endpoints[:count]
 }
 
 func splitEndpointsByLocation(endpoints []endpoint.Endpoint) map[string][]endpoint.Endpoint {

internal/topic/topiclistenerinternal/stream_listener.go

@@ -339,11 +339,6 @@ func (l *streamListener) onStopPartitionRequest(
 	m *rawtopicreader.StopPartitionSessionRequest,
 ) error {
 	session, err := l.sessions.Get(m.PartitionSessionID)
-	if !m.Graceful && session == nil {
-		// stop partition may be received twice: graceful and force
-		// the sdk we can forget about the session after graceful stop
-		return nil
-	}
 	if err != nil {
 		return err
 	}