From b990effb0f5c88b8bfbd28b02879a52faceb7c39 Mon Sep 17 00:00:00 2001 From: Pawan Rawal Date: Mon, 20 Jul 2020 12:03:58 +0530 Subject: [PATCH 1/4] Remove github issues from link from the code. --- graphql/admin/admin.go | 3 +-- graphql/api/panics.go | 2 +- graphql/e2e/common/error.go | 2 +- graphql/resolve/resolver.go | 3 +-- graphql/schema/introspection.go | 8 ++++---- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/graphql/admin/admin.go b/graphql/admin/admin.go index 9e6f47d6549..060df2b1ba2 100644 --- a/graphql/admin/admin.go +++ b/graphql/admin/admin.go @@ -43,8 +43,7 @@ const ( errNoGraphQLSchema = "Not resolving %s. There's no GraphQL schema in Dgraph. " + "Use the /admin API to add a GraphQL schema" errResolverNotFound = "%s was not executed because no suitable resolver could be found - " + - "this indicates a resolver or validation bug " + - "(Please let us know : https://github.com/dgraph-io/dgraph/issues)" + "this indicates a resolver or validation bug. Please let us know by filing an issue." // GraphQL schema for /admin endpoint. graphqlAdminSchema = ` diff --git a/graphql/api/panics.go b/graphql/api/panics.go index 137983be217..2cd8814db90 100644 --- a/graphql/api/panics.go +++ b/graphql/api/panics.go @@ -34,6 +34,6 @@ func PanicHandler(fn func(error)) { fn(errors.Errorf("Internal Server Error - a panic was trapped. " + "This indicates a bug in the GraphQL server. A stack trace was logged. " + - "Please let us know : https://github.com/dgraph-io/dgraph/issues.")) + "Please let us know by filing an issue with the with the stack trace.")) } } diff --git a/graphql/e2e/common/error.go b/graphql/e2e/common/error.go index 21bddd78a0f..841a1d0b01e 100644 --- a/graphql/e2e/common/error.go +++ b/graphql/e2e/common/error.go @@ -253,7 +253,7 @@ func panicCatcher(t *testing.T) { require.Equal(t, x.GqlErrorList{ {Message: fmt.Sprintf("Internal Server Error - a panic was trapped. " + "This indicates a bug in the GraphQL server. A stack trace was logged. " + - "Please let us know : https://github.com/dgraph-io/dgraph/issues.")}}, + "Please let us know by filing an issue with the with the stack trace.")}}, gqlResponse.Errors) require.Nil(t, gqlResponse.Data, string(gqlResponse.Data)) diff --git a/graphql/resolve/resolver.go b/graphql/resolve/resolver.go index cc617e24d0c..52680b2fad4 100644 --- a/graphql/resolve/resolver.go +++ b/graphql/resolve/resolver.go @@ -667,8 +667,7 @@ func completeDgraphResult( glog.Errorf("Could not process Dgraph result : \n%s", string(dgResult)) return nullResponse( x.GqlErrorf("Couldn't process the result from Dgraph. " + - "This probably indicates a bug in the Dgraph GraphQL layer. " + - "Please let us know : https://github.com/dgraph-io/dgraph/issues."). + "This probably indicates a bug in Dgraph. Please let us know by filing an issue."). WithLocations(field.Location())) } diff --git a/graphql/schema/introspection.go b/graphql/schema/introspection.go index f71de949c71..04016a14672 100644 --- a/graphql/schema/introspection.go +++ b/graphql/schema/introspection.go @@ -27,25 +27,25 @@ import ( func Introspect(q Query) (json.RawMessage, error) { if q.Name() != "__schema" && q.Name() != "__type" && q.Name() != Typename { return nil, errors.New("call to introspect for field that isn't an introspection query " + - "this indicates bug (Please let us know : https://github.com/dgraph-io/dgraph/issues)") + "this indicates bug. Please let us know by filing an issue.") } sch, ok := q.Operation().Schema().(*schema) if !ok { return nil, errors.New("couldn't convert schema to internal type " + - "this indicates bug (Please let us know : https://github.com/dgraph-io/dgraph/issues)") + "this indicates bug. Please let us know by filing an issue.") } op, ok := q.Operation().(*operation) if !ok { return nil, errors.New("couldn't convert operation to internal type " + - "this indicates bug (Please let us know : https://github.com/dgraph-io/dgraph/issues)") + "this indicates bug. Please let us know by filing an issue.") } qu, ok := q.(*query) if !ok { return nil, errors.New("couldn't convert query to internal type " + - "this indicates bug (Please let us know : https://github.com/dgraph-io/dgraph/issues)") + "this indicates bug. Please let us know by filing an issue.") } reqCtx := &requestContext{ From 7c71d64914fe7846a19be99f8c06097c27fb5537 Mon Sep 17 00:00:00 2001 From: Pawan Rawal Date: Mon, 20 Jul 2020 12:06:48 +0530 Subject: [PATCH 2/4] Fix duplicate with the --- graphql/api/panics.go | 2 +- graphql/e2e/common/error.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphql/api/panics.go b/graphql/api/panics.go index 2cd8814db90..520fed8bcc8 100644 --- a/graphql/api/panics.go +++ b/graphql/api/panics.go @@ -34,6 +34,6 @@ func PanicHandler(fn func(error)) { fn(errors.Errorf("Internal Server Error - a panic was trapped. " + "This indicates a bug in the GraphQL server. A stack trace was logged. " + - "Please let us know by filing an issue with the with the stack trace.")) + "Please let us know by filing an issue with the stack trace.")) } } diff --git a/graphql/e2e/common/error.go b/graphql/e2e/common/error.go index 841a1d0b01e..60154ee1740 100644 --- a/graphql/e2e/common/error.go +++ b/graphql/e2e/common/error.go @@ -253,7 +253,7 @@ func panicCatcher(t *testing.T) { require.Equal(t, x.GqlErrorList{ {Message: fmt.Sprintf("Internal Server Error - a panic was trapped. " + "This indicates a bug in the GraphQL server. A stack trace was logged. " + - "Please let us know by filing an issue with the with the stack trace.")}}, + "Please let us know by filing an issue with the stack trace.")}}, gqlResponse.Errors) require.Nil(t, gqlResponse.Data, string(gqlResponse.Data)) From 6a6ada632f7e4f621befd02a60c9391af164045e Mon Sep 17 00:00:00 2001 From: Pawan Rawal Date: Tue, 21 Jul 2020 14:01:49 +0530 Subject: [PATCH 3/4] Update the issues in another place --- worker/graphql_schema.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/worker/graphql_schema.go b/worker/graphql_schema.go index cf063d8ee59..94a77bd41ae 100644 --- a/worker/graphql_schema.go +++ b/worker/graphql_schema.go @@ -30,9 +30,8 @@ import ( const ( errGraphQLSchemaCommitFailed = "error occurred updating GraphQL schema, please retry" ErrGraphQLSchemaAlterFailed = "succeeded in saving GraphQL schema but failed to alter Dgraph" + - " schema - this indicates a bug in Dgraph schema generation. Please let us know : " + - "https://github.com/dgraph-io/dgraph/issues. " + - "Don't forget to post your old and new schemas in the issue description." + " schema - this indicates a bug in Dgraph schema generation. Please let us know by" + + " filing an issue. Don't forget to post your old and new schemas in the issue description." GqlSchemaPred = "dgraph.graphql.schema" gqlSchemaXidPred = "dgraph.graphql.xid" From f4658ffadd395eada4c64d77f92a47850acdc6a9 Mon Sep 17 00:00:00 2001 From: Pawan Rawal Date: Mon, 27 Jul 2020 13:42:11 +0530 Subject: [PATCH 4/4] Fix TestExportMinio by using replicas as 3 in docker compose --- systest/export/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systest/export/docker-compose.yml b/systest/export/docker-compose.yml index 0a7dd0ec99d..ea205d43270 100644 --- a/systest/export/docker-compose.yml +++ b/systest/export/docker-compose.yml @@ -9,7 +9,7 @@ services: ports: - 5180:5180 - 6180:6180 - command: /gobin/dgraph zero --cwd=/data/zero1 --my=zero1:5180 -o 100 --bindall --logtostderr -v=0 + command: /gobin/dgraph zero --cwd=/data/zero1 --my=zero1:5180 -o 100 --bindall --logtostderr -v=0 --replicas 3 volumes: - type: bind source: $GOPATH/bin