JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multinode/nodes: checking node availability before adding it

Browse Source 
Change-Id: I7792ed359713f12fee9fb4ac0ea46703dfc8406e
This commit is contained in:
crawter 2021-07-05 18:12:38 +03:00 committed by Yehor Butko
parent cbb4cd3fc3
commit f79d697717
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
multinode/console/controllers/nodes.go
View File

@ -67,9 +67,16 @@ func (controller *Nodes) Add(w http.ResponseWriter, r *http.Request) {
} }
if err = controller.service.Add(ctx, id, apiSecret[:], payload.PublicAddress); err != nil { if err = controller.service.Add(ctx, id, apiSecret[:], payload.PublicAddress); err != nil {
// TODO: add more error checks in future, like bad payload if address is invalid or unauthorized if secret invalid. switch {
controller.log.Error("add node internal error", zap.Error(err)) case nodes.ErrNodeNotReachable.Has(err):
controller.serveError(w, http.StatusNotFound, ErrNodes.Wrap(err))
case nodes.ErrNodeAPIKeyInvalid.Has(err):
controller.serveError(w, http.StatusUnauthorized, ErrNodes.Wrap(err))
case nodes.Error.Has(err):
default:
controller.log.Error("could not add node", zap.Error(err))
controller.serveError(w, http.StatusInternalServerError, ErrNodes.Wrap(err)) controller.serveError(w, http.StatusInternalServerError, ErrNodes.Wrap(err))
}
return return
} }
} }

30
multinode/nodes/service.go
View File

@ -13,6 +13,7 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"storj.io/common/rpc" "storj.io/common/rpc"
"storj.io/common/rpc/rpcstatus"
"storj.io/common/storj" "storj.io/common/storj"
"storj.io/storj/private/multinodepb" "storj.io/storj/private/multinodepb"
) )
@ -24,6 +25,8 @@ var (
Error = errs.Class("nodes") Error = errs.Class("nodes")
// ErrNodeNotReachable is an error class that indicates that we are not able to establish drpc connection with node. // ErrNodeNotReachable is an error class that indicates that we are not able to establish drpc connection with node.
ErrNodeNotReachable = errs.Class("node is not reachable") ErrNodeNotReachable = errs.Class("node is not reachable")
// ErrNodeAPIKeyInvalid is an error class that indicates that we uses wrong api key.
ErrNodeAPIKeyInvalid = errs.Class("node api key is invalid")
) )
// Service exposes all nodes related logic. // Service exposes all nodes related logic.
@ -47,6 +50,33 @@ func NewService(log *zap.Logger, dialer rpc.Dialer, nodes DB) *Service {
// Add adds new node to the system. // Add adds new node to the system.
func (service *Service) Add(ctx context.Context, id storj.NodeID, apiSecret []byte, publicAddress string) (err error) { func (service *Service) Add(ctx context.Context, id storj.NodeID, apiSecret []byte, publicAddress string) (err error) {
defer mon.Task()(&ctx)(&err) defer mon.Task()(&ctx)(&err)
// trying to connect to node to check its availability.
conn, err := service.dialer.DialNodeURL(ctx, storj.NodeURL{
ID: id,
Address: publicAddress,
})
if err != nil {
return ErrNodeNotReachable.Wrap(err)
}
defer func() {
err = errs.Combine(err, conn.Close())
}()
nodeClient := multinodepb.NewDRPCNodeClient(conn)
header := &multinodepb.RequestHeader{
ApiKey: apiSecret,
}
// making test request to check node api key.
_, err = nodeClient.Version(ctx, &multinodepb.VersionRequest{Header: header})
if err != nil {
if rpcstatus.Code(err) == rpcstatus.Unauthenticated {
return ErrNodeAPIKeyInvalid.Wrap(err)
}
return Error.Wrap(err)
}
return Error.Wrap(service.nodes.Add(ctx, id, apiSecret, publicAddress)) return Error.Wrap(service.nodes.Add(ctx, id, apiSecret, publicAddress))
} }