Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions service/sharddistributor/leader/process/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package process

import (
"context"
"errors"
"fmt"
"maps"
"math/rand"
Expand Down Expand Up @@ -214,6 +215,9 @@ func (p *namespaceProcessor) runRebalancingLoop(ctx context.Context) {
err = p.rebalanceShards(ctx)
}
if err != nil {
if isCancelledOrDeadlineExceeded(err) {
return
}
p.logger.Error("rebalance failed", tag.Error(err))
}
}
Expand All @@ -233,6 +237,9 @@ func (p *namespaceProcessor) runShardStatsCleanupLoop(ctx context.Context) {
p.logger.Info("Periodic shard stats cleanup triggered.")
namespaceState, err := p.shardStore.GetState(ctx, p.namespaceCfg.Name)
if err != nil {
if isCancelledOrDeadlineExceeded(err) {
return
}
p.logger.Error("Failed to get state for shard stats cleanup", tag.Error(err))
continue
}
Expand All @@ -242,6 +249,9 @@ func (p *namespaceProcessor) runShardStatsCleanupLoop(ctx context.Context) {
continue
}
if err := p.shardStore.DeleteShardStats(ctx, p.namespaceCfg.Name, staleShardStats, p.election.Guard()); err != nil {
if isCancelledOrDeadlineExceeded(err) {
return
}
p.logger.Error("Failed to delete stale shard stats", tag.Error(err))
}
}
Expand Down Expand Up @@ -340,6 +350,9 @@ func (p *namespaceProcessor) rebalanceShardsImpl(ctx context.Context, metricsLoo

namespaceState, err := p.shardStore.GetState(ctx, p.namespaceCfg.Name)
if err != nil {
if isCancelledOrDeadlineExceeded(err) {
return err
}
return fmt.Errorf("get state: %w", err)
}

Expand Down Expand Up @@ -386,6 +399,9 @@ func (p *namespaceProcessor) rebalanceShardsImpl(ctx context.Context, metricsLoo
ExecutorsToDelete: staleExecutors,
}, p.election.Guard())
if err != nil {
if isCancelledOrDeadlineExceeded(err) {
return err
}
return fmt.Errorf("assign shards: %w", err)
}

Expand Down Expand Up @@ -586,3 +602,8 @@ func makeShards(num int64) []string {
}
return shards
}

func isCancelledOrDeadlineExceeded(err error) bool {
return errors.Is(err, context.Canceled) ||
errors.Is(err, context.DeadlineExceeded)
}
12 changes: 12 additions & 0 deletions service/sharddistributor/store/etcd/executorstore/etcdstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,14 @@ func (s *executorStoreImpl) GetState(ctx context.Context, namespace string) (*st
executorPrefix := etcdkeys.BuildExecutorsPrefix(s.prefix, namespace)
resp, err := s.client.Get(ctx, executorPrefix, clientv3.WithPrefix())
if err != nil {
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
return nil, ctx.Err()
}
return nil, fmt.Errorf("get executor data: %w", err)
}
if ctxErr := ctx.Err(); errors.Is(ctxErr, context.Canceled) || errors.Is(ctxErr, context.DeadlineExceeded) {
return nil, ctxErr
}

for _, kv := range resp.Kvs {
key := string(kv.Key)
Expand Down Expand Up @@ -276,8 +282,14 @@ func (s *executorStoreImpl) GetState(ctx context.Context, namespace string) (*st
shardsPrefix := etcdkeys.BuildShardsPrefix(s.prefix, namespace)
shardResp, err := s.client.Get(ctx, shardsPrefix, clientv3.WithPrefix())
if err != nil {
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
return nil, ctx.Err()
}
return nil, fmt.Errorf("get shard data: %w", err)
}
if ctxErr := ctx.Err(); errors.Is(ctxErr, context.Canceled) || errors.Is(ctxErr, context.DeadlineExceeded) {
return nil, ctxErr
}
for _, kv := range shardResp.Kvs {
shardID, shardKeyType, err := etcdkeys.ParseShardKey(s.prefix, namespace, string(kv.Key))
if err != nil {
Expand Down
Loading