2014-07-02 19:04:38 +04:00
|
|
|
package redis_test
|
|
|
|
|
|
|
|
import (
|
2020-09-09 17:39:13 +03:00
|
|
|
"net"
|
|
|
|
|
2015-01-15 18:51:22 +03:00
|
|
|
. "github.com/onsi/ginkgo"
|
|
|
|
. "github.com/onsi/gomega"
|
chore: sync master (#2051)
* Upgrade redis-server version (#1833)
* Upgrade redis-server version
Signed-off-by: monkey <golang@88.com>
* XAutoClaim changed the return value
Signed-off-by: monkey <golang@88.com>
* add cmd: geosearch, geosearchstore (#1836)
* add cmd: geosearch, geosearchstore
Signed-off-by: monkey92t <golang@88.com>
* GeoSearchQuery and GeoSearchLocationQuery changed to pointer passing
Signed-off-by: monkey92t <golang@88.com>
* Added missing method XInfoStreamFull to Cmdable interface
* Run go mod tidy in redisotel
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
* Revert "ConnPool check fd for bad conns (#1824)" (#1849)
This reverts commit 346bfafddd36dd52d51b064033048de5552ee91e.
* Automate release process (#1852)
* Bump github.com/onsi/gomega from 1.10.5 to 1.14.0 (#1832)
* Bump github.com/onsi/gomega from 1.10.5 to 1.14.0
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.10.5 to 1.14.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.10.5...v1.14.0)
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Upgrade gomega to v1.15.0
Signed-off-by: monkey92t <golang@88.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: monkey92t <golang@88.com>
* Add version.go
* Fix otel example
* Fix package name in release script
* More fixes for otel example
* And more
* Fix release.sh
* Release v8.11.3 (release.sh)
* Create an annotated tag to give release.yml chance to run
* Tweak tag.sh
* Add Cmd.Slice helper to cast to []interface{} (#1859)
* after the connection pool is closed, no new connections should be added (#1863)
* after the connection pool is closed, no new connections should be added
Signed-off-by: monkey92t <golang@88.com>
* remove runGoroutine
Signed-off-by: monkey92t <golang@88.com>
* pool.popIdle add p.closed check
Signed-off-by: monkey92t <golang@88.com>
* upgrade golangci-lint v1.42.0
Signed-off-by: monkey92t <golang@88.com>
* Bump github.com/onsi/gomega from 1.15.0 to 1.16.0 (#1865)
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.15.0...v1.16.0)
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add go 1.17 to the build matrix
* Remove go 1.15 from build matrix
* Add scan struct example (#1870)
* Replace release job
* Bump github.com/cespare/xxhash/v2 from 2.1.1 to 2.1.2 (#1872)
Bumps [github.com/cespare/xxhash/v2](https://github.com/cespare/xxhash) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/cespare/xxhash/releases)
- [Commits](https://github.com/cespare/xxhash/compare/v2.1.1...v2.1.2)
---
updated-dependencies:
- dependency-name: github.com/cespare/xxhash/v2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix tag script to push tag by tag
* Fix releasing.md
* Fix/pubsub ping mutex (#1878)
* Fix PubSub.Ping to hold the lock
* Fix PubSub.Ping to hold the lock
* add write cmd data-race test
Signed-off-by: monkey92t <golang@88.com>
Co-authored-by: monkey92t <golang@88.com>
* chore: cleanup OpenTelemetry example
* chore: gofmt all code
* Refactor TestParseURL
This is in preparation for supporting query parameters
in ParseURL:
- use an expected *Options instance to execute assertions on
- extract assertions into helper function
- enable parallel testing
- condense test table
* Add query parameter parsing to ParseURL()
Before this change, ParseURL would only accept a very restricted
set of URLs (it returned an error, if it encountered any parameter).
This commit introduces the ability to process URLs like
redis://localhost/1?dial_timeout=10s
and similar.
Go programs which were providing a configuration tunable (e.g.
CLI flag, config entry or environment variable) to configure
the Redis connection now don't need to perform this task
themselves.
* chore: add links to readme
* chore: fix discussions link
* empty hooks.withContext removed
* chore: gofmt
* chore: use conventional commits and auto-generate changelog
* feat: add acl auth support for sentinels
* chore: swap to acl auth at the test-level
* Add support for BLMove command
* chore: update dependencies
* chore: update link
* feat: add SetVal method for each command
* feat: add Cmd.{String,Int,Float,Bool}Slice helpers and an example
* chore: tweak GH actions to run all jobs
* chore: add Lua scripting example
* Fix Redis Cluster issue during roll outs of new nodes with same addr (#1914)
* fix: recycle connections in some Redis Cluster scenarios
This issue was surfaced in a Cloud Provider solution that used for
rolling out new nodes using the same address (hostname) of the nodes
that will be replaced in a Redis Cluster, while the former ones once
depromoted as Slaves would continue in service during some mintues
for redirecting traffic.
The solution basically identifies when the connection could be stale
since a MOVED response will be returned using the same address (hostname)
that is being used by the connection. At that moment we consider the
connection as no longer usable forcing to recycle the connection.
* chore: lazy reload when moved or ask
* chore: use conv commit message
* chore: release v8.11.4 (release.sh)
* fix: add whitespace for avoid unlikely colisions
* fix: format
* chore: fix links
* chore: use ctx parameter in cmdInfo
* Bump github.com/onsi/ginkgo from 1.16.4 to 1.16.5 (#1925)
Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.16.4 to 1.16.5.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/ginkgo/compare/v1.16.4...v1.16.5)
---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: add support for time.Duration write and scan
* test: add test case for setting and scanning durations
* chore: fix linter
* fix(extra/redisotel): set span.kind attribute to client
According to the opentelemetry specification this should always be set to client for database client
libraries.
I've also removed the SetAttributes call and instead set the attributes during creation of the span.
This is what the library SHOULD be doing according to the opentelemetry api specification.
* chore: update otel example
* fix: update some argument counts in pre-allocs
In some cases number of pre-allocated places in
argument array is missing 1 or 2 elements,
which results in re-allocation of twice as large array
* chore: add example how to delete keys without a ttl
* chore: don't enable all lints
* chore(deps): bump github.com/onsi/gomega from 1.16.0 to 1.17.0
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.16.0...v1.17.0)
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* feat: Add redis v7's NX, XX, GT, LT expire variants
* chore: add missing readme
* chore: tweak feature links
* chore: remove Discord
* fix: set timeout for WAIT command. Fixes #1963
* build: update `go` directive in `go.mod` to 1.17
This commit enables support for module graph pruning and lazy module
loading for projects that are at Go 1.17 or higher.
Reference: https://go.dev/ref/mod#go-mod-file-go
Reference: https://go.dev/ref/mod#graph-pruning
Reference: https://go.dev/ref/mod#lazy-loading
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
* chore: update link
* chore: export cmder.SetFirstKeyPos to support build module commands
* feat(redisotel): ability to override TracerProvider (#1998)
* fix: add missing Expire methods to Cmdable
This is a followup to https://github.com/go-redis/redis/pull/1928
* chore(deps): bump github.com/onsi/gomega from 1.17.0 to 1.18.1
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.17.0 to 1.18.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.17.0...v1.18.1)
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Update README.md (#2011)
chore: add fmt library in example code
* chore: instrumentation name and version (#2012)
* fix: invalid type assert in stringArg
* chore: cleanup
* fix: example/otel compile error (#2028)
* fix: rename Golang to Go (#2030)
https://go.dev/doc/faq#go_or_golang
* feat: add support for passing extra attributes added to spans
* feat: set net.peer.name and net.peer.port in otel example
* chore: tweak Uptrace copy
* feat: add support for COPY command (#2016)
* feat: add support for acl sentinel auth in universal client
* chore(deps): bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* chore: add hll example
* chore: tweak release script
* chore: release v8.11.5 (release.sh)
* chore: add discord back
Co-authored-by: Eugene Ponizovsky <ponizovsky@gmail.com>
Co-authored-by: Bogdan Drutu <bogdandrutu@gmail.com>
Co-authored-by: Vladimir Mihailenco <vladimir.webdev@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kishan B <kishancs46@gmail.com>
Co-authored-by: Dominik Menke <dom@digineo.de>
Co-authored-by: Gökhan Özeloğlu <gozeloglu@gmail.com>
Co-authored-by: Justin Sievenpiper <justin@sievenpiper.co>
Co-authored-by: Алексей Романовский <aromanovsky@epiphan.com>
Co-authored-by: Stavros Panakakakis <stavrospanakakis@gmail.com>
Co-authored-by: Pau Freixes <pfreixes@gmail.com>
Co-authored-by: Ethan Hur <ethan0311@gmail.com>
Co-authored-by: Jackie <18378976+Pyrodash@users.noreply.github.com>
Co-authored-by: Kristinn Björgvin Árdal <kristinnardalsecondary@gmail.com>
Co-authored-by: ffenix113 <razerer@bigmir.net>
Co-authored-by: Bastien Penavayre <bastienPenava@gmail.com>
Co-authored-by: James3 Li(李麒傑) <james3_li@asus.com>
Co-authored-by: Eng Zer Jun <engzerjun@gmail.com>
Co-authored-by: gzjiangtao2014 <gzjiangtao2014@corp.netease.com>
Co-authored-by: Nelz <nelz9999@users.noreply.github.com>
Co-authored-by: Daniel Richter <Nexyz9@gmail.com>
Co-authored-by: Seyed Ali Ghaffari <ali.ghaffari@outlook.com>
Co-authored-by: lintanghui <lintanghui@bilibili.com>
Co-authored-by: hidu <duv123+github@gmail.com>
Co-authored-by: Jonas Lergell <jonas.lergell@volvocars.com>
Co-authored-by: Alex Kahn <alexanderkahn@gmail.com>
2022-03-19 07:40:31 +03:00
|
|
|
|
|
|
|
"github.com/go-redis/redis/v8"
|
2014-07-02 19:04:38 +04:00
|
|
|
)
|
|
|
|
|
2015-01-15 18:51:22 +03:00
|
|
|
var _ = Describe("Sentinel", func() {
|
2015-05-14 16:13:45 +03:00
|
|
|
var client *redis.Client
|
2020-09-09 17:39:13 +03:00
|
|
|
var master *redis.Client
|
|
|
|
var masterPort string
|
2021-03-12 14:06:11 +03:00
|
|
|
var sentinel *redis.SentinelClient
|
2014-11-13 15:26:14 +03:00
|
|
|
|
2015-05-14 16:13:45 +03:00
|
|
|
BeforeEach(func() {
|
|
|
|
client = redis.NewFailoverClient(&redis.FailoverOptions{
|
|
|
|
MasterName: sentinelName,
|
2020-09-03 22:11:56 +03:00
|
|
|
SentinelAddrs: sentinelAddrs,
|
2020-09-11 11:24:38 +03:00
|
|
|
MaxRetries: -1,
|
2015-01-15 18:51:22 +03:00
|
|
|
})
|
2020-03-11 17:26:42 +03:00
|
|
|
Expect(client.FlushDB(ctx).Err()).NotTo(HaveOccurred())
|
2020-09-09 17:39:13 +03:00
|
|
|
|
2021-03-12 14:06:11 +03:00
|
|
|
sentinel = redis.NewSentinelClient(&redis.Options{
|
2020-09-11 11:24:38 +03:00
|
|
|
Addr: ":" + sentinelPort1,
|
|
|
|
MaxRetries: -1,
|
2020-09-09 17:39:13 +03:00
|
|
|
})
|
|
|
|
|
|
|
|
addr, err := sentinel.GetMasterAddrByName(ctx, sentinelName).Result()
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
|
|
|
|
master = redis.NewClient(&redis.Options{
|
2020-09-11 11:24:38 +03:00
|
|
|
Addr: net.JoinHostPort(addr[0], addr[1]),
|
|
|
|
MaxRetries: -1,
|
2020-09-09 17:39:13 +03:00
|
|
|
})
|
|
|
|
masterPort = addr[1]
|
2020-09-11 11:24:38 +03:00
|
|
|
|
|
|
|
// Wait until slaves are picked up by sentinel.
|
|
|
|
Eventually(func() string {
|
|
|
|
return sentinel1.Info(ctx).Val()
|
|
|
|
}, "15s", "100ms").Should(ContainSubstring("slaves=2"))
|
|
|
|
Eventually(func() string {
|
|
|
|
return sentinel2.Info(ctx).Val()
|
|
|
|
}, "15s", "100ms").Should(ContainSubstring("slaves=2"))
|
|
|
|
Eventually(func() string {
|
|
|
|
return sentinel3.Info(ctx).Val()
|
|
|
|
}, "15s", "100ms").Should(ContainSubstring("slaves=2"))
|
2015-05-14 16:13:45 +03:00
|
|
|
})
|
|
|
|
|
|
|
|
AfterEach(func() {
|
2020-09-10 09:19:07 +03:00
|
|
|
_ = client.Close()
|
|
|
|
_ = master.Close()
|
2021-03-12 14:06:11 +03:00
|
|
|
_ = sentinel.Close()
|
2015-05-14 16:13:45 +03:00
|
|
|
})
|
2015-01-15 18:51:22 +03:00
|
|
|
|
2015-05-14 16:13:45 +03:00
|
|
|
It("should facilitate failover", func() {
|
2017-06-29 16:53:49 +03:00
|
|
|
// Set value on master.
|
2020-03-11 17:26:42 +03:00
|
|
|
err := client.Set(ctx, "foo", "master", 0).Err()
|
2015-01-15 18:51:22 +03:00
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
|
2017-06-29 16:53:49 +03:00
|
|
|
// Verify.
|
2020-09-09 16:20:58 +03:00
|
|
|
val, err := client.Get(ctx, "foo").Result()
|
2015-01-15 18:51:22 +03:00
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
Expect(val).To(Equal("master"))
|
|
|
|
|
2021-03-12 14:06:11 +03:00
|
|
|
// Verify master->slaves sync.
|
|
|
|
var slavesAddr []string
|
|
|
|
Eventually(func() []string {
|
2021-03-12 17:08:58 +03:00
|
|
|
slavesAddr = redis.GetSlavesAddrByName(ctx, sentinel, sentinelName)
|
2021-03-12 14:06:11 +03:00
|
|
|
return slavesAddr
|
|
|
|
}, "15s", "100ms").Should(HaveLen(2))
|
|
|
|
Eventually(func() bool {
|
|
|
|
sync := true
|
|
|
|
for _, addr := range slavesAddr {
|
|
|
|
slave := redis.NewClient(&redis.Options{
|
|
|
|
Addr: addr,
|
|
|
|
MaxRetries: -1,
|
|
|
|
})
|
|
|
|
sync = slave.Get(ctx, "foo").Val() == "master"
|
|
|
|
_ = slave.Close()
|
|
|
|
}
|
|
|
|
return sync
|
|
|
|
}, "15s", "100ms").Should(BeTrue())
|
|
|
|
|
2017-06-29 16:53:49 +03:00
|
|
|
// Create subscription.
|
2021-03-12 14:06:11 +03:00
|
|
|
pub := client.Subscribe(ctx, "foo")
|
|
|
|
ch := pub.Channel()
|
2017-06-29 16:53:49 +03:00
|
|
|
|
2015-01-15 18:51:22 +03:00
|
|
|
// Kill master.
|
2020-09-09 17:39:13 +03:00
|
|
|
err = master.Shutdown(ctx).Err()
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
2015-01-15 18:51:22 +03:00
|
|
|
Eventually(func() error {
|
2020-09-09 17:39:13 +03:00
|
|
|
return master.Ping(ctx).Err()
|
2020-08-15 16:23:14 +03:00
|
|
|
}, "15s", "100ms").Should(HaveOccurred())
|
2015-01-15 18:51:22 +03:00
|
|
|
|
|
|
|
// Check that client picked up new master.
|
2020-09-11 11:24:38 +03:00
|
|
|
Eventually(func() string {
|
|
|
|
return client.Get(ctx, "foo").Val()
|
|
|
|
}, "15s", "100ms").Should(Equal("master"))
|
2017-06-29 16:53:49 +03:00
|
|
|
|
2020-09-05 10:56:09 +03:00
|
|
|
// Check if subscription is renewed.
|
2017-06-29 16:53:49 +03:00
|
|
|
var msg *redis.Message
|
2020-09-05 10:56:09 +03:00
|
|
|
Eventually(func() <-chan *redis.Message {
|
|
|
|
_ = client.Publish(ctx, "foo", "hello").Err()
|
|
|
|
return ch
|
2020-09-09 15:27:17 +03:00
|
|
|
}, "15s", "100ms").Should(Receive(&msg))
|
2017-06-29 16:53:49 +03:00
|
|
|
Expect(msg.Channel).To(Equal("foo"))
|
|
|
|
Expect(msg.Payload).To(Equal("hello"))
|
2021-03-12 14:06:11 +03:00
|
|
|
Expect(pub.Close()).NotTo(HaveOccurred())
|
2020-09-09 16:20:58 +03:00
|
|
|
|
2020-09-09 17:39:13 +03:00
|
|
|
_, err = startRedis(masterPort)
|
2020-09-09 16:20:58 +03:00
|
|
|
Expect(err).NotTo(HaveOccurred())
|
2014-07-02 19:04:38 +04:00
|
|
|
})
|
|
|
|
|
2015-05-14 16:13:45 +03:00
|
|
|
It("supports DB selection", func() {
|
|
|
|
Expect(client.Close()).NotTo(HaveOccurred())
|
|
|
|
|
|
|
|
client = redis.NewFailoverClient(&redis.FailoverOptions{
|
|
|
|
MasterName: sentinelName,
|
2020-09-03 22:11:56 +03:00
|
|
|
SentinelAddrs: sentinelAddrs,
|
2015-05-14 16:13:45 +03:00
|
|
|
DB: 1,
|
|
|
|
})
|
2020-03-11 17:26:42 +03:00
|
|
|
err := client.Ping(ctx).Err()
|
2015-05-14 16:13:45 +03:00
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
})
|
2015-01-15 18:51:22 +03:00
|
|
|
})
|
2020-09-09 15:27:17 +03:00
|
|
|
|
|
|
|
var _ = Describe("NewFailoverClusterClient", func() {
|
|
|
|
var client *redis.ClusterClient
|
2020-09-09 17:39:13 +03:00
|
|
|
var master *redis.Client
|
|
|
|
var masterPort string
|
2020-09-09 15:27:17 +03:00
|
|
|
|
|
|
|
BeforeEach(func() {
|
|
|
|
client = redis.NewFailoverClusterClient(&redis.FailoverOptions{
|
|
|
|
MasterName: sentinelName,
|
|
|
|
SentinelAddrs: sentinelAddrs,
|
2020-09-11 15:52:38 +03:00
|
|
|
|
|
|
|
RouteRandomly: true,
|
2020-09-09 15:27:17 +03:00
|
|
|
})
|
|
|
|
Expect(client.FlushDB(ctx).Err()).NotTo(HaveOccurred())
|
2020-09-09 17:39:13 +03:00
|
|
|
|
|
|
|
sentinel := redis.NewSentinelClient(&redis.Options{
|
2020-09-11 11:24:38 +03:00
|
|
|
Addr: ":" + sentinelPort1,
|
|
|
|
MaxRetries: -1,
|
2020-09-09 17:39:13 +03:00
|
|
|
})
|
|
|
|
|
|
|
|
addr, err := sentinel.GetMasterAddrByName(ctx, sentinelName).Result()
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
|
|
|
|
master = redis.NewClient(&redis.Options{
|
2020-09-11 11:24:38 +03:00
|
|
|
Addr: net.JoinHostPort(addr[0], addr[1]),
|
|
|
|
MaxRetries: -1,
|
2020-09-09 17:39:13 +03:00
|
|
|
})
|
|
|
|
masterPort = addr[1]
|
2020-09-11 11:24:38 +03:00
|
|
|
|
|
|
|
// Wait until slaves are picked up by sentinel.
|
|
|
|
Eventually(func() string {
|
|
|
|
return sentinel1.Info(ctx).Val()
|
|
|
|
}, "15s", "100ms").Should(ContainSubstring("slaves=2"))
|
|
|
|
Eventually(func() string {
|
|
|
|
return sentinel2.Info(ctx).Val()
|
|
|
|
}, "15s", "100ms").Should(ContainSubstring("slaves=2"))
|
|
|
|
Eventually(func() string {
|
|
|
|
return sentinel3.Info(ctx).Val()
|
|
|
|
}, "15s", "100ms").Should(ContainSubstring("slaves=2"))
|
2020-09-09 15:27:17 +03:00
|
|
|
})
|
|
|
|
|
|
|
|
AfterEach(func() {
|
2020-09-10 09:19:07 +03:00
|
|
|
_ = client.Close()
|
|
|
|
_ = master.Close()
|
2020-09-09 15:27:17 +03:00
|
|
|
})
|
|
|
|
|
|
|
|
It("should facilitate failover", func() {
|
2020-09-09 17:39:13 +03:00
|
|
|
// Set value.
|
2020-09-09 15:27:17 +03:00
|
|
|
err := client.Set(ctx, "foo", "master", 0).Err()
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
|
2020-09-11 15:52:38 +03:00
|
|
|
for i := 0; i < 100; i++ {
|
|
|
|
// Verify.
|
2020-09-11 16:56:02 +03:00
|
|
|
Eventually(func() string {
|
|
|
|
return client.Get(ctx, "foo").Val()
|
|
|
|
}, "15s", "1ms").Should(Equal("master"))
|
2020-09-11 15:52:38 +03:00
|
|
|
}
|
2020-09-09 15:27:17 +03:00
|
|
|
|
|
|
|
// Create subscription.
|
2021-04-27 10:04:46 +03:00
|
|
|
sub := client.Subscribe(ctx, "foo")
|
|
|
|
ch := sub.Channel()
|
2020-09-09 15:27:17 +03:00
|
|
|
|
|
|
|
// Kill master.
|
2020-09-09 17:39:13 +03:00
|
|
|
err = master.Shutdown(ctx).Err()
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
2020-09-09 15:27:17 +03:00
|
|
|
Eventually(func() error {
|
2022-03-20 20:06:47 +03:00
|
|
|
return master.Ping(ctx).Err()
|
2020-09-09 15:27:17 +03:00
|
|
|
}, "15s", "100ms").Should(HaveOccurred())
|
|
|
|
|
|
|
|
// Check that client picked up new master.
|
2020-09-11 11:24:38 +03:00
|
|
|
Eventually(func() string {
|
|
|
|
return client.Get(ctx, "foo").Val()
|
|
|
|
}, "15s", "100ms").Should(Equal("master"))
|
2020-09-09 15:27:17 +03:00
|
|
|
|
|
|
|
// Check if subscription is renewed.
|
|
|
|
var msg *redis.Message
|
|
|
|
Eventually(func() <-chan *redis.Message {
|
|
|
|
_ = client.Publish(ctx, "foo", "hello").Err()
|
|
|
|
return ch
|
|
|
|
}, "15s", "100ms").Should(Receive(&msg))
|
|
|
|
Expect(msg.Channel).To(Equal("foo"))
|
|
|
|
Expect(msg.Payload).To(Equal("hello"))
|
2021-04-27 10:04:46 +03:00
|
|
|
Expect(sub.Close()).NotTo(HaveOccurred())
|
2020-09-09 16:20:58 +03:00
|
|
|
|
2020-09-09 17:39:13 +03:00
|
|
|
_, err = startRedis(masterPort)
|
2020-09-09 16:20:58 +03:00
|
|
|
Expect(err).NotTo(HaveOccurred())
|
2020-09-09 15:27:17 +03:00
|
|
|
})
|
|
|
|
})
|
chore: sync master (#2051)
* Upgrade redis-server version (#1833)
* Upgrade redis-server version
Signed-off-by: monkey <golang@88.com>
* XAutoClaim changed the return value
Signed-off-by: monkey <golang@88.com>
* add cmd: geosearch, geosearchstore (#1836)
* add cmd: geosearch, geosearchstore
Signed-off-by: monkey92t <golang@88.com>
* GeoSearchQuery and GeoSearchLocationQuery changed to pointer passing
Signed-off-by: monkey92t <golang@88.com>
* Added missing method XInfoStreamFull to Cmdable interface
* Run go mod tidy in redisotel
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
* Revert "ConnPool check fd for bad conns (#1824)" (#1849)
This reverts commit 346bfafddd36dd52d51b064033048de5552ee91e.
* Automate release process (#1852)
* Bump github.com/onsi/gomega from 1.10.5 to 1.14.0 (#1832)
* Bump github.com/onsi/gomega from 1.10.5 to 1.14.0
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.10.5 to 1.14.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.10.5...v1.14.0)
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Upgrade gomega to v1.15.0
Signed-off-by: monkey92t <golang@88.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: monkey92t <golang@88.com>
* Add version.go
* Fix otel example
* Fix package name in release script
* More fixes for otel example
* And more
* Fix release.sh
* Release v8.11.3 (release.sh)
* Create an annotated tag to give release.yml chance to run
* Tweak tag.sh
* Add Cmd.Slice helper to cast to []interface{} (#1859)
* after the connection pool is closed, no new connections should be added (#1863)
* after the connection pool is closed, no new connections should be added
Signed-off-by: monkey92t <golang@88.com>
* remove runGoroutine
Signed-off-by: monkey92t <golang@88.com>
* pool.popIdle add p.closed check
Signed-off-by: monkey92t <golang@88.com>
* upgrade golangci-lint v1.42.0
Signed-off-by: monkey92t <golang@88.com>
* Bump github.com/onsi/gomega from 1.15.0 to 1.16.0 (#1865)
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.15.0...v1.16.0)
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add go 1.17 to the build matrix
* Remove go 1.15 from build matrix
* Add scan struct example (#1870)
* Replace release job
* Bump github.com/cespare/xxhash/v2 from 2.1.1 to 2.1.2 (#1872)
Bumps [github.com/cespare/xxhash/v2](https://github.com/cespare/xxhash) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/cespare/xxhash/releases)
- [Commits](https://github.com/cespare/xxhash/compare/v2.1.1...v2.1.2)
---
updated-dependencies:
- dependency-name: github.com/cespare/xxhash/v2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix tag script to push tag by tag
* Fix releasing.md
* Fix/pubsub ping mutex (#1878)
* Fix PubSub.Ping to hold the lock
* Fix PubSub.Ping to hold the lock
* add write cmd data-race test
Signed-off-by: monkey92t <golang@88.com>
Co-authored-by: monkey92t <golang@88.com>
* chore: cleanup OpenTelemetry example
* chore: gofmt all code
* Refactor TestParseURL
This is in preparation for supporting query parameters
in ParseURL:
- use an expected *Options instance to execute assertions on
- extract assertions into helper function
- enable parallel testing
- condense test table
* Add query parameter parsing to ParseURL()
Before this change, ParseURL would only accept a very restricted
set of URLs (it returned an error, if it encountered any parameter).
This commit introduces the ability to process URLs like
redis://localhost/1?dial_timeout=10s
and similar.
Go programs which were providing a configuration tunable (e.g.
CLI flag, config entry or environment variable) to configure
the Redis connection now don't need to perform this task
themselves.
* chore: add links to readme
* chore: fix discussions link
* empty hooks.withContext removed
* chore: gofmt
* chore: use conventional commits and auto-generate changelog
* feat: add acl auth support for sentinels
* chore: swap to acl auth at the test-level
* Add support for BLMove command
* chore: update dependencies
* chore: update link
* feat: add SetVal method for each command
* feat: add Cmd.{String,Int,Float,Bool}Slice helpers and an example
* chore: tweak GH actions to run all jobs
* chore: add Lua scripting example
* Fix Redis Cluster issue during roll outs of new nodes with same addr (#1914)
* fix: recycle connections in some Redis Cluster scenarios
This issue was surfaced in a Cloud Provider solution that used for
rolling out new nodes using the same address (hostname) of the nodes
that will be replaced in a Redis Cluster, while the former ones once
depromoted as Slaves would continue in service during some mintues
for redirecting traffic.
The solution basically identifies when the connection could be stale
since a MOVED response will be returned using the same address (hostname)
that is being used by the connection. At that moment we consider the
connection as no longer usable forcing to recycle the connection.
* chore: lazy reload when moved or ask
* chore: use conv commit message
* chore: release v8.11.4 (release.sh)
* fix: add whitespace for avoid unlikely colisions
* fix: format
* chore: fix links
* chore: use ctx parameter in cmdInfo
* Bump github.com/onsi/ginkgo from 1.16.4 to 1.16.5 (#1925)
Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.16.4 to 1.16.5.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/ginkgo/compare/v1.16.4...v1.16.5)
---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: add support for time.Duration write and scan
* test: add test case for setting and scanning durations
* chore: fix linter
* fix(extra/redisotel): set span.kind attribute to client
According to the opentelemetry specification this should always be set to client for database client
libraries.
I've also removed the SetAttributes call and instead set the attributes during creation of the span.
This is what the library SHOULD be doing according to the opentelemetry api specification.
* chore: update otel example
* fix: update some argument counts in pre-allocs
In some cases number of pre-allocated places in
argument array is missing 1 or 2 elements,
which results in re-allocation of twice as large array
* chore: add example how to delete keys without a ttl
* chore: don't enable all lints
* chore(deps): bump github.com/onsi/gomega from 1.16.0 to 1.17.0
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.16.0...v1.17.0)
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* feat: Add redis v7's NX, XX, GT, LT expire variants
* chore: add missing readme
* chore: tweak feature links
* chore: remove Discord
* fix: set timeout for WAIT command. Fixes #1963
* build: update `go` directive in `go.mod` to 1.17
This commit enables support for module graph pruning and lazy module
loading for projects that are at Go 1.17 or higher.
Reference: https://go.dev/ref/mod#go-mod-file-go
Reference: https://go.dev/ref/mod#graph-pruning
Reference: https://go.dev/ref/mod#lazy-loading
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
* chore: update link
* chore: export cmder.SetFirstKeyPos to support build module commands
* feat(redisotel): ability to override TracerProvider (#1998)
* fix: add missing Expire methods to Cmdable
This is a followup to https://github.com/go-redis/redis/pull/1928
* chore(deps): bump github.com/onsi/gomega from 1.17.0 to 1.18.1
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.17.0 to 1.18.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.17.0...v1.18.1)
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Update README.md (#2011)
chore: add fmt library in example code
* chore: instrumentation name and version (#2012)
* fix: invalid type assert in stringArg
* chore: cleanup
* fix: example/otel compile error (#2028)
* fix: rename Golang to Go (#2030)
https://go.dev/doc/faq#go_or_golang
* feat: add support for passing extra attributes added to spans
* feat: set net.peer.name and net.peer.port in otel example
* chore: tweak Uptrace copy
* feat: add support for COPY command (#2016)
* feat: add support for acl sentinel auth in universal client
* chore(deps): bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* chore: add hll example
* chore: tweak release script
* chore: release v8.11.5 (release.sh)
* chore: add discord back
Co-authored-by: Eugene Ponizovsky <ponizovsky@gmail.com>
Co-authored-by: Bogdan Drutu <bogdandrutu@gmail.com>
Co-authored-by: Vladimir Mihailenco <vladimir.webdev@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kishan B <kishancs46@gmail.com>
Co-authored-by: Dominik Menke <dom@digineo.de>
Co-authored-by: Gökhan Özeloğlu <gozeloglu@gmail.com>
Co-authored-by: Justin Sievenpiper <justin@sievenpiper.co>
Co-authored-by: Алексей Романовский <aromanovsky@epiphan.com>
Co-authored-by: Stavros Panakakakis <stavrospanakakis@gmail.com>
Co-authored-by: Pau Freixes <pfreixes@gmail.com>
Co-authored-by: Ethan Hur <ethan0311@gmail.com>
Co-authored-by: Jackie <18378976+Pyrodash@users.noreply.github.com>
Co-authored-by: Kristinn Björgvin Árdal <kristinnardalsecondary@gmail.com>
Co-authored-by: ffenix113 <razerer@bigmir.net>
Co-authored-by: Bastien Penavayre <bastienPenava@gmail.com>
Co-authored-by: James3 Li(李麒傑) <james3_li@asus.com>
Co-authored-by: Eng Zer Jun <engzerjun@gmail.com>
Co-authored-by: gzjiangtao2014 <gzjiangtao2014@corp.netease.com>
Co-authored-by: Nelz <nelz9999@users.noreply.github.com>
Co-authored-by: Daniel Richter <Nexyz9@gmail.com>
Co-authored-by: Seyed Ali Ghaffari <ali.ghaffari@outlook.com>
Co-authored-by: lintanghui <lintanghui@bilibili.com>
Co-authored-by: hidu <duv123+github@gmail.com>
Co-authored-by: Jonas Lergell <jonas.lergell@volvocars.com>
Co-authored-by: Alex Kahn <alexanderkahn@gmail.com>
2022-03-19 07:40:31 +03:00
|
|
|
|
|
|
|
var _ = Describe("SentinelAclAuth", func() {
|
|
|
|
const (
|
|
|
|
aclSentinelUsername = "sentinel-user"
|
|
|
|
aclSentinelPassword = "sentinel-pass"
|
|
|
|
)
|
|
|
|
|
|
|
|
var client *redis.Client
|
|
|
|
var sentinel *redis.SentinelClient
|
|
|
|
var sentinels = func() []*redisProcess {
|
|
|
|
return []*redisProcess{sentinel1, sentinel2, sentinel3}
|
|
|
|
}
|
|
|
|
|
|
|
|
BeforeEach(func() {
|
|
|
|
authCmd := redis.NewStatusCmd(ctx, "ACL", "SETUSER", aclSentinelUsername, "ON",
|
|
|
|
">"+aclSentinelPassword, "-@all", "+auth", "+client|getname", "+client|id", "+client|setname",
|
|
|
|
"+command", "+hello", "+ping", "+role", "+sentinel|get-master-addr-by-name", "+sentinel|master",
|
|
|
|
"+sentinel|myid", "+sentinel|replicas", "+sentinel|sentinels")
|
|
|
|
|
|
|
|
for _, process := range sentinels() {
|
|
|
|
err := process.Client.Process(ctx, authCmd)
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
}
|
|
|
|
|
|
|
|
client = redis.NewFailoverClient(&redis.FailoverOptions{
|
|
|
|
MasterName: sentinelName,
|
|
|
|
SentinelAddrs: sentinelAddrs,
|
|
|
|
MaxRetries: -1,
|
|
|
|
SentinelUsername: aclSentinelUsername,
|
|
|
|
SentinelPassword: aclSentinelPassword,
|
|
|
|
})
|
|
|
|
|
|
|
|
Expect(client.FlushDB(ctx).Err()).NotTo(HaveOccurred())
|
|
|
|
|
|
|
|
sentinel = redis.NewSentinelClient(&redis.Options{
|
|
|
|
Addr: sentinelAddrs[0],
|
|
|
|
MaxRetries: -1,
|
|
|
|
Username: aclSentinelUsername,
|
|
|
|
Password: aclSentinelPassword,
|
|
|
|
})
|
|
|
|
|
|
|
|
_, err := sentinel.GetMasterAddrByName(ctx, sentinelName).Result()
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
|
|
|
|
// Wait until sentinels are picked up by each other.
|
|
|
|
for _, process := range sentinels() {
|
|
|
|
Eventually(func() string {
|
|
|
|
return process.Info(ctx).Val()
|
|
|
|
}, "15s", "100ms").Should(ContainSubstring("sentinels=3"))
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
AfterEach(func() {
|
|
|
|
unauthCommand := redis.NewStatusCmd(ctx, "ACL", "DELUSER", aclSentinelUsername)
|
|
|
|
|
|
|
|
for _, process := range sentinels() {
|
|
|
|
err := process.Client.Process(ctx, unauthCommand)
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
}
|
|
|
|
|
|
|
|
_ = client.Close()
|
|
|
|
_ = sentinel.Close()
|
|
|
|
})
|
|
|
|
|
|
|
|
It("should still facilitate operations", func() {
|
|
|
|
err := client.Set(ctx, "wow", "acl-auth", 0).Err()
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
|
|
|
|
val, err := client.Get(ctx, "wow").Result()
|
|
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
Expect(val).To(Equal("acl-auth"))
|
|
|
|
})
|
|
|
|
})
|