Merge pull request #1443 from 0chain/fix/alloc-size

update blobber size and add scheme to validator url if not present

Author: dabasov

code/go/0chain.net/blobbercore/allocation/protocol.go

@@ -77,22 +77,22 @@ func FetchAllocationFromEventsDB(ctx context.Context, allocationID string, alloc
 
 	isExist = a.ID != ""
 
-	if !isExist {
-		foundBlobber := false
-		for _, blobberConnection := range sa.BlobberDetails {
-			if blobberConnection.BlobberID != node.Self.ID {
-				continue
-			}
-			foundBlobber = true
+	foundBlobber := false
+	for _, blobberConnection := range sa.BlobberDetails {
+		if blobberConnection.BlobberID != node.Self.ID {
+			continue
+		}
+		foundBlobber = true
+		a.BlobberSize = int64(math.Ceil(float64(sa.Size) / float64(sa.DataShards)))
+		if !isExist {
 			a.AllocationRoot = ""
-			a.BlobberSize = int64(math.Ceil(float64(sa.Size) / float64(sa.DataShards)))
 			a.BlobberSizeUsed = 0
-			break
-		}
-		if !foundBlobber {
-			return nil, common.NewError("invalid_blobber",
-				"Blobber is not part of the open connection transaction")
 		}
+		break
+	}
+	if !foundBlobber {
+		return nil, common.NewError("invalid_blobber",
+			"Blobber is not part of the open connection transaction")
 	}
 
 	// set/update fields
@@ -151,6 +151,7 @@ func FetchAllocationFromEventsDB(ctx context.Context, allocationID string, alloc
 			"time_unit":        a.TimeUnit,
 			"file_options":     a.FileOptions,
 			"start_time":       a.StartTime,
+			"blobber_size":     a.BlobberSize,
 		}
 
 		updateOption := func(alloc *Allocation) {
@@ -164,6 +165,7 @@ func FetchAllocationFromEventsDB(ctx context.Context, allocationID string, alloc
 			alloc.TimeUnit = a.TimeUnit
 			alloc.FileOptions = a.FileOptions
 			alloc.StartTime = a.StartTime
+			alloc.BlobberSize = a.BlobberSize
 		}
 		err = Repo.UpdateAllocation(ctx, a, updateMap, updateOption)
 	}

code/go/0chain.net/blobbercore/handler/file_command_delete.go

@@ -63,9 +63,11 @@ func (cmd *DeleteFileCommand) IsValidated(ctx context.Context, req *http.Request
 
 // UpdateChange add DeleteFileChange in db
 func (cmd *DeleteFileCommand) UpdateChange(ctx context.Context, connectionObj *allocation.AllocationChangeCollector) error {
-	connectionObj.AddChange(cmd.allocationChange, cmd.changeProcessor)
-
-	return connectionObj.Save(ctx)
+	err := cmd.AddChange(ctx)
+	if err == gorm.ErrDuplicatedKey {
+		return nil
+	}
+	return err
 }
 
 func (cmd *DeleteFileCommand) AddChange(ctx context.Context) error {

code/go/0chain.net/core/util/http.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"io"
 	"net/http"
+	"net/url"
 	"sync"
 	"time"
 
@@ -41,19 +42,26 @@ func SendMultiPostRequest(urls []string, data []byte) {
 	wg.Wait()
 }
 
-func SendPostRequest(url string, data []byte, wg *sync.WaitGroup) (body []byte, err error) {
+func SendPostRequest(postURL string, data []byte, wg *sync.WaitGroup) (body []byte, err error) {
 	if wg != nil {
 		defer wg.Done()
 	}
 	var resp *http.Response
+	u, err := url.Parse(postURL)
+	if err != nil {
+		return nil, err
+	}
+	if u.Scheme == "" {
+		u.Scheme = "https"
+	}
 	for i := 0; i < MAX_RETRIES; i++ {
 		var (
 			req  *http.Request
 			ctx  context.Context
 			cncl context.CancelFunc
 		)
 
-		req, ctx, cncl, err = NewHTTPRequest(http.MethodPost, url, data)
+		req, ctx, cncl, err = NewHTTPRequest(http.MethodPost, u.String(), data)
 		defer cncl()
 
 		resp, err = http.DefaultClient.Do(req.WithContext(ctx))
@@ -71,7 +79,7 @@ func SendPostRequest(url string, data []byte, wg *sync.WaitGroup) (body []byte,
 		time.Sleep(SLEEP_BETWEEN_RETRIES * time.Second)
 	}
 	if resp == nil || err != nil {
-		Logger.Error("Failed after multiple retries", zap.Any("url", url), zap.Int("retried", MAX_RETRIES), zap.Int("post_data_len", len(data)), zap.Error(err))
+		Logger.Error("Failed after multiple retries", zap.Any("url", u.String()), zap.Int("retried", MAX_RETRIES), zap.Int("post_data_len", len(data)), zap.Error(err))
 		return nil, err
 	}
 	if resp.Body == nil {