Fix(multi-tenancy): Format namespace to human readable form #7552
Conversation
This file contains hidden or 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
ahsanbarkati
requested review from
manishrjain,
martinmr and
vvbalaji-dgraph
as code owners
| @@ -592,15 +592,16 @@ func (r *rebuilder) Run(ctx context.Context) error { | |||
|
|
|||
| glog.V(1).Infof( | |||
| "Rebuilding index for predicate %s: Starting process. StartTs=%d. Prefix=\n%s\n", | |||
| r.attr, r.startTs, hex.Dump(r.prefix)) | |||
| x.FormatNsAttr(r.attr), r.startTs, hex.Dump(r.prefix)) | |||
There was a problem hiding this comment.
Print namespace as well.
|
|
||
| // Counter is used here to ensure that all keys are committed at different timestamp. | ||
| // We set it to 1 in case there are no keys found and NewStreamAt is called with ts=0. | ||
| var counter uint64 = 1 | ||
|
|
||
| tmpWriter := tmpDB.NewManagedWriteBatch() | ||
| stream := pstore.NewStreamAt(r.startTs) | ||
| stream.LogPrefix = fmt.Sprintf("Rebuilding index for predicate %s (1/2):", r.attr) | ||
| stream.LogPrefix = fmt.Sprintf("Rebuilding index for predicate %s (1/2):", |
There was a problem hiding this comment.
Print namespace and attr
| @@ -662,19 +663,21 @@ func (r *rebuilder) Run(ctx context.Context) error { | |||
| return err | |||
| } | |||
| glog.V(1).Infof("Rebuilding index for predicate %s: building temp index took: %v\n", | |||
| r.attr, time.Since(start)) | |||
| x.FormatNsAttr(r.attr), time.Since(start)) | |||
There was a problem hiding this comment.
here as well. Print namespace everywhere. Without the namespace, we wouldn't know which namespace is doing this operation.
There was a problem hiding this comment.
It is already printing namespace information.
FormatNsAttr(attr) formats them to this format: x-predicate where x is the namespace.
predicate name from namespace 1 will be printed as 1-name rather than current thing which is /000/000/000/000/000/000/000/001name
There was a problem hiding this comment.
My bad. I didn't realize the formatNSAttr was adding the namespace as well.
jarifibrahim
approved these changes
Mar 15, 2021
aman-bansal
pushed a commit
that referenced
this pull request
Mar 16, 2021
Change the logs to print namespace in human-readable form. It also fixes the state endpoint to print predicates cleanly.
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.
This PR changes the logs to print namespace in human-readable form. This change doesn't fix all of them.
We have left the cases where we print a struct and the fields in the struct contains predicate with namespace.
We have also skipped logs of
SubscribeForUpdatesbecause we can't assume the prefix being logged will always contain namespace.This is not exhaustive, it fixes the things which are apparent on basic usage of dgraph.
This change is