add meta retry #94
Merged
add meta retry #94
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kqzh
force-pushed
the
fix_change_leader
branch
2 times, most recently
from
0e632fd to
588cb61
Compare
veezhang
reviewed
Mar 16, 2022
Comment on lines
+76
to
+79
| Spaces interface { | ||
| MetaBaser | ||
| GetSpaces() []Space | ||
| } |
There was a problem hiding this comment.
How about?
Spaces struct{
MetaBaser
spaces []Space
}
Comment on lines
-120
to
-123
| if d.MetaClientDriver != nil { | ||
| return nil | ||
| } | ||
|
|
ccore/nebula/client_meta.go
Outdated
| "fmt" | ||
| "github.com/facebook/fbthrift/thrift/lib/go/thrift" |
ccore/nebula/client_meta.go
Outdated
Comment on lines
54
to
72
| func (c *defaultMetaClient) AddHosts(endpoints []string) (types.MetaBaser, error) { | ||
| resp, err := c.meta.AddHosts(endpoints) | ||
| if err != nil { | ||
| if err = c.reconnect(err); err != nil { | ||
| return nil, err | ||
| } | ||
| return c.AddHosts(endpoints) | ||
| } | ||
|
|
||
| // check if leader changed | ||
| if resp.GetCode() == nerrors.ErrorCode_E_LEADER_CHANGED { | ||
| if err = c.updateConnection(resp.GetLeader()); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return c.AddHosts(endpoints) | ||
| } | ||
|
|
||
| return resp, nil |
There was a problem hiding this comment.
func (c *defaultMetaClient) BalanceLeader(space string) (resp types.Balancer, err error) {
c.retryDo(func() (types.MetaBaser, error) {
resp, err = c.meta.Balance(types.BalanceReq{
Cmd: types.BalanceLeader,
Space: space,
})
return resp, err
})
return
}
func (c *defaultMetaClient) retryDo(fn func() (types.MetaBaser, error)) {
resp, err := fn()
if err != nil {
if err = c.reconnect(err); err != nil {
return
}
resp, err = fn()
if err != nil {
return
}
}
if resp.GetCode() == nerrors.ErrorCode_E_LEADER_CHANGED {
if err = c.updateConnection(resp.GetLeader()); err != nil {
return
}
_, _ = fn()
}
}
ccore/nebula/client_meta.go
Outdated
| } | ||
|
|
||
| func (c *defaultMetaClient) defaultClient() *defaultClient { | ||
| return (*defaultClient)(c) | ||
| } | ||
|
|
||
| func (c *defaultMetaClient) updateConnection(endpoint string) error { |
There was a problem hiding this comment.
func (c *defaultMetaClient) updateConnection(endpoint string) error {
if ok := c.meta.connection.SetEndpointExists(endpoint); ok {
return c.meta.open(c.driver)
}
return error //
}| return c.meta.open(c.driver) | ||
| } | ||
|
|
||
| func (c *defaultMetaClient) reconnect(err error) error { |
There was a problem hiding this comment.
func (c *defaultMetaClient) reconnect(err error) error {
if _, ok := err.(thrift.TransportException); !ok {
return err
}
return c.openRetry(c.driver)
}
func (c *defaultMetaClient) openRetry(driver types.Driver) error {
for i := 0; i < c.meta.connection.GetEndpointLen(); i++ {
c.meta.connection.UpdateNextEndpoint()
if err := c.meta.open(driver); err != nil {
if _, ok := err.(thrift.TransportException); !ok {
}
return err
}
}
return nil //error
}
ccore/nebula/driver.go
Outdated
| @@ -34,6 +34,7 @@ type ( | |||
| o *socketOptions | |||
| mu sync.Mutex | |||
| endpoints []string | |||
| index int | |||
There was a problem hiding this comment.
use nextIndex ?
func (c *connectionMu) UpdateNextEndpoint() {
c.mu.Lock()
defer c.mu.Unlock()
c.nextIndex = (c.nextIndex + 1) % c.GetEndpointLen()
}
func (c *connectionMu) SetEndpointExists(endpoint string) bool {
c.mu.Lock()
defer c.mu.Unlock()
for i, ep := range c.endpoints {
if ep == endpoint {
return true
}
}
return false
}
func (c *connectionMu) GetEndpointLen() int {
return len(c.endpoints)
}
ccore/nebula/client_meta.go
Outdated
| @@ -31,48 +35,188 @@ func NewMetaClient(endpoints []string, opts ...Option) (MetaClient, error) { | |||
|
|
|||
| func (c *defaultMetaClient) Open() error { | |||
| return c.defaultClient().initDriver(func(driver types.Driver) error { | |||
| return c.meta.open(driver) | |||
| n := len(c.meta.connection.endpoints) | |||
There was a problem hiding this comment.
return c.openRetry(driver)
kqzh
force-pushed
the
fix_change_leader
branch
2 times, most recently
from
2fd1494 to
fd33c4a
Compare
veezhang
reviewed
Mar 16, 2022
| }) | ||
|
|
ccore/nebula/client_meta.go
Outdated
| } | ||
| // check if leader change | ||
| if resp.GetCode() == nerrors.ErrorCode_E_LEADER_CHANGED { | ||
|
|
ccore/nebula/client_meta.go
Outdated
| if err = c.updateLeader(resp.GetLeader()); err != nil { | ||
| return err | ||
| } | ||
| _, _ = fn() |
There was a problem hiding this comment.
Why ignore this error, but do not ignore it in line 144?
ccore/nebula/client_meta.go
Outdated
| func (c *defaultMetaClient) openRetry(driver types.Driver) error { | ||
| n := c.meta.connection.GetEndpointsLen() | ||
| for i := 0; i < n; i++ { | ||
| c.meta.close() |
There was a problem hiding this comment.
How about use _ = c.meta.close() ?
ccore/nebula/client_meta.go
Outdated
| if err := c.meta.open(driver); err == nil { | ||
| return nil | ||
| } | ||
| c.meta.connection.UpdateNextIndex() |
There was a problem hiding this comment.
It's need to update the next index when c.meta.open successfully?
There was a problem hiding this comment.
if c.meta.open success, will return nil
There was a problem hiding this comment.
But the next time it fails, it will retry the one that has already failed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.