From 432499f0b8707419ea240f51f2ec7dc81ab98198 Mon Sep 17 00:00:00 2001 From: Yingchun Lai Date: Wed, 29 Nov 2023 16:52:38 +0800 Subject: [PATCH] fix(admin-cli): fix the command reports incorrect ERR_INVALID_PARAMETERS error (#1699) https://github.com/apache/incubator-pegasus/issues/1698 Do not set the `backupPath` field of `StartBackupAppRequest` if it's not set to avoid an `ERR_INVALID_PARAMETERS` error from server. The error is caused by a conflict check on server side between `StartBackupAppRequest.backupPath` and `[block_service.hdfs_service].{args}`, the latter has defined a default backup path. --- admin-cli/client/meta.go | 4 +++- admin-cli/go.sum | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin-cli/client/meta.go b/admin-cli/client/meta.go index 0579da7626..e4b680f138 100644 --- a/admin-cli/client/meta.go +++ b/admin-cli/client/meta.go @@ -423,7 +423,9 @@ func (m *rpcBasedMeta) StartBackupApp(tableID int, providerType string, backupPa req := &admin.StartBackupAppRequest{ BackupProviderType: providerType, AppID: int32(tableID), - BackupPath: &backupPath, + } + if backupPath != "" { + req.BackupPath = &backupPath } var result *admin.StartBackupAppResponse err := m.callMeta("StartBackupApp", req, func(resp interface{}) { diff --git a/admin-cli/go.sum b/admin-cli/go.sum index ecfba901ef..823378be52 100644 --- a/admin-cli/go.sum +++ b/admin-cli/go.sum @@ -41,7 +41,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/apache/incubator-pegasus/go-client v0.0.0-20220526071020-be5634371701 h1:J9d8jaC0rKlnf8iQuImyBiDrZnl794JlGMXX8DhMNrs= github.com/apache/incubator-pegasus/go-client v0.0.0-20220526071020-be5634371701/go.mod h1:vOnSzVwVYmatouq8qEBX+yWV4AvoCTLRpQn6JA+qojs= github.com/apache/incubator-pegasus/go-client v0.0.0-20220617101220-e49a69d25a52 h1:RvSh9D6x+zfq56hk4vXZyUwjdnpAhBO6pSqcT2nRFgY= github.com/apache/incubator-pegasus/go-client v0.0.0-20220617101220-e49a69d25a52/go.mod h1:vOnSzVwVYmatouq8qEBX+yWV4AvoCTLRpQn6JA+qojs=