fix #1058

Signed-off-by: Slach <[email protected]>
Altinity · Dec 9, 2024 · 5dac10f · 5dac10f
1 parent 0148039
commit 5dac10f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/pkg/backup/restore.go b/pkg/backup/restore.go
@@ -683,6 +683,7 @@ func (b *Backuper) dropExistsRBAC(ctx context.Context, kind string, name string,
 	if !isKeeperRBACTypePrefixExists {
 		return fmt.Errorf("unsupported RBAC kind: %s", kind)
 	}
+	// rbacType contains name of keeper user directory
 	prefix, err := k.GetReplicatedAccessPath(rbacType)
 	if err != nil {
 		return fmt.Errorf("b.dropExistsRBAC -> k.GetReplicatedAccessPath error: %v", err)

diff --git a/pkg/keeper/keeper.go b/pkg/keeper/keeper.go
@@ -112,6 +112,7 @@ func (k *Keeper) GetReplicatedAccessPath(userDirectory string) (string, error) {
 	if zookeeperPath != "/" {
 		zookeeperPath = strings.TrimSuffix(zookeeperPathNode.InnerText(), "/")
 	}
+	log.Debug().Str("userDirectory", userDirectory).Str("zookeeper_path", zookeeperPath).Msg("k->GetReplicatedAccessPath")
 	return zookeeperPath, nil
 }
 
@@ -125,7 +126,7 @@ func (k *Keeper) Dump(prefix, dumpFile string) (int, error) {
 			log.Warn().Msgf("can't close %s: %v", dumpFile, err)
 		}
 	}()
-	if !strings.HasPrefix(prefix, "/") && k.root != "" {
+	if k.root != "" && !strings.HasPrefix(prefix, k.root) {
 		prefix = path.Join(k.root, prefix)
 	}
 	bytes, err := k.dumpNodeRecursive(prefix, "", f)
@@ -136,6 +137,10 @@ func (k *Keeper) Dump(prefix, dumpFile string) (int, error) {
 }
 
 func (k *Keeper) ChildCount(prefix, nodePath string) (int, error) {
+	if k.root != "" && !strings.HasPrefix(prefix, k.root) {
+		prefix = path.Join(k.root, prefix)
+	}
+	log.Debug().Str("prefix", prefix).Str("nodePath", nodePath).Msg("k->ChildCount")
 	childrenNodes, _, err := k.conn.Children(path.Join(prefix, nodePath))
 	return len(childrenNodes), err
 }
@@ -145,7 +150,7 @@ func (k *Keeper) dumpNodeRecursive(prefix, nodePath string, f *os.File) (int, er
 	if err != nil {
 		return 0, err
 	}
-	bytes, err := k.writeJsonString(f, DumpNode{Path: nodePath, Value: string(value)})
+	bytes, err := k.writeJsonString(f, DumpNode{Path: strings.TrimPrefix(nodePath, k.root), Value: string(value)})
 	if err != nil {
 		return 0, err
 	}
@@ -186,7 +191,7 @@ func (k *Keeper) Restore(dumpFile, prefix string) error {
 			log.Warn().Msgf("can't close %s: %v", dumpFile, err)
 		}
 	}()
-	if !strings.HasPrefix(prefix, "/") && k.root != "" {
+	if k.root != "" && !strings.HasPrefix(prefix, k.root) {
 		prefix = path.Join(k.root, prefix)
 	}
 	scanner := bufio.NewScanner(f)

diff --git a/test/integration/.env.example b/test/integration/.env.example
@@ -14,5 +14,4 @@ export QA_GCS_OVER_S3_BUCKET=XXX
 # QA_GCS_CRED_JSON='{     "type": "service_account",     "project_id": "XXXX",     "private_key_id": "XXXXX",     "private_key": "SSH KEY XXXX",     "client_email": "XXXX",     "client_id": "XXXX",     "auth_uri": "https://accounts.google.com/o/oauth2/auth",     "token_uri": "https://oauth2.googleapis.com/token",     "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",     "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/<client_email_url_encoded>"   }'
 export QA_GCS_CRED_JSON=""
 export QA_GCS_CRED_JSON_ENCODED=$(echo '{     "type": "service_account",     "project_id": "XXXX",     "private_key_id": "XXXXX",     "private_key": "SSH KEY XXXX",     "client_email": "XXXX",     "client_id": "XXXX",     "auth_uri": "https://accounts.google.com/o/oauth2/auth",     "token_uri": "https://oauth2.googleapis.com/token",     "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",     "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/<client_email_url_encoded>"   }' | base64 -w 0 )
-export CLICKHOUSE_TESTS_DIR=${PWD}/test/testflows/clickhouse_backup
-export GOCOVERDIR=${PWD}/test/testflows/_coverage_
+export GOCOVERDIR=${PWD}/test/integration/_coverage_
diff --git a/test/integration/dynamic_settings.sh b/test/integration/dynamic_settings.sh
@@ -426,6 +426,21 @@ EOT
 
 fi
 
+# https://github.com/Altinity/clickhouse-backup/issues/1058, clickhouse-keeper-client available from 23.9
+if [[ "${CLICKHOUSE_VERSION}" == "head" || "${CLICKHOUSE_VERSION}" =~ ^23\.9 || "${CLICKHOUSE_VERSION}" =~ ^23\.1[0-9] || "${CLICKHOUSE_VERSION}" =~ ^2[4-9]\.[1-9] ]]; then
+
+clickhouse-keeper-client -p 2181 -h zookeeper -q "touch '/custom_zookeeper_root'"
+
+cat <<EOT > /etc/clickhouse-server/config.d/custom_zookeeper_root.xml
+<yandex>
+  <zookeeper>
+    <root>/custom_zookeeper_root</root>
+  </zookeeper>
+</yandex>
+EOT
+
+fi
+
 # zookeeper RBAC available from 21.9
 if [[ "${CLICKHOUSE_VERSION}" == "head" || "${CLICKHOUSE_VERSION}" =~ ^21\.9 || "${CLICKHOUSE_VERSION}" =~ ^21\.1[0-9] || "${CLICKHOUSE_VERSION}" =~ ^2[2-9]\.[1-9] ]]; then