node/object: Improve SEARCH and GET (#2722)

Author: cthulhu-rider

CHANGELOG.md

@@ -85,6 +85,7 @@ For example, `attr>=100` or `attr=` are now processed differently. See `-h` for
 - Incorrect handling of notary request leading to inability to collect signatures in some cases (#2715)
 - Deadlock in autodeploy routine (#2720)
 - SN now validates session tokens attached to objects (#1159)
+- Object search server no longer wastes system resources sending empty intermediate messages to the stream (#2722)
 
 ### Changed
 - Created files are not group writable (#2589)

pkg/services/object/get/container.go

@@ -41,6 +41,7 @@ func (exec *execCtx) processEpoch(epoch uint64) bool {
 	defer cancel()
 
 	exec.status = statusUndefined
+	mProcessedNodes := make(map[string]struct{})
 
 	for {
 		addrs := traverser.Next()
@@ -61,6 +62,13 @@ func (exec *execCtx) processEpoch(epoch uint64) bool {
 			default:
 			}
 
+			strKey := string(addrs[i].PublicKey())
+			if _, ok = mProcessedNodes[strKey]; ok {
+				continue
+			}
+
+			mProcessedNodes[strKey] = struct{}{}
+
 			// TODO: #1142 consider parallel execution
 			// TODO: #1142 consider optimization: if status == SPLIT we can continue until
 			//  we reach the best result - split info with linking object ID.

pkg/services/object/get/get_test.go

@@ -426,8 +426,12 @@ func testNodeMatrix(t testing.TB, dim []int) ([][]netmap.NodeInfo, [][]string) {
 				strconv.Itoa(60000+j),
 			)
 
+			bPubKey := make([]byte, 33)
+			rand.Read(bPubKey)
+
 			var ni netmap.NodeInfo
 			ni.SetNetworkEndpoints(a)
+			ni.SetPublicKey(bPubKey)
 
 			var na network.AddressGroup
 

pkg/services/object/search/container.go

@@ -45,6 +45,8 @@ func (exec *execCtx) processEpoch(epoch uint64) bool {
 	ctx, cancel := context.WithCancel(exec.context())
 	defer cancel()
 
+	mProcessedNodes := make(map[string]struct{})
+
 	for {
 		addrs := traverser.Next()
 		if len(addrs) == 0 {
@@ -56,6 +58,13 @@ func (exec *execCtx) processEpoch(epoch uint64) bool {
 		var mtx sync.Mutex
 
 		for i := range addrs {
+			strKey := string(addrs[i].PublicKey())
+			if _, ok = mProcessedNodes[strKey]; ok {
+				continue
+			}
+
+			mProcessedNodes[strKey] = struct{}{}
+
 			wg.Add(1)
 			go func(i int) {
 				defer wg.Done()

pkg/services/object/search/exec.go

@@ -83,7 +83,11 @@ func (exec *execCtx) generateTraverser(cnr cid.ID, epoch uint64) (*placement.Tra
 }
 
 func (exec *execCtx) writeIDList(ids []oid.ID) {
-	err := exec.prm.writer.WriteIDs(ids)
+	var err error
+
+	if len(ids) > 0 {
+		err = exec.prm.writer.WriteIDs(ids)
+	}
 
 	switch {
 	default:

pkg/services/object/search/search_test.go

@@ -210,8 +210,12 @@ func testNodeMatrix(t testing.TB, dim []int) ([][]netmap.NodeInfo, [][]string) {
 				strconv.Itoa(60000+j),
 			)
 
+			bPubKey := make([]byte, 33)
+			rand.Read(bPubKey)
+
 			var ni netmap.NodeInfo
 			ni.SetNetworkEndpoints(a)
+			ni.SetPublicKey(bPubKey)
 
 			var na network.AddressGroup