Skip to content

Commit

Permalink
Use one atomic operation in (*Cache).decreaseSize
Browse files Browse the repository at this point in the history
The previous implementation was susceptible to a race condition (of
correctness) since c.decreaseSize is called without a lock in
(*Cache).WriteMulti.

There were already tests which asserted the correctness of the result of
decreaseSize, so no tests were added or modified.
  • Loading branch information
mark-rushakoff committed Jan 4, 2017
1 parent f715692 commit 89a587e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ The stress tool `influx_stress` will be removed in a subsequent release. We reco

### Bugfixes

- [#7786](https://github.com/influxdata/influxdb/pull/7786): Fix potential race condition in correctness of tsm1_cache memBytes statistic.
- [#7784](https://github.com/influxdata/influxdb/pull/7784): Fix broken error return on meta client's UpdateUser and DropContinuousQuery methods.
- [#7741](https://github.com/influxdata/influxdb/pull/7741): Fix string quoting and significantly improve performance of `influx_inspect export`.
- [#7698](https://github.com/influxdata/influxdb/pull/7698): CLI was caching db/rp for insert into statements.
Expand Down
4 changes: 2 additions & 2 deletions tsdb/engine/tsm1/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,8 @@ func (c *Cache) increaseSize(delta uint64) {

// decreaseSize decreases size by delta.
func (c *Cache) decreaseSize(delta uint64) {
size := atomic.LoadUint64(&c.size)
atomic.StoreUint64(&c.size, size-delta)
// Per sync/atomic docs, bit-flip delta minus one to perform subtraction within AddUint64.
atomic.AddUint64(&c.size, ^(delta - 1))
}

// MaxSize returns the maximum number of bytes the cache may consume.
Expand Down

0 comments on commit 89a587e

Please sign in to comment.