From 5df70268246ab399568a4ecadf573d0ed9d28242 Mon Sep 17 00:00:00 2001 From: chenmin1992 <781022537@qq.com> Date: Wed, 12 Jun 2019 13:51:05 +0800 Subject: [PATCH 1/5] remove my own topom --- pkg/models/store.go | 13 +++++++++++++ pkg/models/topom.go | 8 ++++++++ pkg/topom/topom.go | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pkg/models/store.go b/pkg/models/store.go index bfb5f7f86..560d5789a 100644 --- a/pkg/models/store.go +++ b/pkg/models/store.go @@ -123,6 +123,19 @@ func (s *Store) Release() error { return s.client.Delete(s.LockPath()) } +func (s *Store) ReleaseByToken(token string) error { + if b, err := s.client.Read(s.LockPath(),false); err != nil { + return err + } else if b != nil { + if t, err := Decode(b); err != nil { + return err + } else if t.Token == token { + return s.Release() + } + } + return nil +} + func (s *Store) LoadTopom(must bool) (*Topom, error) { return LoadTopom(s.client, s.product, must) } diff --git a/pkg/models/topom.go b/pkg/models/topom.go index 746141fba..63aa1c8d5 100644 --- a/pkg/models/topom.go +++ b/pkg/models/topom.go @@ -18,3 +18,11 @@ type Topom struct { func (t *Topom) Encode() []byte { return jsonEncode(t) } + +func Decode(b []byte) (*Topom, error) { + s := &Topom{} + if err := jsonDecode(s, b); err != nil { + return nil,err + } + return s,nil +} diff --git a/pkg/topom/topom.go b/pkg/topom/topom.go index 027fe5fea..fb4949b2f 100644 --- a/pkg/topom/topom.go +++ b/pkg/topom/topom.go @@ -168,7 +168,7 @@ func (s *Topom) Close() error { defer s.store.Close() if s.online { - if err := s.store.Release(); err != nil { + if err := s.store.ReleaseByToken(s.model.Token); err != nil { log.ErrorErrorf(err, "store: release lock of %s failed", s.config.ProductName) return errors.Errorf("store: release lock of %s failed", s.config.ProductName) } From 46e583f9d488bfa026db7efd9883c533c4fc431f Mon Sep 17 00:00:00 2001 From: chenmin1992 <781022537@qq.com> Date: Wed, 12 Jun 2019 14:08:45 +0800 Subject: [PATCH 2/5] go fmt --- pkg/models/store.go | 2 +- pkg/models/topom.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/models/store.go b/pkg/models/store.go index 560d5789a..026927a5c 100644 --- a/pkg/models/store.go +++ b/pkg/models/store.go @@ -124,7 +124,7 @@ func (s *Store) Release() error { } func (s *Store) ReleaseByToken(token string) error { - if b, err := s.client.Read(s.LockPath(),false); err != nil { + if b, err := s.client.Read(s.LockPath(), false); err != nil { return err } else if b != nil { if t, err := Decode(b); err != nil { diff --git a/pkg/models/topom.go b/pkg/models/topom.go index 63aa1c8d5..0a5bd9606 100644 --- a/pkg/models/topom.go +++ b/pkg/models/topom.go @@ -22,7 +22,7 @@ func (t *Topom) Encode() []byte { func Decode(b []byte) (*Topom, error) { s := &Topom{} if err := jsonDecode(s, b); err != nil { - return nil,err + return nil, err } - return s,nil + return s, nil } From 30124d331549c7a8ca426a246967857ce259349b Mon Sep 17 00:00:00 2001 From: HIQ Society <51492452+hiqsociety@users.noreply.github.com> Date: Mon, 1 May 2023 17:45:01 +0000 Subject: [PATCH 3/5] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 1303a09f7..124ec2b3a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +Fork of codis with updates to 65535 nodes instead of 1024. + +TODO +1. faster connection using redhub +2. higher throughput, lower latency and to maintain professionally. + [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CodisLabs/codis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) From 22597788a3da99a6b695083cb8cb143722729ae1 Mon Sep 17 00:00:00 2001 From: Kol Influence <104323920+kolinfluence@users.noreply.github.com> Date: Wed, 3 May 2023 23:22:56 -0700 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 124ec2b3a..503efd731 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Fork of codis with updates to 65535 nodes instead of 1024. +Fork of codis with updates to use options 1024, 4096, 8192, 16384 or 32768 or 65536 nodes instead of just 1024 TODO 1. faster connection using redhub From 836a00a1e5420fbaeab8d3e2553b245bd3b29ccf Mon Sep 17 00:00:00 2001 From: Kol Influence <104323920+kolinfluence@users.noreply.github.com> Date: Mon, 19 Feb 2024 09:03:50 -0500 Subject: [PATCH 5/5] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 503efd731..b204bd6c7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -Fork of codis with updates to use options 1024, 4096, 8192, 16384 or 32768 or 65536 nodes instead of just 1024 +#Please look at Pika's codis, current repo's codis' etcd is "broken". Use pika's codis until further notice. +https://github.com/OpenAtomFoundation/pika + TODO 1. faster connection using redhub