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

fix(GraphQL): don't update cacheMb if not specified by user (GRAPHQL-888) #7103

Merged
merged 2 commits into from
Dec 10, 2020
Merged

fix(GraphQL): don't update cacheMb if not specified by user (GRAPHQL-888) #7103

merged 2 commits into from
Dec 10, 2020

Conversation

abhimanyusinghgaur
Copy link
Contributor

@abhimanyusinghgaur abhimanyusinghgaur commented Dec 10, 2020 •
edited by manishrjain
Loading

Fixes GRAPHQL-888.
Previously, if you ran this request:

$ curl -H "Content-Type: application/json" http://localhost:8080/admin -d '{"query": "mutation {config(input: {logRequest: false}){response {code message}}}"}'

Alpha logs would also print this:

I1205 22:22:51.684693 2681396 middlewares.go:178] GraphQL admin mutation. Name =  config
I1205 22:22:51.684724 2681396 config.go:38] Got config update through GraphQL admin API
I1205 22:22:51.684810 2681396 worker.go:138] Updating cacheMb to 0

Indicating that cacheMb was also updated, even it wasn't specified in the request.

This PR fixes this issue.

This change is Reviewable

@github-actions github-actions bot added the area/graphql Issues related to GraphQL support on Dgraph. label Dec 10, 2020
pawanrawal
pawanrawal approved these changes Dec 10, 2020
View reviewed changes
Copy link
Contributor

@pawanrawal pawanrawal left a comment

Choose a reason for hiding this comment

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

Can we add an integration test which updates the log request and then checks the cacheMb isn't updated as a result of it? Or do we have one that we can modify?

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @MichaelJCompton)

abhimanyusinghgaur
abhimanyusinghgaur commented Dec 10, 2020
View reviewed changes
Copy link
Contributor Author

@abhimanyusinghgaur abhimanyusinghgaur left a comment

Choose a reason for hiding this comment

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

Currently, the config query doesn't return the cacheMb set by the mutation. So, can't add the test now. Will add later when the config query is corrected.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @MichaelJCompton)

@abhimanyusinghgaur
Copy link
Contributor Author

CI seems to have proto check issues, merging this PR as it doesn't impact proto files.

@abhimanyusinghgaur abhimanyusinghgaur merged commit c03c327 into master Dec 10, 2020
@abhimanyusinghgaur abhimanyusinghgaur deleted the abhimanyu/config-fix branch December 10, 2020 10:57
abhimanyusinghgaur added a commit that referenced this pull request Dec 10, 2020
@abhimanyusinghgaur
fix(GraphQL): don't update cacheMb if not specified by user (GRAPHQL-…
f2b3605 
…888) (#7103)

Fixes GRAPHQL-888.
Previously, if you ran this request:
```
$ curl -H "Content-Type: application/json" http://localhost:8080/admin -d '{"query": "mutation {config(input: {logRequest: false}){response {code message}}}"}'
```
Alpha logs would also print this:
```
I1205 22:22:51.684693 2681396 middlewares.go:178] GraphQL admin mutation. Name =  config
I1205 22:22:51.684724 2681396 config.go:38] Got config update through GraphQL admin API
I1205 22:22:51.684810 2681396 worker.go:138] Updating cacheMb to 0
```
Indicating that cacheMb was also updated, even it wasn't specified in the request.

This PR fixes this issue.

(cherry picked from commit c03c327)

# Conflicts:
#	graphql/admin/config.go
@abhimanyusinghgaur abhimanyusinghgaur mentioned this pull request Dec 10, 2020
Merged
abhimanyusinghgaur added a commit that referenced this pull request Dec 10, 2020
@abhimanyusinghgaur
fix(GraphQL): don't update cacheMb if not specified by user (GRAPHQL-…
fd3dad9 
…888) (#7103)

Fixes GRAPHQL-888.
Previously, if you ran this request:
```
$ curl -H "Content-Type: application/json" http://localhost:8080/admin -d '{"query": "mutation {config(input: {logRequest: false}){response {code message}}}"}'
```
Alpha logs would also print this:
```
I1205 22:22:51.684693 2681396 middlewares.go:178] GraphQL admin mutation. Name =  config
I1205 22:22:51.684724 2681396 config.go:38] Got config update through GraphQL admin API
I1205 22:22:51.684810 2681396 worker.go:138] Updating cacheMb to 0
```
Indicating that cacheMb was also updated, even it wasn't specified in the request.

This PR fixes this issue.

(cherry picked from commit c03c327)

# Conflicts:
#	graphql/admin/config.go
OmarAyo added a commit that referenced this pull request Dec 10, 2020
@OmarAyo @animesh2049 @abhimanyusinghgaur
Add LogRequest variable to config input (#5197) (#7085)
07b87c2 
* Add LogRequest variable to config input (#5197)

Fixes: DGRAPH-1123

This PR adds support for logRequest config param. logRequest can have true/false values. True
value of logRequest enables logging of all requests coming to alphas. False value of logRequest
disables it.
Users will be able to dynamically change this param using graphql admin endpoint.
Sample query:

mutation {
  config(input: {logRequest: true}){
    response {
      code
      message
    }
  }
}
Internally we have added one more field in WorkerOptions(WorkerConfig) called as LogRequest
of int32 type. Value of this field is checked atomically upon every request arrival. If value of
LogRequest is 1, it results in logging of requests.


Co-authored-by: Ashish Goswami <[email protected]>
(cherry picked from commit 449c06b)

* fix(GraphQL): don't update cacheMb if not specified by user (GRAPHQL-888) (#7103)

Fixes GRAPHQL-888.
Previously, if you ran this request:
```
$ curl -H "Content-Type: application/json" http://localhost:8080/admin -d '{"query": "mutation {config(input: {logRequest: false}){response {code message}}}"}'
```
Alpha logs would also print this:
```
I1205 22:22:51.684693 2681396 middlewares.go:178] GraphQL admin mutation. Name =  config
I1205 22:22:51.684724 2681396 config.go:38] Got config update through GraphQL admin API
I1205 22:22:51.684810 2681396 worker.go:138] Updating cacheMb to 0
```
Indicating that cacheMb was also updated, even it wasn't specified in the request.

This PR fixes this issue.

(cherry picked from commit c03c327)

# Conflicts:
#	graphql/admin/config.go

Co-authored-by: Animesh Chandra Pathak <[email protected]>
Co-authored-by: Abhimanyu Singh Gaur <[email protected]>
abhimanyusinghgaur added a commit that referenced this pull request Dec 10, 2020
@abhimanyusinghgaur
fix(GraphQL): don't update cacheMb if not specified by user (GRAPHQL-…
da310c1 
…888) (#7103) (#7106)

Fixes GRAPHQL-888.
Previously, if you ran this request:
```
$ curl -H "Content-Type: application/json" http://localhost:8080/admin -d '{"query": "mutation {config(input: {logRequest: false}){response {code message}}}"}'
```
Alpha logs would also print this:
```
I1205 22:22:51.684693 2681396 middlewares.go:178] GraphQL admin mutation. Name =  config
I1205 22:22:51.684724 2681396 config.go:38] Got config update through GraphQL admin API
I1205 22:22:51.684810 2681396 worker.go:138] Updating cacheMb to 0
```
Indicating that cacheMb was also updated, even it wasn't specified in the request.

This PR fixes this issue.

(cherry picked from commit c03c327)

# Conflicts:
#	graphql/admin/config.go
@aman-bansal aman-bansal mentioned this pull request Dec 11, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pawanrawal pawanrawal pawanrawal approved these changes

@MichaelJCompton MichaelJCompton Awaiting requested review from MichaelJCompton

Assignees
No one assigned
Labels
area/graphql Issues related to GraphQL support on Dgraph.
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@abhimanyusinghgaur @pawanrawal