luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

msgpack-rpc errors cannot be wrapped (#8633)

Browse source 
Our RPC calls mangle the errors we get, which prevents us from using wrapped
errors and `errors.Is`.

Also fixes log message fields.
This commit is contained in:
Tim Gross 2020-08-11 10:25:43 -04:00 committed by GitHub
parent 443fdaa86b
commit def7084be7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
nomad/client_csi_endpoint.go
View file

@ -1,16 +1,15 @@
package nomad
import (
"errors"
"fmt"
"math/rand"
"strings"
"time"
metrics "github.com/armon/go-metrics"
log "github.com/hashicorp/go-hclog"
memdb "github.com/hashicorp/go-memdb"
cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/nomad/structs"
)
// ClientCSI is used to forward RPC requests to the targed Nomad client's
@ -41,7 +40,8 @@ func (a *ClientCSI) ControllerAttachVolume(args *cstructs.ClientCSIControllerAtt
return nil
}
if a.isRetryable(err) {
a.logger.Debug("failed to reach controller on client %q: %v", clientID, err)
a.logger.Debug("failed to reach controller on client",
"nodeID", clientID, "err", err)
continue
}
return fmt.Errorf("controller attach volume: %v", err)
@ -70,7 +70,8 @@ func (a *ClientCSI) ControllerValidateVolume(args *cstructs.ClientCSIControllerV
return nil
}
if a.isRetryable(err) {
a.logger.Debug("failed to reach controller on client %q: %v", clientID, err)
a.logger.Debug("failed to reach controller on client",
"nodeID", clientID, "err", err)
continue
}
return fmt.Errorf("validate volume: %v", err)
@ -99,7 +100,8 @@ func (a *ClientCSI) ControllerDetachVolume(args *cstructs.ClientCSIControllerDet
return nil
}
if a.isRetryable(err) {
a.logger.Debug("failed to reach controller on client %q: %v", clientID, err)
a.logger.Debug("failed to reach controller on client",
"nodeID", clientID, "err", err)
continue
}
return fmt.Errorf("controller detach volume: %v", err)
@ -111,8 +113,10 @@ func (a *ClientCSI) ControllerDetachVolume(args *cstructs.ClientCSIControllerDet
// client has stopped and been GC'd, or where the controller has stopped but
// we don't have the fingerprint update yet
func (a *ClientCSI) isRetryable(err error) bool {
return errors.Is(err, structs.ErrUnknownNode) ||
errors.Is(err, structs.ErrCSIClientRPCRetryable)
// TODO: msgpack-rpc mangles the error so we lose the wrapping,
// but if that can be fixed upstream we should use that here instead
return strings.Contains(err.Error(), "CSI client error (retryable)") ||
strings.Contains(err.Error(), "Unknown node")
}
func (a *ClientCSI) NodeDetachVolume(args *cstructs.ClientCSINodeDetachVolumeRequest, reply *cstructs.ClientCSINodeDetachVolumeResponse) error {