Merge remote-tracking branch 'origin/master' into lock-fix

Author: rajagopalanand

CHANGELOG.md

@@ -36,6 +36,7 @@
 * [BUGFIX] Distributor: Shuffle-Sharding with IngestionTenantShardSize == 0, default sharding strategy should be used #5189
 * [BUGFIX] Cortex: Fix GRPC stream clients not honoring overrides for call options. #5797
 * [BUGFIX] Ring DDB: Fix lifecycle for ring counting unhealthy pods as healthy. #5838
+* [BUGFIX] Ring DDB: Fix region assignment. #5842
 * [BUGFIX] Improve GetRules performance #5805
 
 ## 1.16.0 2023-11-20

pkg/ring/kv/dynamodb/dynamodb.go

@@ -57,13 +57,12 @@ func newDynamodbKV(cfg Config, logger log.Logger) (dynamodbKV, error) {
 		return dynamodbKV{}, err
 	}
 
+	awsCfg := aws.NewConfig()
 	if len(cfg.Region) > 0 {
-		sess.Config = &aws.Config{
-			Region: aws.String(cfg.Region),
-		}
+		awsCfg = awsCfg.WithRegion(cfg.Region)
 	}
 
-	dynamoDB := dynamodb.New(sess)
+	dynamoDB := dynamodb.New(sess, awsCfg)
 
 	ddbKV := &dynamodbKV{
 		ddbClient: dynamoDB,

pkg/ring/kv/dynamodb/dynamodb_test.go

@@ -28,6 +28,12 @@ func Test_TTLDisabled(t *testing.T) {
 
 }
 
+func Test_newDynamodbKV(t *testing.T) {
+	_, err := newDynamodbKV(Config{Region: "us-west-2", TableName: "TEST"}, TestLogger{})
+
+	require.NoError(t, err)
+}
+
 func Test_TTL(t *testing.T) {
 	ddbClientMock := &mockDynamodb{
 		putItem: func(input *dynamodb.PutItemInput) *dynamodb.PutItemOutput {

pkg/storage/tsdb/inmemory_index_cache.go

@@ -2,7 +2,6 @@ package tsdb
 
 import (
 	"context"
-	"reflect"
 	"unsafe"
 
 	"github.com/VictoriaMetrics/fastcache"
@@ -122,12 +121,7 @@ func yoloBuf(s string) []byte {
 }
 
 func copyString(s string) string {
-	var b []byte
-	h := (*reflect.SliceHeader)(unsafe.Pointer(&b))
-	h.Data = (*reflect.StringHeader)(unsafe.Pointer(&s)).Data
-	h.Len = len(s)
-	h.Cap = len(s)
-	return string(b)
+	return string(unsafe.Slice(unsafe.StringData(s), len(s)))
 }
 
 // copyToKey is required as underlying strings might be memory-mapped.