Revert persistence rate limit error type (#2312) (#2315)

* Correctly handle persistence rate limit error * revert error type change Co-authored-by: Yimin Chen <yimin.chen@live.com>
temporalio · Dec 20, 2021 · f9c1eba · f9c1eba
1 parent baf3b94
commit f9c1eba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/common/persistence/persistenceMetricClients.go b/common/persistence/persistenceMetricClients.go
@@ -1322,12 +1322,7 @@ func (p *metricEmitter) updateErrorMetric(scope int, err error) {
 		p.metricClient.IncCounter(scope, metrics.PersistenceFailures)
 
 	default:
-		if err == ErrPersistenceLimitExceeded {
-			p.metricClient.IncCounter(scope, metrics.PersistenceErrBusyCounter)
-			p.metricClient.IncCounter(scope, metrics.PersistenceFailures)
-		} else {
-			p.logger.Error("Operation failed with internal error.", tag.Error(err), tag.MetricScope(scope))
-			p.metricClient.IncCounter(scope, metrics.PersistenceFailures)
-		}
+		p.logger.Error("Operation failed with internal error.", tag.Error(err), tag.MetricScope(scope))
+		p.metricClient.IncCounter(scope, metrics.PersistenceFailures)
 	}
 }
diff --git a/common/persistence/persistenceRateLimitedClients.go b/common/persistence/persistenceRateLimitedClients.go
@@ -34,7 +34,7 @@ import (
 
 var (
 	// ErrPersistenceLimitExceeded is the error indicating QPS limit reached.
-	ErrPersistenceLimitExceeded = serviceerror.NewUnavailable("Persistence Max QPS Reached.")
+	ErrPersistenceLimitExceeded = serviceerror.NewResourceExhausted("Persistence Max QPS Reached.")
 )
 
 type (

diff --git a/common/persistence/visibility/visiblity_manager_metrics.go b/common/persistence/visibility/visiblity_manager_metrics.go
@@ -193,13 +193,8 @@ func (m *visibilityManagerMetrics) updateErrorMetric(scope metrics.Scope, err er
 	case *serviceerror.NotFound:
 		scope.IncCounter(metrics.VisibilityPersistenceNotFound)
 	default:
-		if err == persistence.ErrPersistenceLimitExceeded {
-			scope.IncCounter(metrics.VisibilityPersistenceResourceExhausted)
-			scope.IncCounter(metrics.VisibilityPersistenceFailures)
-		} else {
-			m.logger.Error("Operation failed with an error.", tag.Error(err))
-			scope.IncCounter(metrics.VisibilityPersistenceFailures)
-		}
+		m.logger.Error("Operation failed with an error.", tag.Error(err))
+		scope.IncCounter(metrics.VisibilityPersistenceFailures)
 	}
 
 	return err