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.

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

chore: fix CI issues #9039

Merged
merged 1 commit into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/cd-dgraph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: |
#!/bin/bash
GIT_TAG_NAME='${{ github.event.inputs.releasetag }}'
if [[ "$GIT_TAG_NAME" == "v"* ]];
if [[ "$GIT_TAG_NAME" == "v"* ]];
then
echo "this is a release branch"
else
Expand Down
8 changes: 5 additions & 3 deletions edgraph/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1268,9 +1268,11 @@ func (s *Server) doQuery(ctx context.Context, req *Request) (resp *api.Response,
l := &query.Latency{}
l.Start = time.Now()

if bool(glog.V(3)) || worker.LogDQLRequestEnabled() {
glog.Infof("Got a query, DQL form: %+v at %+v", req.req, l.Start.Format(time.RFC3339))
}
// TODO: Following trace messages have been commented out as stringified trace messages allocate
// too much memory. These trace messages need to be generated if tracing is enabled.
// if bool(glog.V(3)) || worker.LogDQLRequestEnabled() {
// glog.Infof("Got a query, DQL form: %+v at %+v", req.req, l.Start.Format(time.RFC3339))
// }

isMutation := len(req.req.Mutations) > 0
methodRequest := methodQuery
Expand Down
17 changes: 6 additions & 11 deletions systest/acl/restore/acl_restore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,10 @@ import (
"io"
"net/http"
"testing"
"time"

"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/dgraph-io/dgo/v230"
"github.com/dgraph-io/dgo/v230/protos/api"
"github.com/dgraph-io/dgraph/dgraphtest"
"github.com/dgraph-io/dgraph/graphql/e2e/common"
"github.com/dgraph-io/dgraph/testutil"
)
Expand Down Expand Up @@ -92,13 +88,12 @@ func sendRestoreRequest(t *testing.T, location, backupId string, backupNum int)
}

func TestAclCacheRestore(t *testing.T) {
// TODO: need to fix the race condition for license propagation, the sleep helps propagate the EE license correctly
time.Sleep(time.Second * 10)
disableDraining(t)
conn, err := grpc.Dial(testutil.SockAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
c := dgraphtest.NewComposeCluster()
gc, cleanup, err := c.Client()
defer cleanup()
require.NoError(t, err)
dg := dgo.NewDgraphClient(api.NewDgraphClient(conn))
require.NoError(t, dg.Login(context.Background(), "groot", "password"))
require.NoError(t, gc.Login(context.Background(), "groot", "password"))
dg := gc.Dgraph

sendRestoreRequest(t, "/backups", "vibrant_euclid5", 1)
testutil.WaitForRestore(t, dg, testutil.SockAddrHttp)
Expand Down
Loading