Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 17 additions & 8 deletions code/go/0chain.net/blobber/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,26 @@ func main() {
}

func RegisterBlobber() {
setup := func() {
// badgerdbstore.GetStorageProvider().WriteBytes(ctx, BLOBBER_REGISTERED_LOOKUP_KEY, []byte(txnHash))
// badgerdbstore.GetStorageProvider().Commit(ctx)
SetupWorkers()
go BlobberHealthCheck()
if config.Configuration.PriceInUSD {
go UpdateBlobberSettings()
}
}

registrationRetries := 0
//ctx := badgerdbstore.GetStorageProvider().WithConnection(common.GetRootContext())
// ctx := badgerdbstore.GetStorageProvider().WithConnection(common.GetRootContext())
for registrationRetries < 10 {
txnHash, err := handler.RegisterBlobber(common.GetRootContext())
if err == handler.ErrBlobberHasRegistered {
Logger.Debug("Blobber already registered to the mining network")
setup()
return
}

time.Sleep(transaction.SLEEP_FOR_TXN_CONFIRMATION * time.Second)
txnVerified := false
verifyRetries := 0
Expand All @@ -398,13 +413,7 @@ func RegisterBlobber() {
t, err := transaction.VerifyTransaction(txnHash, chain.GetServerChain())
if err == nil {
Logger.Info("Transaction for adding blobber accepted and verified", zap.String("txn_hash", t.Hash), zap.Any("txn_output", t.TransactionOutput))
//badgerdbstore.GetStorageProvider().WriteBytes(ctx, BLOBBER_REGISTERED_LOOKUP_KEY, []byte(txnHash))
//badgerdbstore.GetStorageProvider().Commit(ctx)
SetupWorkers()
go BlobberHealthCheck()
if config.Configuration.PriceInUSD {
go UpdateBlobberSettings()
}
setup()
return
}
verifyRetries++
Expand Down
11 changes: 7 additions & 4 deletions code/go/0chain.net/blobbercore/handler/protocol.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ func (ar *apiResp) err() error { //nolint:unused,deadcode // might be used later
return nil
}

// ErrBlobberHasRegistered represents double registration check error, where the
// blobber has already registered and shouldn't be passed through the registration flow again.
// To prevent duplicate instances.
var ErrBlobberHasRegistered = errors.New("blobber has registered")

func RegisterBlobber(ctx context.Context) (string, error) {
wcb := &WalletCallback{}
wcb.wg = &sync.WaitGroup{}
Expand All @@ -72,6 +77,7 @@ func RegisterBlobber(ctx context.Context) (string, error) {
if err != nil {
return "", err
}

sn, err := getStorageNode()
if err != nil {
return "", err
Expand All @@ -82,10 +88,7 @@ func RegisterBlobber(ctx context.Context) (string, error) {

for _, sRegisteredNode := range sRegisteredNodes {
if sn.ID == string(sRegisteredNode.ID) || sn.BaseURL == sRegisteredNode.BaseURL {
Logger.Info("Warning: blobber already registered to the mining network. Updating blobber settings.")
// should return valid transcation hash, not an error
// (see: "restarted blobbers" case)
return UpdateBlobberSettings(ctx)
return "", ErrBlobberHasRegistered
}
}

Expand Down