cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1645 from ipfs/fix/metrics-batching-state

Browse Source 
Fix: wrong pins metric when batching enabled
This commit is contained in:
Hector Sanjuan 2022-04-26 14:53:13 +02:00 committed by GitHub
commit 09814e5176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
consensus/crdt/consensus.go
View File

@ -583,6 +583,9 @@ func (css *Consensus) State(ctx context.Context) (state.ReadOnly, error) {
case <-css.ctx.Done():
return nil, css.ctx.Err()
case <-css.stateReady:
if css.config.batchingEnabled() {
return css.batchingState, nil
}
return css.state, nil
}
}

5
ipfsconn/ipfshttp/ipfshttp.go
View File

@ -18,7 +18,6 @@ import (
"time"
"github.com/ipfs/ipfs-cluster/api"
"github.com/ipfs/ipfs-cluster/observations"
"go.uber.org/multierr"
cid "github.com/ipfs/go-cid"
@ -34,7 +33,6 @@ import (
"go.opencensus.io/plugin/ochttp"
"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
"go.opencensus.io/stats"
"go.opencensus.io/trace"
)
@ -401,7 +399,6 @@ func (ipfs *Connector) Pin(ctx context.Context, pin api.Pin) error {
}
logger.Info("IPFS Pin request succeeded: ", hash)
stats.Record(ctx, observations.Pins.M(1))
return nil
}
@ -461,7 +458,6 @@ func (ipfs *Connector) pinUpdate(ctx context.Context, from, to api.Cid) error {
return err
}
logger.Infof("IPFS Pin Update request succeeded. %s -> %s (unpin=false)", from, to)
stats.Record(ctx, observations.Pins.M(1))
return nil
}
@ -495,7 +491,6 @@ func (ipfs *Connector) Unpin(ctx context.Context, hash api.Cid) error {
}
logger.Info("IPFS Unpin request succeeded:", hash)
stats.Record(ctx, observations.Pins.M(-1))
return nil
}