Remove LastBackupStatus (#7699)

edgraph/server.go

@@ -1022,7 +1022,6 @@ func (s *Server) Health(ctx context.Context, all bool) (*api.Response, error) {
 		Version:     x.Version(),
 		Uptime:      int64(time.Since(x.WorkerConfig.StartTime) / time.Second),
 		LastEcho:    time.Now().Unix(),
-		LastBackup:  worker.LastBackupStatus.Load().(string),
 		Ongoing:     worker.GetOngoingTasks(),
 		Indexing:    schema.GetIndexingPredicates(),
 		EeFeatures:  worker.GetEEFeaturesList(),

protos/pb.proto

@@ -203,7 +203,6 @@ message HealthInfo {
     repeated string indexing = 9;
     repeated string ee_features = 10;
 	uint64 max_assigned = 11;
-	string last_backup = 12;
 }
 
 message Tablet {

systest/backup/encryption/backup_test.go

@@ -260,7 +260,7 @@ func runBackup(t *testing.T, numExpectedFiles, numExpectedDirs int) []string {
 func runBackupInternal(t *testing.T, forceFull bool, numExpectedFiles,
 	numExpectedDirs int) []string {
 	testutil.StartBackupHttps(t, backupDst, forceFull)
-	testutil.WaitForBackup(t)
+	testutil.WaitForTask(t, "opBackup")
 
 	// Verify that the right amount of files and directories were created.
 	copyToLocalFs(t)

systest/backup/filesystem/backup_test.go

@@ -369,7 +369,7 @@ func runBackup(t *testing.T, numExpectedFiles, numExpectedDirs int) []string {
 
 func runBackupInternal(t *testing.T, forceFull bool, numExpectedFiles, numExpectedDirs int) []string {
 	testutil.StartBackupHttps(t, alphaBackupDir, forceFull)
-	testutil.WaitForBackup(t)
+	testutil.WaitForTask(t, "opBackup")
 
 	// Verify that the right amount of files and directories were created.
 	common.CopyToLocalFs(t)

systest/backup/minio-large/backup_test.go

@@ -156,7 +156,7 @@ func runBackup(t *testing.T) {
 	buf, err := ioutil.ReadAll(resp.Body)
 	require.NoError(t, err)
 	require.Contains(t, string(buf), "Backup queued successfully")
-	testutil.WaitForBackup(t)
+	testutil.WaitForTask(t, "opBackup")
 
 	// Verify that the right amount of files and directories were created.
 	copyToLocalFs(t)

systest/backup/minio/backup_test.go

@@ -279,7 +279,7 @@ func runBackup(t *testing.T, numExpectedFiles, numExpectedDirs int) []string {
 func runBackupInternal(t *testing.T, forceFull bool, numExpectedFiles,
 	numExpectedDirs int) []string {
 	testutil.StartBackupHttps(t, backupDst, forceFull)
-	testutil.WaitForBackup(t)
+	testutil.WaitForTask(t, "opBackup")
 
 	// Verify that the right amount of files and directories were created.
 	copyToLocalFs(t)

systest/backup/multi-tenancy/backup_test.go

@@ -342,7 +342,7 @@ func runBackupInternal(t *testing.T, token *testutil.HttpToken, forceFull bool,
 	}
 	require.NoError(t, json.Unmarshal(resp.Data, &result))
 	require.Contains(t, result.Backup.Response.Message, "Backup queued successfully")
-	testutil.WaitForBackup(t)
+	testutil.WaitForTask(t, "opBackup")
 
 	// Verify that the right amount of files and directories were created.
 	common.CopyToLocalFs(t)

systest/online-restore/online_restore_test.go

@@ -563,7 +563,7 @@ func backup(t *testing.T, backupDir string) {
 	}
 	testutil.MakeGQLRequestWithTLS(t, backupParams, testutil.GetAlphaClientConfig(t)).
 		RequireNoGraphQLErrors(t)
-	testutil.WaitForBackup(t)
+	testutil.WaitForTask(t, "opBackup")
 }
 
 func backupRestoreAndVerify(t *testing.T, dg *dgo.Dgraph, backupDir, queryToVerify,

testutil/backup.go

@@ -95,34 +95,6 @@ func StartBackupHttps(t *testing.T, backupDst string, forceFull bool) {
 	require.Contains(t, string(responseBody), "Backup queued successfully")
 }
 
-func WaitForBackup(t *testing.T) {
-	healthUrl := "http://" + SockAddrHttp + "/health"
-	for {
-		health := func() []pb.HealthInfo {
-			response, err := http.Get(healthUrl)
-			require.NoError(t, err)
-			defer response.Body.Close()
-
-			var health []pb.HealthInfo
-			decoder := json.NewDecoder(response.Body)
-			err = decoder.Decode(&health)
-			require.NoError(t, err)
-			require.Len(t, health, 1)
-
-			return health
-		}()
-
-		status := health[0].LastBackup
-		if strings.HasPrefix(status, "COMPLETED: ") {
-			break
-		}
-		require.True(t, status == "" || strings.HasPrefix(status, "STARTED: "),
-			"backup failed: status: %s", status)
-
-		time.Sleep(4 * time.Second)
-	}
-}
-
 func WaitForRestore(t *testing.T, dg *dgo.Dgraph) {
 	for {
 		resp, err := http.Get("http://" + SockAddrHttp + "/health")

testutil/client.go

@@ -33,6 +33,7 @@ import (
 	"time"
 
 	"github.com/dgraph-io/dgraph/gql"
+	"github.com/dgraph-io/dgraph/protos/pb"
 
 	"github.com/dgraph-io/dgo/v200"
 	"github.com/dgraph-io/dgo/v200/protos/api"
@@ -532,3 +533,34 @@ func GetAlphaClientConfig(t *testing.T) *tls.Config {
 	require.NoError(t, err)
 	return tlsConf
 }
+
+func WaitForTask(t *testing.T, task string) {
+	healthUrl := "http://" + SockAddrHttp + "/health"
+	for {
+		time.Sleep(5 * time.Second)
+
+		var health []pb.HealthInfo
+		func() {
+			// #nosec G107
+			response, err := http.Get(healthUrl)
+			require.NoError(t, err)
+			defer response.Body.Close()
+
+			decoder := json.NewDecoder(response.Body)
+			err = decoder.Decode(&health)
+			require.NoError(t, err)
+			require.Len(t, health, 1)
+		}()
+
+		completed := true
+		for _, ongoingTask := range health[0].Ongoing {
+			if ongoingTask == task {
+				completed = false
+				break
+			}
+		}
+		if completed {
+			break
+		}
+	}
+}

worker/backup_common.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"math"
 	"sync"
-	"sync/atomic"
 
 	"github.com/dgraph-io/badger/v3"
 	"github.com/pkg/errors"
@@ -29,12 +28,6 @@ import (
 	"github.com/dgraph-io/dgraph/x"
 )
 
-var LastBackupStatus atomic.Value
-
-func init() {
-	LastBackupStatus.Store("")
-}
-
 // predicateSet is a map whose keys are predicates. It is meant to be used as a set.
 type predicateSet map[string]struct{}
 

worker/backup_ee.go

@@ -108,7 +108,7 @@ func ProcessBackupRequest(ctx context.Context, req *pb.BackupRequest, forceFull
 	}
 
 	if err := x.HealthCheck(); err != nil {
-		glog.Errorf("Backup canceled, not ready to accept requests: %s", err)
+		glog.Errorf("Backup canceled: not ready to accept requests: %s", err)
 		return err
 	}
 
@@ -117,11 +117,11 @@ func ProcessBackupRequest(ctx context.Context, req *pb.BackupRequest, forceFull
 		backupLock.Lock()
 		defer backupLock.Unlock()
 
-		LastBackupStatus.Store(fmt.Sprintf("STARTED: %s", time.Now().Format(time.RFC3339)))
+		glog.Infof("Backup started: %s", req.Destination)
 		if err := doBackup(ctx, req, forceFull); err != nil {
-			LastBackupStatus.Store(fmt.Sprintf("ERROR: %s: %s", time.Now().Format(time.RFC3339), err))
+			glog.Errorf("Backup error: %s: %s", err, req.Destination)
 		} else {
-			LastBackupStatus.Store(fmt.Sprintf("COMPLETED: %s", time.Now().Format(time.RFC3339)))
+			glog.Infof("Backup complete: %s", req.Destination)
 		}
 	}()