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.

Sign up for GitHub

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

Jump to bottom

client: retry load keyspace meta when creating a new client #6402

Merged
merged 3 commits into from
May 5, 2023
Merged

client: retry load keyspace meta when creating a new client #6402

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5688e9
retry load keyspace meta when creating a new client
rleungx May 4, 2023
e64b158
address the comment
rleungx May 5, 2023
d210967
Merge branch 'master' into retry
ti-chi-bot[bot] May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,13 +383,35 @@ func NewClientWithKeyspaceName(ctx context.Context, keyspace string, svrAddrs []
c.cancel()
return nil, err
}
if err := c.initRetry(c.loadKeyspaceMeta, keyspace); err != nil {
return nil, err
}
return c, nil
}

func (c *client) initRetry(f func(s string) error, str string) error {
var err error
for i := 0; i < c.option.maxRetryTimes; i++ {
if err = f(str); err == nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if err = f(str); err == nil {
if err = f(str); err == nil || strings.Contains(err.Error(), "ENTRY_NOT_FOUND") {

if the error contains ENTRY_NOT_FOUND, it seems that we need to immediately return success instead of retrying 30 times and each time 1 second by default. It is perfectly ok to me, if we change to function to something like loadKeyspaceMetaWithRetry which is used only for this specific LoadKeyspace rpc.

Copy link
Contributor

@binshi-bing binshi-bing May 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

When I look back to the original decision "Here we ignore ENTRY_NOT_FOUND error and it will set the keyspaceID to 0", I'm wondering if this is true. If the caller of PD client uses a keyspace name which can't be found in keyspace meta, could it be a human mistake or system bug somewhere? How to handle"ENTRY_NOT_FOUND" could depends on context which PD client doesn't know.

return nil
}
select {
case <-c.ctx.Done():
return err
case <-time.After(time.Second):
}
}
return errors.WithStack(err)
}

func (c *client) loadKeyspaceMeta(keyspace string) error {
keyspaceMeta, err := c.LoadKeyspace(context.TODO(), keyspace)
// Here we ignore ENTRY_NOT_FOUND error and it will set the keyspaceID to 0.
if err != nil && !strings.Contains(err.Error(), "ENTRY_NOT_FOUND") {
return nil, err
return err
}
c.keyspaceID = keyspaceMeta.GetId()
return c, nil
return nil
}

func (c *client) setup() error {
Expand Down