Per shard per namespace RPS warning log

common/dynamicconfig/constants.go

@@ -116,6 +116,8 @@ const (
 	PersistenceHealthSignalBufferSize = "system.persistenceHealthSignalBufferSize"
 	// ShardRPSWarnLimit is the per-shard RPS limit for warning
 	ShardRPSWarnLimit = "system.shardRPSWarnLimit"
+	// ShardPerNsRPSWarnLimit is the per-shard per-namespace RPS limit for warning
+	ShardPerNsRPSWarnLimit = "system.shardPerNsRPSWarnLimit"
 
 	// Whether the deadlock detector should dump goroutines
 	DeadlockDumpGoroutines = "system.deadlock.DumpGoroutines"

common/persistence/client/fx.go

@@ -125,6 +125,7 @@ func HealthSignalAggregatorProvider(
 			dynamicCollection.GetIntProperty(dynamicconfig.PersistenceHealthSignalBufferSize, 5000)(),
 			metricsHandler,
 			dynamicCollection.GetIntProperty(dynamicconfig.ShardRPSWarnLimit, 50),
+			dynamicCollection.GetIntProperty(dynamicconfig.ShardPerNsRPSWarnLimit, 50),
 			logger,
 		)
 	}

common/persistence/health_signal_aggregator.go

@@ -44,7 +44,7 @@ const (
 type (
 	HealthSignalAggregator interface {
 		common.Daemon
-		Record(callerSegment int32, latency time.Duration, err error)
+		Record(callerSegment int32, namespace string, latency time.Duration, err error)
 		AverageLatency() float64
 		ErrorRatio() float64
 	}
@@ -53,16 +53,18 @@ type (
 		status     int32
 		shutdownCh chan struct{}
 
-		requestsPerShard map[int32]int64
-		requestsLock     sync.Mutex
+		// map of shardID -> map of namespace -> request count
+		requestCounts map[int32]map[string]int64
+		requestsLock  sync.Mutex
 
 		aggregationEnabled bool
 		latencyAverage     aggregate.MovingWindowAverage
 		errorRatio         aggregate.MovingWindowAverage
 
-		metricsHandler       metrics.Handler
-		emitMetricsTimer     *time.Ticker
-		perShardRPSWarnLimit dynamicconfig.IntPropertyFn
+		metricsHandler            metrics.Handler
+		emitMetricsTimer          *time.Ticker
+		perShardRPSWarnLimit      dynamicconfig.IntPropertyFn
+		perShardPerNsRPSWarnLimit dynamicconfig.IntPropertyFn
 
 		logger log.Logger
 	}
@@ -74,17 +76,19 @@ func NewHealthSignalAggregatorImpl(
 	maxBufferSize int,
 	metricsHandler metrics.Handler,
 	perShardRPSWarnLimit dynamicconfig.IntPropertyFn,
+	perShardPerNsRPSWarnLimit dynamicconfig.IntPropertyFn,
 	logger log.Logger,
 ) *HealthSignalAggregatorImpl {
 	ret := &HealthSignalAggregatorImpl{
-		status:               common.DaemonStatusInitialized,
-		shutdownCh:           make(chan struct{}),
-		requestsPerShard:     make(map[int32]int64),
-		metricsHandler:       metricsHandler,
-		emitMetricsTimer:     time.NewTicker(emitMetricsInterval),
-		perShardRPSWarnLimit: perShardRPSWarnLimit,
-		logger:               logger,
-		aggregationEnabled:   aggregationEnabled,
+		status:                    common.DaemonStatusInitialized,
+		shutdownCh:                make(chan struct{}),
+		requestCounts:             make(map[int32]map[string]int64),
+		metricsHandler:            metricsHandler,
+		emitMetricsTimer:          time.NewTicker(emitMetricsInterval),
+		perShardRPSWarnLimit:      perShardRPSWarnLimit,
+		perShardPerNsRPSWarnLimit: perShardPerNsRPSWarnLimit,
+		logger:                    logger,
+		aggregationEnabled:        aggregationEnabled,
 	}
 
 	if aggregationEnabled {
@@ -113,7 +117,7 @@ func (s *HealthSignalAggregatorImpl) Stop() {
 	s.emitMetricsTimer.Stop()
 }
 
-func (s *HealthSignalAggregatorImpl) Record(callerSegment int32, latency time.Duration, err error) {
+func (s *HealthSignalAggregatorImpl) Record(callerSegment int32, namespace string, latency time.Duration, err error) {
 	if s.aggregationEnabled {
 		s.latencyAverage.Record(latency.Milliseconds())
 
@@ -125,7 +129,7 @@ func (s *HealthSignalAggregatorImpl) Record(callerSegment int32, latency time.Du
 	}
 
 	if callerSegment != CallerSegmentMissing {
-		s.incrementShardRequestCount(callerSegment)
+		s.incrementShardRequestCount(callerSegment, namespace)
 	}
 }
 
@@ -137,10 +141,13 @@ func (s *HealthSignalAggregatorImpl) ErrorRatio() float64 {
 	return s.errorRatio.Average()
 }
 
-func (s *HealthSignalAggregatorImpl) incrementShardRequestCount(shardID int32) {
+func (s *HealthSignalAggregatorImpl) incrementShardRequestCount(shardID int32, namespace string) {
 	s.requestsLock.Lock()
 	defer s.requestsLock.Unlock()
-	s.requestsPerShard[shardID]++
+	if s.requestCounts[shardID] == nil {
+		s.requestCounts[shardID] = make(map[string]int64)
+	}
+	s.requestCounts[shardID][namespace]++
 }
 
 func (s *HealthSignalAggregatorImpl) emitMetricsLoop() {
@@ -150,12 +157,21 @@ func (s *HealthSignalAggregatorImpl) emitMetricsLoop() {
 			return
 		case <-s.emitMetricsTimer.C:
 			s.requestsLock.Lock()
-			requestCounts := s.requestsPerShard
-			s.requestsPerShard = make(map[int32]int64, len(requestCounts))
+			requestCounts := s.requestCounts
+			s.requestCounts = make(map[int32]map[string]int64, len(requestCounts))
 			s.requestsLock.Unlock()
 
-			for shardID, count := range requestCounts {
-				shardRPS := int64(float64(count) / emitMetricsInterval.Seconds())
+			for shardID, requestCountPerNS := range requestCounts {
+				shardRequestCount := int64(0)
+				for namespace, count := range requestCountPerNS {
+					shardRequestCount += count
+					shardRPSPerNS := int64(float64(count) / emitMetricsInterval.Seconds())
+					if shardRPSPerNS > int64(s.perShardPerNsRPSWarnLimit()) {
+						s.logger.Warn("Per shard per namespace RPS warn limit exceeded", tag.ShardID(shardID), tag.WorkflowNamespace(namespace))
+					}
+				}
+
+				shardRPS := int64(float64(shardRequestCount) / emitMetricsInterval.Seconds())
 				s.metricsHandler.Histogram(metrics.PersistenceShardRPS.GetMetricName(), metrics.PersistenceShardRPS.GetMetricUnit()).Record(shardRPS)
 				if shardRPS > int64(s.perShardRPSWarnLimit()) {
 					s.logger.Warn("Per shard RPS warn limit exceeded", tag.ShardID(shardID))

common/persistence/noop_health_signal_aggregator.go

@@ -40,7 +40,7 @@ func (a *noopSignalAggregator) Start() {}
 
 func (a *noopSignalAggregator) Stop() {}
 
-func (a *noopSignalAggregator) Record(_ int32, _ time.Duration, _ error) {}
+func (a *noopSignalAggregator) Record(_ int32, _ string, _ time.Duration, _ error) {}
 
 func (a *noopSignalAggregator) AverageLatency() float64 {
 	return 0