Skip to content

Reset blobber stats #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jayashsatolia403 wants to merge 4 commits into
base: sprint-1.15
Choose a base branch
from
Open

Reset blobber stats #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec7dcc3
Reset blobber stats
May 28, 2024
9ddb1aa
Fix
May 28, 2024
e0aaa92
Fix
May 28, 2024
92111ee
Fix
May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 26 additions & 41 deletions cmd/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cmd

import (
"fmt"
"github.com/0chain/common/core/currency"
"log"
"time"

Expand Down Expand Up @@ -290,21 +291,19 @@ var blobberUpdateCmd = &cobra.Command{
}

var resetBlobberStatsCmd = &cobra.Command{
Use: "reset-blobber-stats",
Short: "Reset blobber stats",
Long: `Reset blobber stats`,
Args: cobra.MinimumNArgs(0),
Use: "reset-blobber-stats",
Short: "Reset blobber stats",
Long: `Reset blobber stats`,
Args: cobra.MinimumNArgs(0),
Hidden: true,
Run: func(cmd *cobra.Command, args []string) {
var (
flags = cmd.Flags()

blobberID string
prevAllocated int64
prevSavedData int64
newAllocated int64
newSavedData int64
err error
blobberID string
prevTotalOffers currency.Coin
newTotalOffers currency.Coin
err error
)

if !flags.Changed("blobber_id") {
Expand All @@ -314,40 +313,28 @@ var resetBlobberStatsCmd = &cobra.Command{
log.Fatal("error in 'blobber_id' flag: ", err)
}

if !flags.Changed("prev_allocated") {
log.Fatal("missing required 'prev_allocated' flag")
}
if prevAllocated, err = flags.GetInt64("prev_allocated"); err != nil {
log.Fatal("error in 'prev_allocated' flag: ", err)
}

if !flags.Changed("prev_saved_data") {
log.Fatal("missing required 'prev_saved_data' flag")
}
if prevSavedData, err = flags.GetInt64("prev_saved_data"); err != nil {
log.Fatal("error in 'prev_saved_data' flag: ", err)
}

if !flags.Changed("new_allocated") {
log.Fatal("missing required 'new_allocated' flag")
if !flags.Changed("prev_total_offers") {
log.Fatal("missing required 'prev_total_offers' flag")
}
if newAllocated, err = flags.GetInt64("new_allocated"); err != nil {
log.Fatal("error in 'new_allocated' flag: ", err)
var prevTotalOffersInt int64
if prevTotalOffersInt, err = flags.GetInt64("prev_total_offers"); err != nil {
log.Fatal("error in 'prev_total_offers' flag: ", err)
}
prevTotalOffers = currency.Coin(prevTotalOffersInt)

if !flags.Changed("new_saved_data") {
log.Fatal("missing required 'new_saved_data' flag")
var newTotalOffersInt int64
if !flags.Changed("new_total_offers") {
log.Fatal("missing required 'new_total_offers' flag")
}
if newSavedData, err = flags.GetInt64("new_saved_data"); err != nil {
log.Fatal("error in 'new_saved_data' flag: ", err)
if newTotalOffersInt, err = flags.GetInt64("new_total_offers"); err != nil {
log.Fatal("error in 'new_total_offers' flag: ", err)
}
newTotalOffers = currency.Coin(newTotalOffersInt)

resetBlobberStatsDto := &sdk.ResetBlobberStatsDto{
BlobberID: blobberID,
PrevAllocated: prevAllocated,
PrevSavedData: prevSavedData,
NewAllocated: newAllocated,
NewSavedData: newSavedData,
BlobberID: blobberID,
PrevTotalOffers: prevTotalOffers,
NewTotalOffers: newTotalOffers,
}
fmt.Println(*resetBlobberStatsDto)

Expand Down Expand Up @@ -396,9 +383,7 @@ func init() {
resetBlobberStatsCmd.Flags().Int64("prev_saved_data", 0, "prev_saved_data is required")
resetBlobberStatsCmd.Flags().Int64("new_allocated", 0, "new_allocated is required")
resetBlobberStatsCmd.Flags().Int64("new_saved_data", 0, "new_saved_data is required")
resetBlobberStatsCmd.Flags().Int64("prev_total_offers", 0, "prev_total_offers is required")
resetBlobberStatsCmd.Flags().Int64("new_total_offers", 0, "new_total_offers is required")
resetBlobberStatsCmd.MarkFlagRequired("blobber_id")
resetBlobberStatsCmd.MarkFlagRequired("prev_allocated")
resetBlobberStatsCmd.MarkFlagRequired("prev_saved_data")
resetBlobberStatsCmd.MarkFlagRequired("new_allocated")
resetBlobberStatsCmd.MarkFlagRequired("new_saved_data")
}
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ module github.com/0chain/zboxcli
go 1.21

require (
github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565
github.com/0chain/errors v1.0.3
github.com/0chain/gosdk v1.14.0
github.com/0chain/gosdk v1.14.11-0.20240530195547-900bbc4132ce
github.com/icza/bitio v1.1.0
github.com/olekukonko/tablewriter v0.0.5
github.com/spf13/cobra v1.6.0
Expand All @@ -13,7 +14,6 @@ require (
)

require (
github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 // indirect
github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/btcsuite/btcd v0.23.4 // indirect
Expand All @@ -33,7 +33,7 @@ require (
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/herumi/bls-go-binary v1.31.0 // indirect
github.com/hitenjain14/fasthttp v0.0.0-20240229173600-722723e15e17 // indirect
github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 h1:z+DtCR8mBsjPnEs
github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565/go.mod h1:UyDC8Qyl5z9lGkCnf9RHJPMektnFX8XtCJZHXCCVj8E=
github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
github.com/0chain/gosdk v1.14.0 h1:jmvfnPphIXQo8YQcRvEEvN7S+mBZQSURmmI7FsmL2YA=
github.com/0chain/gosdk v1.14.0/go.mod h1:tgAiVAuIy+Vs1tGfKCPEuuWWARwNQBEw32y950LrqrU=
github.com/0chain/gosdk v1.14.11-0.20240530195547-900bbc4132ce h1:Tm4Zq+FJuwP5uS96xrswzktW0u73oSJoeTeKGDV4mWo=
github.com/0chain/gosdk v1.14.11-0.20240530195547-900bbc4132ce/go.mod h1:Hzl56JJ66ZmoyNS7CbTJue7wUugBYvNx8/qJzTRWmkI=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/Luzifer/go-openssl/v3 v3.1.0 h1:QqKqo6kYXGGUsvtUoCpRZm8lHw+jDfhbzr36gVj+/gw=
Expand Down Expand Up @@ -215,8 +215,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/herumi/bls-go-binary v1.31.0 h1:L1goQ2tMtGgpXCg5AwHAdJQpLs/pfnWWEc3Wog6OhmI=
github.com/herumi/bls-go-binary v1.31.0/go.mod h1:O4Vp1AfR4raRGwFeQpr9X/PQtncEicMoOe6BQt1oX0Y=
github.com/hitenjain14/fasthttp v0.0.0-20240229173600-722723e15e17 h1:FbyIK0BfvXVZTOxKOe2dlxJqSPSF2ZXOv2Mc7dvS7sc=
github.com/hitenjain14/fasthttp v0.0.0-20240229173600-722723e15e17/go.mod h1:RZMcXy7u4S+E97IXYTe7WHZ3+mCYOh4vys8PkIGZeXk=
github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9 h1:Z6Mu2JCsW2hbqx91L0HNPRPQ10RyAFvPocQHlrRo1Jk=
github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9/go.mod h1:RZMcXy7u4S+E97IXYTe7WHZ3+mCYOh4vys8PkIGZeXk=
github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c h1:DZfsyhDK1hnSS5lH8l+JggqzEleHteTYfutAiVlSUM8=
Expand Down