Skip to content

Commit

Permalink
Replace usage of sync/atomic with uber-go/atomic (grafana#2951)
Browse files Browse the repository at this point in the history
* chunk/cache: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* util: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* util/services: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* ingester: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* querier/frontend: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* querier/queryrange: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* ring: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* ring/kv/memberlist: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* storage/tsdb: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* storagegateway: Replace usage of sync/atomic with uber-go/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>

* faillint: Ensure we are not using sync/atomic

Signed-off-by: Javier Palomo <javier.palomo.almena@gmail.com>
  • Loading branch information
jvrplmlmn authored Jul 30, 2020
1 parent 459b79c commit 9a099c1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cache/memcached_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package cache_test
import (
"context"
"errors"
"sync/atomic"
"testing"

"github.com/bradfitz/gomemcache/memcache"
"github.com/go-kit/kit/log"
"github.com/stretchr/testify/require"
"go.uber.org/atomic"

"github.com/cortexproject/cortex/pkg/chunk/cache"
)
Expand Down Expand Up @@ -71,7 +71,7 @@ func testMemcache(t *testing.T, memcache *cache.Memcached) {
// mockMemcache whose calls fail 1/3rd of the time.
type mockMemcacheFailing struct {
*mockMemcache
calls uint64
calls atomic.Uint64
}

func newMockMemcacheFailing() *mockMemcacheFailing {
Expand All @@ -81,7 +81,7 @@ func newMockMemcacheFailing() *mockMemcacheFailing {
}

func (c *mockMemcacheFailing) GetMulti(keys []string) (map[string]*memcache.Item, error) {
calls := atomic.AddUint64(&c.calls, 1)
calls := c.calls.Inc()
if calls%3 == 0 {
return nil, errors.New("fail")
}
Expand Down

0 comments on commit 9a099c1

Please sign in to comment.