allow restore from old format, fix #1238

Signed-off-by: Slach <[email protected]>

Author: Slach

pkg/backup/restore.go

@@ -573,8 +573,14 @@ func (b *Backuper) restoreRBACResolveAllConflicts(ctx context.Context, backupNam
 				data := keeper.DumpNode{}
 				jsonErr := json.Unmarshal([]byte(line), &data)
 				if jsonErr != nil {
-					log.Error().Msgf("can't %s json.Unmarshal error: %v line: %s", fPath, line, jsonErr)
-					continue
+					//convert from old format
+					dataString := keeper.DumpNodeString{}
+					if jsonErr = json.Unmarshal([]byte(line), &dataString); jsonErr != nil {
+						log.Error().Msgf("can't %s json.Unmarshal error: %v line: %s", fPath, line, jsonErr)
+						continue
+					}
+					data.Path = dataString.Path
+					data.Value = []byte(dataString.Value)
 				}
 				if strings.HasPrefix(data.Path, "uuid/") {
 					if resolveErr := b.resolveRBACConflictIfExist(ctx, string(data.Value), accessPath, version, k, replicatedUserDirectories, dropExists); resolveErr != nil {

pkg/keeper/keeper.go

@@ -5,15 +5,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/antchfx/xmlquery"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"os"
 	"path"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/antchfx/xmlquery"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
+
 	"github.com/Altinity/clickhouse-backup/v2/pkg/clickhouse"
 	"github.com/go-zookeeper/zk"
 )
@@ -42,6 +43,12 @@ type DumpNode struct {
 	Value []byte `json:"value"` // json encodes/decodes as base64 automatically
 }
 
+// old format used during restore
+type DumpNodeString struct {
+	Path  string `json:"path"`
+	Value string `json:"value"`
+}
+
 type Keeper struct {
 	conn          *zk.Conn
 	root          string
@@ -197,8 +204,13 @@ func (k *Keeper) Restore(dumpFile, prefix string) error {
 	scanner := bufio.NewScanner(f)
 	for scanner.Scan() {
 		node := DumpNode{}
-		if err = json.Unmarshal(scanner.Bytes(), &node); err != nil {
-			return err
+		binaryData := scanner.Bytes()
+		if err = json.Unmarshal(binaryData, &node); err != nil {
+			//convert from old format
+			nodeString := DumpNodeString{}
+			if stringUnmarshalErr := json.Unmarshal(binaryData, &nodeString); stringUnmarshalErr != nil {
+				return fmt.Errorf("k.Restore can't read data binaryErr=%v, stringErr=%v", err, stringUnmarshalErr)
+			}
 		}
 		node.Path = path.Join(prefix, node.Path)
 		version := int32(0)