Skip to content

Akhilesh/conductor test #1487

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
wants to merge 3 commits into
base: staging
Choose a base branch
from
Open

Akhilesh/conductor test #1487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a3b9c5
updated:
Akhilesh53 Oct 23, 2024
5faa333
updated:
Akhilesh53 Oct 23, 2024
fe3e5b3
Revert "updated:"
Akhilesh53 Oct 23, 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
1 change: 1 addition & 0 deletions code/go/0chain.net/blobbercore/handler/object_operation_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,7 @@ func (fsh *StorageHandler) CommitWrite(ctx context.Context, r *http.Request) (*b

err = checkPendingMarkers(ctx, allocationObj.ID)
if err != nil {
fmt.Println("Error checking pending markers", err)
Logger.Error("Error checking pending markers", zap.Error(err))
return nil, common.NewError("pending_markers", "previous marker is still pending to be redeemed")
}
Expand Down
3 changes: 3 additions & 0 deletions code/go/0chain.net/blobbercore/writemarker/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package writemarker

import (
"context"
"fmt"
"math/rand"
"strings"
"sync"
Expand Down Expand Up @@ -80,7 +81,9 @@ func SaveMarkerData(allocationID string, timestamp common.Timestamp, chainLength
func CheckProcessingMarker(allocationID string) bool {
markerDataMut.Lock()
defer markerDataMut.Unlock()
fmt.Println("CheckProcessingMarker", allocationID)
if data, ok := markerDataMap[allocationID]; ok {
fmt.Println("CheckProcessingMarker: data.processing", data.processing)
return data.processing
}
return false
Expand Down
Loading