Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow using multiple memcached clients at the same time. #2648

Merged
merged 4 commits into from
May 24, 2020
Merged

Allow using multiple memcached clients at the same time. #2648

merged 4 commits into from
May 24, 2020

Conversation

pstibrany
Copy link
Contributor

@pstibrany pstibrany commented May 22, 2020

This PR fixes issue when user tries to configure both caching bucket and index cache at the same time. That creates two independent memcached clients, which try to create same metrics into the same registry, which failed before. This PR fixes that.

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Verification

Unit test that fails on master. Also manually tested by configuring Thanos store to use both caches -- it fails with master build, but works with this patch.

/cc @kakkoyun (since you reported it to me)

Copy link
Member

@GiedriusS GiedriusS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, well tested 🥇 We should probably include this in v0.13.0-rc.1, @bwplotka ?

@GiedriusS GiedriusS merged commit 079ad42 into thanos-io:master May 24, 2020
@bwplotka
Copy link
Member

bwplotka commented Jun 1, 2020

I am cherry picking it

bwplotka added a commit that referenced this pull request Jun 1, 2020
* Allow using multiple memcached clients at the same time.

Signed-off-by: Peter Štibraný <[email protected]>

* Added unit test to verify that we can have multiple clients.

Signed-off-by: Peter Štibraný <[email protected]>

* Added CHANGELOG.md entry.

Signed-off-by: Peter Štibraný <[email protected]>

* Remove unused argument.

Signed-off-by: Peter Štibraný <[email protected]>
# Conflicts:
#	CHANGELOG.md
bwplotka added a commit that referenced this pull request Jun 1, 2020
* Allow using multiple memcached clients at the same time.

Signed-off-by: Peter Štibraný <[email protected]>

* Added unit test to verify that we can have multiple clients.

Signed-off-by: Peter Štibraný <[email protected]>

* Added CHANGELOG.md entry.

Signed-off-by: Peter Štibraný <[email protected]>

* Remove unused argument.

Signed-off-by: Peter Štibraný <[email protected]>
# Conflicts:
#	CHANGELOG.md
paulfantom added a commit to paulfantom/thanos that referenced this pull request Jul 8, 2020
openshift/master

* upstream/release-0.13:
  Cut release v0.13.0
  shipper: Be strict about upload order unless it's specified so & cut v0.13.0-rc.2 (thanos-io#2765)
  Cut 0.13.0 release. (thanos-io#2762)
  Cut release 0.13.0-rc.1 (thanos-io#2720)
  Store: `irate` and `resets` use now counter downsampling aggregations. (thanos-io#2719)
  deps: Updated minio-go dependency to v6.0.56 to add two region endpoints (thanos-io#2705) (thanos-io#2718)
  store/proxy: Deduplicate chunks on StoreAPI level. Recommend chunk sorting for StoreAPI + Optimized iter chunk dedup. (thanos-io#2710) (thanos-io#2711)
  Allow using multiple memcached clients at the same time. (thanos-io#2648) (thanos-io#2698)
  Updated Prometheus as little as possible to include Isolation fix. (thanos-io#2697)
  Release fix attempt2.
  Fixed test job. (thanos-io#2650)
  Fixed promu build to build in compatible directory that crossbuild understands.
  Cut v0.13.0-rc.0 (thanos-io#2628)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants