forked from rook/rook
zer0def
9b69b5cb46
Due to multi-site Ceph object resources (realms, zonegroups, zones) reconciliation CLI commands being proxied through CephCluster's Mgr pods in Multus-based scenarios, return codes were being additionally wrapped by K8S' command streams and weren't adequately handled in-code, causing reconciliation of CephObject(Realm|ZoneGroup|Zone) resources to fail, as an exit code of 0, instead of the expected syscall.ENOENT (2) was returned. Fixes #12833 Signed-off-by: zer0def <zv0uzqbqnncivw0afjsx79jmd19shpps3r5f2vjc6yv@definedaszero.xyz>
54 lines
1.3 KiB
Go
54 lines
1.3 KiB
Go
/*
|
|
Copyright 2016 The Rook Authors. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
// Package exec embeds Rook's exec logic
|
|
package exec
|
|
|
|
import (
|
|
"fmt"
|
|
kexec "k8s.io/client-go/util/exec"
|
|
"os/exec"
|
|
"syscall"
|
|
)
|
|
|
|
// CephCLIError is Ceph CLI Error type
|
|
type CephCLIError struct {
|
|
err error
|
|
output string
|
|
}
|
|
|
|
func (e *CephCLIError) Error() string {
|
|
return fmt.Sprintf("%v", e.output)
|
|
}
|
|
|
|
// ExitStatus looks for the exec error code
|
|
func ExitStatus(err error) (int, bool) {
|
|
switch e := err.(type) {
|
|
case *exec.ExitError:
|
|
waitStatus, ok := e.ProcessState.Sys().(syscall.WaitStatus)
|
|
if ok {
|
|
return waitStatus.ExitStatus(), true
|
|
}
|
|
case kexec.CodeExitError:
|
|
return int(e.ExitStatus()), true
|
|
case *CephCLIError:
|
|
return ExitStatus(e.err)
|
|
case syscall.Errno:
|
|
return int(e), true
|
|
}
|
|
return 0, false
|
|
}
|