Merge pull request #1526 from 0chain/fix/getref-timeout

Increase timeout and check eof
0chain · Jun 14, 2024 · 89b23cc · 89b23cc
2 parents 80ec46e + 422337a
commit 89b23cc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/zboxcore/sdk/deleteworker.go b/zboxcore/sdk/deleteworker.go
@@ -3,6 +3,7 @@ package sdk
 import (
  "context"
  "fmt"
+ "io"
  "io/ioutil"
  "net/http"
  "net/url"
@@ -78,6 +79,10 @@ func (req *DeleteRequest) deleteBlobberFile(
  cncl()
 
  if err != nil {
+ if err == io.EOF {
+ shouldContinue = true
+ return
+ }
  logger.Logger.Error(blobber.Baseurl, "Delete: ", err)
  return
  }

diff --git a/zboxcore/sdk/filerefsworker.go b/zboxcore/sdk/filerefsworker.go
@@ -163,7 +163,7 @@ func (o *ObjectTreeRequest) getFileRefs(oTR *oTreeResponse, bUrl string) {
  return
  }
  oResult := ObjectTreeResult{}
- ctx, cncl := context.WithTimeout(o.ctx, time.Second*30)
+ ctx, cncl := context.WithTimeout(o.ctx, 2*time.Minute)
  err = zboxutil.HttpDo(ctx, cncl, oReq, func(resp *http.Response, err error) error {
  if err != nil {
  l.Logger.Error(err)

diff --git a/zboxcore/sdk/multi_operation_worker.go b/zboxcore/sdk/multi_operation_worker.go
@@ -209,9 +209,7 @@ func (mo *MultiOperation) Process() error {
  fmt.Sprintf("Multioperation failed. Required consensus %d got %d. Major error: %s",
  mo.consensusThresh, mo.operationMask.CountOnes(), majorErr.Error()))
  }
- return errors.New("consensus_not_met",
- fmt.Sprintf("Multioperation failed. Required consensus %d got %d",
- mo.consensusThresh, mo.operationMask.CountOnes()))
+ return nil
  }
 
  // Take transpose of mo.change because it will be easier to iterate mo if it contains blobber changes

diff --git a/zboxcore/sdk/renameworker.go b/zboxcore/sdk/renameworker.go
@@ -7,6 +7,7 @@ import (
  "io/ioutil"
  "mime/multipart"
  "net/http"
+ "path/filepath"
  "sync"
  "time"
 
@@ -301,8 +302,6 @@ type RenameOperation struct {
 }
 
 func (ro *RenameOperation) Process(allocObj *Allocation, connectionID string) ([]fileref.RefEntity, zboxutil.Uint128, error) {
-
- l.Logger.Info("Started Rename Process with Connection Id", connectionID)
  // make renameRequest object
  rR := &RenameRequest{
  allocationObj: allocObj,
@@ -319,6 +318,9 @@ func (ro *RenameOperation) Process(allocObj *Allocation, connectionID string) ([
  wg: &sync.WaitGroup{},
  consensus: Consensus{RWMutex: &sync.RWMutex{}},
  }
+ if filepath.Base(ro.remotefilepath) == ro.newName {
+ return nil, ro.renameMask, errors.New("invalid_operation", "Cannot rename to same name")
+ }
  rR.consensus.fullconsensus = ro.consensus.fullconsensus
  rR.consensus.consensusThresh = ro.consensus.consensusThresh