remove go.uber.org/atomic

weed/s3api/s3_constants/s3_config.go

@@ -8,8 +8,8 @@ var (
 	CircuitBreakerConfigDir  = "/etc/s3"
 	CircuitBreakerConfigFile = "circuit_breaker.json"
 	AllowedActions           = []string{ACTION_READ, ACTION_WRITE, ACTION_LIST, ACTION_TAGGING, ACTION_ADMIN}
-	LimitTypeCount           = "count"
-	LimitTypeBytes           = "bytes"
+	LimitTypeCount           = "Count"
+	LimitTypeBytes           = "MB"
 	Separator                = ":"
 )
 

weed/s3api/s3api_circuit_breaker.go

@@ -10,21 +10,21 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/s3api/s3_constants"
 	"github.com/chrislusf/seaweedfs/weed/s3api/s3err"
 	"github.com/gorilla/mux"
-	"go.uber.org/atomic"
 	"net/http"
 	"sync"
+	"sync/atomic"
 )
 
 type CircuitBreaker struct {
 	sync.Mutex
 	Enabled     bool
-	counters    map[string]*atomic.Int64
+	counters    map[string]*int64
 	limitations map[string]int64
 }
 
 func NewCircuitBreaker(option *S3ApiServerOption) *CircuitBreaker {
 	cb := &CircuitBreaker{
-		counters:    make(map[string]*atomic.Int64),
+		counters:    make(map[string]*int64),
 		limitations: make(map[string]int64),
 	}
 
@@ -156,21 +156,22 @@ func (cb *CircuitBreaker) loadCounterAndCompare(bucket, action, limitType string
 			cb.Lock()
 			counter, exists = cb.counters[key]
 			if !exists {
-				counter = atomic.NewInt64(0)
+				var newCounter int64
+				counter = &newCounter
 				cb.counters[key] = counter
 			}
 			cb.Unlock()
 		}
-		current := counter.Load()
+		current := atomic.LoadInt64(counter)
 		if current+inc > max {
 			e = errCode
 			return
 		} else {
-			counter.Add(inc)
+			current := atomic.AddInt64(counter, inc)
 			f = func() {
-				counter.Sub(inc)
+				atomic.AddInt64(counter, -inc)
 			}
-			current = counter.Load()
+			current = atomic.LoadInt64(counter)
 			if current > max {
 				e = errCode
 				return

weed/s3api/s3api_circuit_breaker_test.go

@@ -4,9 +4,9 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/pb/s3_pb"
 	"github.com/chrislusf/seaweedfs/weed/s3api/s3_constants"
 	"github.com/chrislusf/seaweedfs/weed/s3api/s3err"
-	"go.uber.org/atomic"
 	"net/http"
 	"sync"
+	"sync/atomic"
 	"testing"
 )
 
@@ -32,7 +32,7 @@ var (
 		{action, s3_constants.LimitTypeBytes, 1024, 1024, 6, 200, 5},
 		{action, s3_constants.LimitTypeBytes, 1200, 1200, 6, 200, 6},
 		{action, s3_constants.LimitTypeBytes, 11990, 11990, 60, 200, 59},
-		{action, s3_constants.LimitTypeBytes, 11790, 11990, 60, 200, 58},
+		{action, s3_constants.LimitTypeBytes, 11790, 11990, 70, 200, 58},
 	}
 )
 
@@ -56,7 +56,7 @@ func TestLimit(t *testing.T) {
 			},
 		}
 		circuitBreaker := &CircuitBreaker{
-			counters:    make(map[string]*atomic.Int64),
+			counters:    make(map[string]*int64),
 			limitations: make(map[string]int64),
 		}
 		err := circuitBreaker.loadCircuitBreakerConfig(circuitBreakerConfig)
@@ -72,7 +72,7 @@ func TestLimit(t *testing.T) {
 }
 
 func doLimit(circuitBreaker *CircuitBreaker, routineCount int, r *http.Request) int64 {
-	var successCounter atomic.Int64
+	var successCounter int64
 	resultCh := make(chan []func(), routineCount)
 	var wg sync.WaitGroup
 	for i := 0; i < routineCount; i++ {
@@ -81,7 +81,7 @@ func doLimit(circuitBreaker *CircuitBreaker, routineCount int, r *http.Request)
 			defer wg.Done()
 			rollbackFn, errCode := circuitBreaker.limit(r, bucket, action)
 			if errCode == s3err.ErrNone {
-				successCounter.Inc()
+				atomic.AddInt64(&successCounter, 1)
 			}
 			resultCh <- rollbackFn
 		}()
@@ -93,5 +93,5 @@ func doLimit(circuitBreaker *CircuitBreaker, routineCount int, r *http.Request)
 			fn()
 		}
 	}
-	return successCounter.Load()
+	return successCounter
 }