mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-02 19:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: ignore stdErr for ceph osd blocklist when there is no error

Browse Source 
`ceph osd blocklist range add/rm <ip>` cmd is outputting
"blocklisting cidr:10.1.114.75:0/32 until 202..." messages
incorrectly into stdErr. This commit ignores stdErr when err
is nil.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit eb21d75ef7)
This commit is contained in:
Rakshith R 2022-11-11 20:29:39 +05:30 committed by mergify[bot]
parent 3c1d302583
commit 18f0fc1f4a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/csi-addons/networkfence/fencing.go
View File

@ -91,9 +91,6 @@ func (nf *NetworkFence) addCephBlocklist(ctx context.Context, ip string, useRang
if err != nil { if err != nil {
return fmt.Errorf("failed to blocklist IP %q: %w stderr: %q", ip, err, stdErr) return fmt.Errorf("failed to blocklist IP %q: %w stderr: %q", ip, err, stdErr)
} }
if stdErr != "" {
return fmt.Errorf("failed to blocklist IP %q: %q", ip, stdErr)
}
log.DebugLog(ctx, "blocklisted IP %q successfully", ip) log.DebugLog(ctx, "blocklisted IP %q successfully", ip)
return nil return nil
@ -195,9 +192,6 @@ func (nf *NetworkFence) removeCephBlocklist(ctx context.Context, ip string, useR
if err != nil { if err != nil {
return fmt.Errorf("failed to unblock IP %q: %v %w", ip, stdErr, err) return fmt.Errorf("failed to unblock IP %q: %v %w", ip, stdErr, err)
} }
if stdErr != "" {
return fmt.Errorf("failed to unblock IP %q: %q", ip, stdErr)
}
log.DebugLog(ctx, "unblocked IP %q successfully", ip) log.DebugLog(ctx, "unblocked IP %q successfully", ip)
return nil return nil