K8SPS-400: custom options for xtrabackup, xbstream, xbcloud #986
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pooknull
requested review from
jvpasinatto,
eleo007,
valmiranogueira,
egegunes,
nmarukovich and
gkech
as code owners
gkech
reviewed
Aug 20, 2025
| return util.MergeEnvLists(b.Env, b.Args.Env()) | ||
| } | ||
|
|
||
| func (b *BackupContainerOptions) GetEnvVar(cluster *PerconaServerMySQL, storage *BackupStorageSpec) []corev1.EnvVar { |
There was a problem hiding this comment.
The cluster option here is not used in the function, maybe we can remove it.
| return nil | ||
| } | ||
|
|
||
| return storage.ContainerOptions.GetEnvVar(nil, nil) |
There was a problem hiding this comment.
I'm trying to understand the logic here. Essentially, the cluster argument is not needed. For nil storage, we call the same function, and we return essentially nil. Why not just
func (b *BackupContainerOptions) GetEnvVar(cluster *PerconaServerMySQL, storage *BackupStorageSpec) []corev1.EnvVar {
if b == nil {
return nil
}
return b.GetEnv()
}
Essentially I'm missing why storage is passed as an argument. WDYT?
| } | ||
| fmt.Println("TEST", conf.ContainerOptions) |
There was a problem hiding this comment.
Do we need to keep this println?
pkg/xtrabackup/xtrabackup.go
Outdated
| } | ||
| if backupContainerOptions.Args.Xtrabackup != nil { | ||
| containerOptions.Args.Xtrabackup = backupContainerOptions.Args.Xtrabackup | ||
| fmt.Println("TEST 2", containerOptions.Args.Xtrabackup) |
There was a problem hiding this comment.
Maybe we can drop this prinln.
| } | ||
| if backupContainerOptions.Args.Xtrabackup != nil { | ||
| containerOptions.Args.Xtrabackup = backupContainerOptions.Args.Xtrabackup | ||
| fmt.Println("TEST 2", containerOptions.Args.Xtrabackup) |
There was a problem hiding this comment.
I think this is a leftover print that we can drop
egegunes
reviewed
Aug 20, 2025
pkg/util/env.go
Outdated
| resultList := make([]corev1.EnvVar, 0) | ||
| for _, list := range envLists { | ||
| for _, env := range list { | ||
| idx := FindEnvIndex(resultList, env.Name) |
There was a problem hiding this comment.
not critical but we can use built-in slices.IndexFunc here
cmd/sidecar/main.go
Outdated
Comment on lines
387
to
395
| if backupConf.ContainerOptions != nil { | ||
| for _, env := range backupConf.ContainerOptions.Env { | ||
| if err := os.Setenv(env.Name, env.Value); err != nil { | ||
| log.Error(err, "failed to set env") | ||
| http.Error(w, "failed to set env", http.StatusInternalServerError) | ||
| return | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
wouldn't it be better to set these env vars for specific commands? like:
xtrabackup := exec.CommandContext(gCtx, "xtrabackup", xtrabackupArgs(string(backupUser), backupPass, &backupConf)...)
env := os.Environ()
for _, e := range backupConf.ContainerOptions.Env {
env = append(env, fmt.Sprintf("%s=%s", e.Name, e.Value)
}
xtrabackup.Env = env
egegunes
previously approved these changes
Aug 22, 2025
gkech
previously approved these changes
Aug 22, 2025
egegunes
previously approved these changes
Aug 27, 2025
gkech
previously approved these changes
Aug 27, 2025
egegunes
approved these changes
Aug 28, 2025
commit: 6517e4e |
hors
approved these changes
Aug 28, 2025
gkech
approved these changes
Aug 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://perconadev.atlassian.net/browse/K8SPS-400
DESCRIPTION
Problem:
In our backups and restoration process we rely on
xtrabackup,xbstreamandxbcloud. Not always default options for these tools are optimal.Solution:
Add
containerOptionssection tops-backup,ps-restoreandpsresources.If
containerOptionsspecified in bothps-backup/ps-restoreandps, values fromps-backup/ps-restorewill be used.Helm PR: percona/percona-helm-charts#612
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
Config/Logging/Testability