chore: fix CI issues (#9039)

hypermodeinc · Mar 13, 2024 · 3d0e8fa · 3d0e8fa
1 parent 3584719
commit 3d0e8fa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/cd-dgraph.yml b/.github/workflows/cd-dgraph.yml
@@ -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

diff --git a/edgraph/server.go b/edgraph/server.go
@@ -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

diff --git a/systest/acl/restore/acl_restore_test.go b/systest/acl/restore/acl_restore_test.go
@@ -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"
 )
@@ -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)