fix wrong behavior for restore --rbac-only and restore --rbac for…

… backups which not contains any schema, fix #832

ChangeLog.md

@@ -1,9 +1,10 @@
 # v2.4.31
 IMPROVEMENTS
-- add `check_sum_algorithm` parameter for `s3` config section with "" default value, to avoid useless CPU usage during upload to S3 storage, additional fix [829](https://github.com/Altinity/clickhouse-backup/issues/829) 
+- add `check_sum_algorithm` parameter for `s3` config section with "" default value, to avoid useless CPU usage during upload to `S3` storage, additional fix [829](https://github.com/Altinity/clickhouse-backup/issues/829) 
 
 BUG FIXES
 - fix miss checksum for CopyObject in `s3`, fix [835](https://github.com/Altinity/clickhouse-backup/issues/835), affected 2.4.30
+- fix wrong behavior for `restore --rbac-only` and `restore --rbac` for backups which not contains any schema, fix [832](https://github.com/Altinity/clickhouse-backup/issues/832)   
 
 # v2.4.30
 BUG FIXES

test/integration/integration_test.go

@@ -488,7 +488,14 @@ func TestDoRestoreRBAC(t *testing.T) {
 	log.Info("download+restore RBAC")
 	r.NoError(dockerExec("clickhouse", "ls", "-lah", "/var/lib/clickhouse/access"))
 	r.NoError(dockerExec("clickhouse-backup", "bash", "-xec", "ALLOW_EMPTY_BACKUPS=1 CLICKHOUSE_BACKUP_CONFIG=/etc/clickhouse-backup/config-s3.yml clickhouse-backup download test_rbac_backup"))
-	r.NoError(dockerExec("clickhouse-backup", "clickhouse-backup", "-c", "/etc/clickhouse-backup/config-s3.yml", "restore", "--rm", "--rbac", "--rbac-only", "test_rbac_backup"))
+
+	out, err := dockerExecOut("clickhouse-backup", "bash", "-xec", "ALLOW_EMPTY_BACKUPS=1 clickhouse-backup -c /etc/clickhouse-backup/config-s3.yml restore --rm --rbac test_rbac_backup")
+	r.Contains(out, "RBAC successfully restored")
+	r.NoError(err)
+
+	out, err = dockerExecOut("clickhouse-backup", "bash", "-xec", "ALLOW_EMPTY_BACKUPS=1 clickhouse-backup -c /etc/clickhouse-backup/config-s3.yml restore --rm --rbac-only test_rbac_backup")
+	r.Contains(out, "RBAC successfully restored")
+	r.NoError(err)
 	r.NoError(dockerExec("clickhouse", "ls", "-lah", "/var/lib/clickhouse/access"))
 
 	ch.chbackend.Close()