Return nil instead of emptyTablet in groupi.Tablet() #5469
Merged
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
groupi.Tablet returns error and empty Tablet when error
is returned while querying zero for Tablet serving info.
Allocation of space by empty Tablet shows up in alloc_space profile.
. . 463:func (g *groupi) Tablet(key string) (*pb.Tablet, error) {
16.22GB 16.22GB 464: emptyTablet := pb.Tablet{}
. . 465:
. . 466: // TODO: Remove all this later, create a membership state and apply it
. . 467: g.RLock()
. . 468: tablet, ok := g.tablets[key]
. . 469: g.RUnlock()
. . 470: if ok {
. . 471: return tablet, nil
. . 472: }
. . 473:
. . 474: // We don't know about this tablet.
. . 475: // Check with dgraphzero if we can serve it.
. . 476: pl := g.connToZeroLeader()
. . 477: zc := pb.NewZeroClient(pl.Get())
. . 478:
. . 479: tablet = &pb.Tablet{GroupId: g.groupId(), Predicate: key}
. 1.07MB 480: out, err := zc.ShouldServe(context.Background(), tablet)
. . 481: if err != nil {
. . 482: glog.Errorf("Error while ShouldServe grpc call %v", err)
. . 483: return &emptyTablet, err
. . 484: }
This can be avoided. We can return nil instead of emptyTablet and save
allocations here. Caller function always checks for error first before
accessing tablet information.
ashish-goswami
requested review from
manishrjain and
vvbalaji-dgraph
as code owners
harshil-goel
approved these changes
May 19, 2020
There was a problem hiding this comment.
Reviewable status: 0 of 1 files reviewed, all discussions resolved (waiting on @manishrjain and @vvbalaji-dgraph)
jarifibrahim
approved these changes
May 19, 2020
There was a problem hiding this comment.
Reviewable status: 0 of 1 files reviewed, 1 unresolved discussion (waiting on @ashish-goswami, @manishrjain, and @vvbalaji-dgraph)
worker/groups.go, line 462 at r1 (raw file):
} // Do not modify the returned Tablet
We should check why this comment was added. Maybe this comment is no longer valid.
manishrjain
approved these changes
May 20, 2020
There was a problem hiding this comment.
Reviewed 1 of 1 files at r1.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @ashish-goswami and @vvbalaji-dgraph)
ashish-goswami
added a commit
that referenced
this pull request
May 26, 2020
groupi.Tablet returns error and empty Tablet when error is returned while querying zero for
Tablet serving info. Allocation of space by empty Tablet shows up in alloc_space profile.
. . 463:func (g *groupi) Tablet(key string) (*pb.Tablet, error) {
16.22GB 16.22GB 464: emptyTablet := pb.Tablet{}
. . 465:
. . 466: // TODO: Remove all this later, create a membership state and apply it
. . 467: g.RLock()
. . 468: tablet, ok := g.tablets[key]
. . 469: g.RUnlock()
. . 470: if ok {
. . 471: return tablet, nil
. . 472: }
. . 473:
. . 474: // We don't know about this tablet.
. . 475: // Check with dgraphzero if we can serve it.
. . 476: pl := g.connToZeroLeader()
. . 477: zc := pb.NewZeroClient(pl.Get())
. . 478:
. . 479: tablet = &pb.Tablet{GroupId: g.groupId(), Predicate: key}
. 1.07MB 480: out, err := zc.ShouldServe(context.Background(), tablet)
. . 481: if err != nil {
. . 482: glog.Errorf("Error while ShouldServe grpc call %v", err)
. . 483: return &emptyTablet, err
. . 484: }
This can be avoided. We can return nil instead of emptyTablet and save allocations here. Caller
function always checks for error first before accessing tablet information.
(cherry picked from commit 428f3bd)
ashish-goswami
added a commit
that referenced
this pull request
May 26, 2020
groupi.Tablet returns error and empty Tablet when error is returned while querying zero for
Tablet serving info. Allocation of space by empty Tablet shows up in alloc_space profile.
. . 463:func (g *groupi) Tablet(key string) (*pb.Tablet, error) {
16.22GB 16.22GB 464: emptyTablet := pb.Tablet{}
. . 465:
. . 466: // TODO: Remove all this later, create a membership state and apply it
. . 467: g.RLock()
. . 468: tablet, ok := g.tablets[key]
. . 469: g.RUnlock()
. . 470: if ok {
. . 471: return tablet, nil
. . 472: }
. . 473:
. . 474: // We don't know about this tablet.
. . 475: // Check with dgraphzero if we can serve it.
. . 476: pl := g.connToZeroLeader()
. . 477: zc := pb.NewZeroClient(pl.Get())
. . 478:
. . 479: tablet = &pb.Tablet{GroupId: g.groupId(), Predicate: key}
. 1.07MB 480: out, err := zc.ShouldServe(context.Background(), tablet)
. . 481: if err != nil {
. . 482: glog.Errorf("Error while ShouldServe grpc call %v", err)
. . 483: return &emptyTablet, err
. . 484: }
This can be avoided. We can return nil instead of emptyTablet and save allocations here. Caller
function always checks for error first before accessing tablet information.
(cherry picked from commit 428f3bd)
dna2github
pushed a commit
to dna2fork/dgraph
that referenced
this pull request
Jul 18, 2020
groupi.Tablet returns error and empty Tablet when error is returned while querying zero for
Tablet serving info. Allocation of space by empty Tablet shows up in alloc_space profile.
. . 463:func (g *groupi) Tablet(key string) (*pb.Tablet, error) {
16.22GB 16.22GB 464: emptyTablet := pb.Tablet{}
. . 465:
. . 466: // TODO: Remove all this later, create a membership state and apply it
. . 467: g.RLock()
. . 468: tablet, ok := g.tablets[key]
. . 469: g.RUnlock()
. . 470: if ok {
. . 471: return tablet, nil
. . 472: }
. . 473:
. . 474: // We don't know about this tablet.
. . 475: // Check with dgraphzero if we can serve it.
. . 476: pl := g.connToZeroLeader()
. . 477: zc := pb.NewZeroClient(pl.Get())
. . 478:
. . 479: tablet = &pb.Tablet{GroupId: g.groupId(), Predicate: key}
. 1.07MB 480: out, err := zc.ShouldServe(context.Background(), tablet)
. . 481: if err != nil {
. . 482: glog.Errorf("Error while ShouldServe grpc call %v", err)
. . 483: return &emptyTablet, err
. . 484: }
This can be avoided. We can return nil instead of emptyTablet and save allocations here. Caller
function always checks for error first before accessing tablet information.
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.
groupi.Tablet()returns error and empty Tablet when error is returned while querying zero for Tabletserving info. This results in allocation of space by empty Tablet and it shows up in alloc_space
profile.
This can be avoided. We can return nil instead of emptyTablet and save
allocations here. Caller function always checks for error first before
accessing tablet information.
This change is