mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-03 22:57:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[fix] Avoid overwritten hook's exec.container parameter when running pod command executor

Browse Source 
Fix #4499
When hook influnce multiple pods, current logic's first pod's container will overwrite the hook's exec.container parameter. That will cause the other pod fail on the hook executing.

Signed-off-by: Xun Jiang <jxun@vmware.com>
This commit is contained in:
Xun Jiang
2022-02-17 15:24:56 +08:00
parent 2785807b2c
commit 6d9004dc62
3 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/podexec/pod_command_executor.go
+19 -17
View File
@@ -83,42 +83,44 @@ func (e *defaultPodCommandExecutor) ExecutePodCommand(log logrus.FieldLogger, it
return errors.New("hook is required")
}
localHook := *hook
pod := new(corev1api.Pod)
if err := runtime.DefaultUnstructuredConverter.FromUnstructured(item, pod); err != nil {
return errors.WithStack(err)
}
if hook.Container == "" {
if err := setDefaultHookContainer(pod, hook); err != nil {
if localHook.Container == "" {
if err := setDefaultHookContainer(pod, &localHook); err != nil {
return err
}
} else if err := ensureContainerExists(pod, hook.Container); err != nil {
} else if err := ensureContainerExists(pod, localHook.Container); err != nil {
return err
}
if len(hook.Command) == 0 {
if len(localHook.Command) == 0 {
return errors.New("command is required")
}
switch hook.OnError {
switch localHook.OnError {
case api.HookErrorModeFail, api.HookErrorModeContinue:
// use the specified value
default:
// default to fail
hook.OnError = api.HookErrorModeFail
localHook.OnError = api.HookErrorModeFail
}
if hook.Timeout.Duration == 0 {
hook.Timeout.Duration = defaultTimeout
if localHook.Timeout.Duration == 0 {
localHook.Timeout.Duration = defaultTimeout
}
hookLog := log.WithFields(
logrus.Fields{
"hookName": hookName,
"hookContainer": hook.Container,
"hookCommand": hook.Command,
"hookOnError": hook.OnError,
"hookTimeout": hook.Timeout,
"hookContainer": localHook.Container,
"hookCommand": localHook.Command,
"hookOnError": localHook.OnError,
"hookTimeout": localHook.Timeout,
},
)
hookLog.Info("running exec hook")
@@ -130,8 +132,8 @@ func (e *defaultPodCommandExecutor) ExecutePodCommand(log logrus.FieldLogger, it
SubResource("exec")
req.VersionedParams(&corev1api.PodExecOptions{
Container: hook.Container,
Command: hook.Command,
Container: localHook.Container,
Command: localHook.Command,
Stdout: true,
Stderr: true,
}, kscheme.ParameterCodec)
@@ -156,8 +158,8 @@ func (e *defaultPodCommandExecutor) ExecutePodCommand(log logrus.FieldLogger, it
}()
var timeoutCh <-chan time.Time
if hook.Timeout.Duration > 0 {
timer := time.NewTimer(hook.Timeout.Duration)
if localHook.Timeout.Duration > 0 {
timer := time.NewTimer(localHook.Timeout.Duration)
defer timer.Stop()
timeoutCh = timer.C
}
@@ -165,7 +167,7 @@ func (e *defaultPodCommandExecutor) ExecutePodCommand(log logrus.FieldLogger, it
select {
case err = <-errCh:
case <-timeoutCh:
return errors.Errorf("timed out after %v", hook.Timeout.Duration)
return errors.Errorf("timed out after %v", localHook.Timeout.Duration)
}
hookLog.Infof("stdout: %s", stdout.String())