-
Notifications
You must be signed in to change notification settings - Fork 8.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
included reconciler handler as a generic p2p msg
- Loading branch information
1 parent
a0baf0f
commit ad406a4
Showing
5 changed files
with
225 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package p2pmessage | ||
|
|
||
| import ( | ||
| "github.com/hyperledger/fabric/common/metrics" | ||
| ) | ||
|
|
||
| var ( | ||
| streamsOpened = metrics.CounterOpts{ | ||
| Namespace: "p2p_message", | ||
| Name: "streams_opened", | ||
| Help: "The number of GRPC streams that have been opened for the p2p_message service.", | ||
| } | ||
| streamsClosed = metrics.CounterOpts{ | ||
| Namespace: "p2p_message", | ||
| Name: "streams_closed", | ||
| Help: "The number of GRPC streams that have been closed for the p2p_message service.", | ||
| } | ||
|
|
||
| requestsReceived = metrics.CounterOpts{ | ||
| Namespace: "p2p_message", | ||
| Name: "requests_received", | ||
| Help: "The number of p2p_message requests that have been received.", | ||
| LabelNames: []string{"channel", "filtered", "data_type"}, | ||
| StatsdFormat: "%{#fqname}.%{channel}.%{filtered}.%{data_type}", | ||
| } | ||
| requestsCompleted = metrics.CounterOpts{ | ||
| Namespace: "p2p_message", | ||
| Name: "requests_completed", | ||
| Help: "The number of p2p_message requests that have been completed.", | ||
| LabelNames: []string{"channel", "filtered", "data_type", "success"}, | ||
| StatsdFormat: "%{#fqname}.%{channel}.%{filtered}.%{data_type}.%{success}", | ||
| } | ||
|
|
||
| blocksReconciled = metrics.CounterOpts{ | ||
| Namespace: "p2p_message", | ||
| Name: "blocks_reconciled", | ||
| Help: "The number of blocks sent by the p2p_message service.", | ||
| LabelNames: []string{"channel", "filtered", "data_type"}, | ||
| StatsdFormat: "%{#fqname}.%{channel}.%{filtered}.%{data_type}", | ||
| } | ||
| ) | ||
|
|
||
| type Metrics struct { | ||
| StreamsOpened metrics.Counter | ||
| StreamsClosed metrics.Counter | ||
| RequestsReceived metrics.Counter | ||
| RequestsCompleted metrics.Counter | ||
| BlocksReconciled metrics.Counter | ||
| } | ||
|
|
||
| func NewMetrics(p metrics.Provider) *Metrics { | ||
| return &Metrics{ | ||
| StreamsOpened: p.NewCounter(streamsOpened), | ||
| StreamsClosed: p.NewCounter(streamsClosed), | ||
| RequestsReceived: p.NewCounter(requestsReceived), | ||
| RequestsCompleted: p.NewCounter(requestsCompleted), | ||
| BlocksReconciled: p.NewCounter(blocksReconciled), | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package p2pmessage | ||
|
|
||
| import ( | ||
| "context" | ||
| "github.com/hyperledger/fabric/common/crypto" | ||
| "github.com/hyperledger/fabric/common/flogging" | ||
| "github.com/hyperledger/fabric/common/ledger/blockledger" | ||
| "github.com/hyperledger/fabric/common/policies" | ||
| "github.com/hyperledger/fabric/common/util" | ||
| "github.com/hyperledger/fabric/internal/peer/protos" | ||
| "time" | ||
| ) | ||
|
|
||
| var logger = flogging.MustGetLogger("common.p2pmessage") | ||
|
|
||
| //go:generate counterfeiter -o mock/chain_manager.go -fake-name ChainManager . ChainManager | ||
|
|
||
| // ChainManager provides a way for the Handler to look up the Chain. | ||
| type ChainManager interface { | ||
| GetChain(chainID string) Chain | ||
| } | ||
|
|
||
| //go:generate counterfeiter -o mock/chain.go -fake-name Chain . Chain | ||
|
|
||
| // Chain encapsulates chain operations and data. | ||
| type Chain interface { | ||
| // Sequence returns the current config sequence number, can be used to detect config changes | ||
| Sequence() uint64 | ||
|
|
||
| // PolicyManager returns the current policy manager as specified by the chain configuration | ||
| PolicyManager() policies.Manager | ||
|
|
||
| // Reader returns the chain Reader for the chain | ||
| Reader() blockledger.Reader | ||
|
|
||
| // Errored returns a channel which closes when the backing consenter has errored | ||
| Errored() <-chan struct{} | ||
| } | ||
|
|
||
| ////go:generate counterfeiter -o mock/policy_checker.go -fake-name PolicyChecker . PolicyChecker | ||
| // | ||
| //// PolicyChecker checks the envelope against the policy logic supplied by the | ||
| //// function. | ||
| //type PolicyChecker interface { | ||
| // CheckPolicy(envelope *cb.Envelope, channelID string) error | ||
| //} | ||
| // | ||
| //// The PolicyCheckerFunc is an adapter that allows the use of an ordinary | ||
| //// function as a PolicyChecker. | ||
| //type PolicyCheckerFunc func(envelope *cb.Envelope, channelID string) error | ||
| // | ||
| //// CheckPolicy calls pcf(envelope, channelID) | ||
| //func (pcf PolicyCheckerFunc) CheckPolicy(envelope *cb.Envelope, channelID string) error { | ||
| // return pcf(envelope, channelID) | ||
| //} | ||
|
|
||
| ////go:generate counterfeiter -o mock/inspector.go -fake-name Inspector . Inspector | ||
| // | ||
| //// Inspector verifies an appropriate binding between the message and the context. | ||
| //type Inspector interface { | ||
| // Inspect(context.Context, proto.Message) error | ||
| //} | ||
| // | ||
| //// The InspectorFunc is an adapter that allows the use of an ordinary | ||
| //// function as an Inspector. | ||
| //type InspectorFunc func(context.Context, proto.Message) error | ||
| // | ||
| //// Inspect calls inspector(ctx, p) | ||
| //func (inspector InspectorFunc) Inspect(ctx context.Context, p proto.Message) error { | ||
| // return inspector(ctx, p) | ||
| //} | ||
|
|
||
| // Handler handles server requests. | ||
| type Handler struct { | ||
| ExpirationCheckFunc func(identityBytes []byte) time.Time | ||
| ChainManager ChainManager | ||
| TimeWindow time.Duration | ||
| //BindingInspector Inspector | ||
| Metrics *Metrics | ||
| } | ||
|
|
||
| // Server is a polymorphic structure to support generalization of this handler | ||
| // to be able to deliver different type of responses. | ||
| type Server struct { | ||
| Receiver | ||
| } | ||
|
|
||
| // Receiver is used to receive enveloped seek requests. | ||
| type Receiver interface { | ||
| SendReconcileRequest() | ||
| } | ||
|
|
||
| // NewHandler creates an implementation of the Handler interface. | ||
| func NewHandler(cm ChainManager, timeWindow time.Duration, mutualTLS bool, metrics *Metrics, expirationCheckDisabled bool) *Handler { | ||
| expirationCheck := crypto.ExpiresAt | ||
| if expirationCheckDisabled { | ||
| expirationCheck = noExpiration | ||
| } | ||
| return &Handler{ | ||
| ChainManager: cm, | ||
| TimeWindow: timeWindow, | ||
| //BindingInspector: InspectorFunc(comm.NewBindingInspector(mutualTLS, ExtractChannelHeaderCertHash)), | ||
| Metrics: metrics, | ||
| ExpirationCheckFunc: expirationCheck, | ||
| } | ||
| } | ||
|
|
||
| // Handle receives incoming deliver requests. | ||
| func (h *Handler) Handle(ctx context.Context, request *protos.ReconcileRequest) (*protos.ReconcileResponse, error) { | ||
| addr := util.ExtractRemoteAddress(ctx) | ||
| logger.Debugf("Starting new p2p loop for %s", addr) | ||
| h.Metrics.StreamsOpened.Add(1) | ||
| defer h.Metrics.StreamsClosed.Add(1) | ||
|
|
||
| reconcileResponse := &protos.ReconcileResponse{ | ||
| Success: true, | ||
| Message: "I amd sending the response! It's me server", | ||
| } | ||
|
|
||
| return reconcileResponse, nil | ||
| } | ||
|
|
||
| // ExtractChannelHeaderCertHash extracts the TLS cert hash from a channel header. | ||
| //func ExtractChannelHeaderCertHash(msg proto.Message) []byte { | ||
| // chdr, isChannelHeader := msg.(*cb.ChannelHeader) | ||
| // if !isChannelHeader || chdr == nil { | ||
| // return nil | ||
| // } | ||
| // return chdr.TlsCertHash | ||
| //} | ||
|
|
||
| func noExpiration(_ []byte) time.Time { | ||
| return time.Time{} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters