Skip to content
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

fix(challenge): improved logging #769

Merged
merged 5 commits into from
Jul 31, 2022
Merged

fix(challenge): improved logging #769

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5837c9
fix(challenge): improved logging
cnlangzi Jul 29, 2022
ff9216a
fix(challenge): added created on logging for debugging
cnlangzi Jul 29, 2022
e936cf7
fix(challenge): improved logging for debugging
cnlangzi Jul 29, 2022
a987c7c
Merge branch 'staging' into fix/improve_logging_challenge
cnlangzi Jul 29, 2022
d99a72e
fix(challenge): update closure in loop
cnlangzi Jul 30, 2022
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
120 changes: 80 additions & 40 deletions code/go/0chain.net/blobbercore/challenge/challenge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,42 +63,48 @@ func syncOpenChallenges(ctx context.Context) {

}

func saveNewChallenge(nextChallenge *ChallengeEntity, ctx context.Context) {
func saveNewChallenge(c *ChallengeEntity, ctx context.Context) {
defer func() {
if r := recover(); r != nil {
logging.Logger.Error("[recover]challenge", zap.Any("err", r))
logging.Logger.Error("[recover]add_challenge", zap.Any("err", r))
}
}()

db := datastore.GetStore().GetDB()
if Exists(db, nextChallenge.ChallengeID) {
if Exists(db, c.ChallengeID) {
return
}

lastChallengeID, err := getLastChallengeID(db)

if err != nil {
logging.Logger.Error("[challenge]db: ", zap.Error(err))
logging.Logger.Error("[challenge]add(get_latest_challenge_id): ", zap.Error(err))
return
}

isValid := nextChallenge.PrevChallengeID == "" || lastChallengeID == nextChallenge.PrevChallengeID
isValid := c.PrevChallengeID == "" || lastChallengeID == c.PrevChallengeID

// it is not First and Next challenge
if !isValid {
logging.Logger.Error("[challenge]Challenge chain is not valid")
return
}

logging.Logger.Info("[challenge]add: ", zap.String("challenge_id", nextChallenge.ChallengeID))
nextChallenge.Status = Accepted
nextChallenge.CreatedAt = common.ToTime(nextChallenge.Created)
nextChallenge.UpdatedAt = nextChallenge.CreatedAt
c.Status = Accepted
c.CreatedAt = common.ToTime(c.Created)
c.UpdatedAt = c.CreatedAt

logging.Logger.Info("[challenge]add: ",
zap.String("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt))

if err := db.Transaction(func(tx *gorm.DB) error {
return nextChallenge.SaveWith(tx)
return c.SaveWith(tx)
}); err != nil {
logging.Logger.Error("[challenge]db: ", zap.String("challenge_id", nextChallenge.ChallengeID), zap.Error(err))
logging.Logger.Error("[challenge]add: ",
zap.String("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt),
zap.Error(err))
}

}
Expand All @@ -112,42 +118,61 @@ func processAccepted(ctx context.Context) {
}()

db := datastore.GetStore().GetDB()
openchallenges := make([]*ChallengeEntity, 0)
db.Where(ChallengeEntity{Status: Accepted}).Find(&openchallenges)
if len(openchallenges) > 0 {
challenges := make([]*ChallengeEntity, 0)
db.Where(ChallengeEntity{Status: Accepted}).Find(&challenges)
if len(challenges) > 0 {
swg := sizedwaitgroup.New(config.Configuration.ChallengeResolveNumWorkers)
for _, openchallenge := range openchallenges {
logging.Logger.Info("[challenge]process: ", zap.String("challenge_id", openchallenge.ChallengeID))
err := openchallenge.UnmarshalFields()
for _, c := range challenges {
logging.Logger.Info("[challenge]process: ",
zap.String("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt))
err := c.UnmarshalFields()
if err != nil {
logging.Logger.Error("[challenge]json: ", zap.Error(err))
logging.Logger.Error("[challenge]process: ",
zap.String("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt),
zap.String("validators", string(c.ValidatorsString)),
zap.String("lastCommitTxnList", string(c.LastCommitTxnList)),
zap.String("validationTickets", string(c.ValidationTicketsString)),
zap.String("ObjectPath", string(c.ObjectPathString)),
zap.Error(err))
continue
}
swg.Add()
go validateChallenge(&swg, openchallenge)
go validateChallenge(&swg, c)
}
swg.Wait()
}
}

func validateChallenge(swg *sizedwaitgroup.SizedWaitGroup, challengeObj *ChallengeEntity) {
func validateChallenge(swg *sizedwaitgroup.SizedWaitGroup, c *ChallengeEntity) {
defer swg.Done()

ctx := datastore.GetStore().CreateTransaction(context.TODO())
defer ctx.Done()

db := datastore.GetStore().GetTransaction(ctx)
if err := challengeObj.LoadValidationTickets(ctx); err != nil {
logging.Logger.Error("[challenge]validate: ", zap.Any("challenge_id", challengeObj.ChallengeID), zap.Error(err))
if err := c.LoadValidationTickets(ctx); err != nil {
logging.Logger.Error("[challenge]validate: ",
zap.Any("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt),
zap.Error(err))
db.Rollback()
return
}

if err := db.Commit().Error; err != nil {
logging.Logger.Error("[challenge]db: ", zap.Any("challenge_id", challengeObj.ChallengeID), zap.Error(err))
logging.Logger.Error("[challenge]validate(Commit): ",
zap.Any("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt),
zap.Error(err))
db.Rollback()
return
}

logging.Logger.Info("[challenge]validate: ",
zap.Any("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt))
}

func commitProcessed(ctx context.Context) {
Expand All @@ -166,8 +191,8 @@ func commitProcessed(ctx context.Context) {

if len(challenges) > 0 {
swg := sizedwaitgroup.New(config.Configuration.ChallengeResolveNumWorkers)
for _, challenge := range challenges {
c := challenge
for _, c := range challenges {
c := c
swg.Add()
go func() {
defer swg.Done()
Expand All @@ -178,34 +203,49 @@ func commitProcessed(ctx context.Context) {
}
}

func commitChallenge(openchallenge *ChallengeEntity) {
logging.Logger.Info("Attempting to commit challenge", zap.Any("challenge_id", openchallenge.ChallengeID), zap.Any("openchallenge", openchallenge))
if err := openchallenge.UnmarshalFields(); err != nil {
logging.Logger.Error("ChallengeEntity_UnmarshalFields", zap.String("challenge_id", openchallenge.ChallengeID), zap.Error(err))
func commitChallenge(c *ChallengeEntity) {
logging.Logger.Info("[challenge]commit",
zap.Any("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt),
zap.Any("openchallenge", c))
if err := c.UnmarshalFields(); err != nil {
logging.Logger.Error("[challenge]commit",
zap.String("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt),
zap.String("validators", string(c.ValidatorsString)),
zap.String("lastCommitTxnList", string(c.LastCommitTxnList)),
zap.String("validationTickets", string(c.ValidationTicketsString)),
zap.String("ObjectPath", string(c.ObjectPathString)),
zap.Error(err))
}

ctx := datastore.GetStore().CreateTransaction(context.TODO())
defer ctx.Done()

db := datastore.GetStore().GetTransaction(ctx)

if err := openchallenge.CommitChallenge(ctx, false); err != nil {
logging.Logger.Error("Error committing to blockchain",
zap.Error(err),
zap.String("challenge_id", openchallenge.ChallengeID))
if err := c.CommitChallenge(ctx, false); err != nil {
logging.Logger.Error("[challenge]commit",
zap.String("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt),
zap.Error(err))
db.Rollback()
return
}

if err := db.Commit(); err != nil {
logging.Logger.Info("Challenge was not committed", zap.Any("challenge_id", openchallenge.ChallengeID))
if err := db.Commit().Error; err != nil {
logging.Logger.Warn("[challenge]commit",
zap.Any("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt),
zap.Error(err))
db.Rollback()
return
}

if openchallenge.Status == Committed {
logging.Logger.Info("Challenge has been submitted to blockchain",
zap.Any("id", openchallenge.ChallengeID),
zap.String("txn", openchallenge.CommitTxnID))
}
logging.Logger.Info("[challenge]commit",
zap.Any("challenge_id", c.ChallengeID),
zap.Time("created", c.CreatedAt),
zap.String("status", c.Status.String()),
zap.String("txn", c.CommitTxnID))

}
13 changes: 13 additions & 0 deletions code/go/0chain.net/blobbercore/challenge/entity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@ const (
Committed
)

func (s ChallengeStatus) String() string {
switch s {
case Accepted:
return "Accepted"
case Processed:
return "Processed"
case Committed:
return "Committed"
default:
return fmt.Sprintf("%d", int(s))
}
}

const (
ChallengeUnknown ChallengeResult = iota
ChallengeSuccess
Expand Down