small fixes

Author: dmitryk-dk

app/vlselect/internalselect/internalselect.go

@@ -424,12 +424,15 @@ func writeValuesWithHits(w http.ResponseWriter, qctx *logstorage.QueryContext, v
 	return nil
 }
 
-func writeTenantIDs(w http.ResponseWriter, tenantIDs []byte, disableCompression bool) error {
+func writeTenantIDs(w http.ResponseWriter, tenantIDs []logstorage.TenantID, disableCompression bool) error {
+	// Marshal tenantIDs at first
+	var b []byte
+	logstorage.MarshalTenantIDs(b, tenantIDs)
 	if !disableCompression {
-		tenantIDs = zstd.CompressLevel(nil, tenantIDs, 1)
+		b = zstd.CompressLevel(nil, b, 1)
 	}
 	w.Header().Set("Content-Type", "application/json")
-	if _, err := w.Write(tenantIDs); err != nil {
+	if _, err := w.Write(b); err != nil {
 		return fmt.Errorf("cannot send response to the client: %w", err)
 	}
 	return nil

app/vlselect/logsql/logsql.go

@@ -2,7 +2,6 @@ package logsql
 
 import (
 	"context"
-	"encoding/json"
 	"flag"
 	"fmt"
 	"io"

app/vlstorage/main.go

@@ -1,6 +1,7 @@
 package vlstorage
 
 import (
+	"context"
 	"encoding/json"
 	"flag"
 	"fmt"

app/vlstorage/netselect/netselect.go

@@ -236,7 +236,7 @@ func (sn *storageNode) getTenantIDs(ctx context.Context, start, end int64) ([]by
 	args.Set("start", fmt.Sprintf("%d", start))
 	args.Set("end", fmt.Sprintf("%d", end))
 	args.Set("disable_compression", fmt.Sprintf("%v", sn.s.disableCompression))
-	return sn.executeRequestAt(ctx, "/internal/select/tenant_ids", args)
+	return sn.getResponseForPathAndArgs(ctx, "/internal/select/tenant_ids", args)
 }
 
 func (sn *storageNode) getCommonArgs(version string, qctx *logstorage.QueryContext) url.Values {
@@ -476,7 +476,7 @@ func (s *Storage) getTenantIDs(ctx context.Context, start, end int64) ([]logstor
 		}(i)
 	}
 	wg.Wait()
-	if err := getFirstNonCancelError(errs); err != nil {
+	if err := getFirstError(errs, false); err != nil {
 		return nil, err
 	}