Merge pull request #1765 from 0chain/fix/http-client

Fix http client

Author: dabasov

zboxcore/sdk/commitworker.go

@@ -460,13 +460,15 @@ func (commitReq *CommitRequestV2) processCommit() {
 		} else if resp.err != errAlreadySuccessful {
 			commitReq.commitMask = commitReq.commitMask.And(zboxutil.NewUint128(1).Lsh(resp.pos).Not())
 			if commitReq.commitMask.CountOnes() < commitReq.consensusThresh {
+				commitReq.commitMask = zboxutil.NewUint128(0)
 				commitReq.result = ErrorCommitResult("Failed to get reference path " + resp.err.Error())
 				return
 			}
 		}
 	}
 
 	if trie == nil {
+		commitReq.commitMask = zboxutil.NewUint128(0)
 		commitReq.result = ErrorCommitResult("Failed to get reference path")
 		return
 	}

zboxcore/sdk/downloadworker.go

@@ -626,6 +626,7 @@ func (req *DownloadRequest) processDownload() {
 
 					totalWritten, err := writeData(req.fileHandler, data, req.datashards, int(remainingSize))
 					if err != nil {
+						l.Logger.Error("Write failed: ", err, " path: ", req.remotefilepath)
 						req.errorCB(errors.Wrap(err, "Write file failed"), remotePathCB)
 						return
 					}

zboxcore/sdk/multi_operation_worker.go

@@ -413,14 +413,18 @@ func (mo *MultiOperation) commitV2() error {
 		} else {
 			changes = mo.changesV2
 		}
+		threshold := mo.consensusThresh
+		if mask.CountOnes() < mo.consensusThresh {
+			threshold = mask.CountOnes()
+		}
 		commitReq := &CommitRequestV2{
 			allocationObj:   mo.allocationObj,
 			connectionID:    mo.connectionID,
 			sig:             mo.allocationObj.sig,
 			wg:              wg,
 			timestamp:       timestamp,
 			commitMask:      mask,
-			consensusThresh: mo.consensusThresh,
+			consensusThresh: threshold,
 			changes:         changes,
 			isRepair:        mo.isRepair,
 		}

zboxcore/zboxutil/download_buffer.go

@@ -57,6 +57,10 @@ func (r *DownloadBufferWithChan) RequestChunk(ctx context.Context, num int) []by
 		return nil
 	case ind := <-r.ch:
 		r.mu.Lock()
+		if r.mp == nil {
+			r.mu.Unlock()
+			return nil
+		}
 		r.mp[num] = ind
 		r.mu.Unlock()
 		return r.buf[ind*r.reqSize : (ind+1)*r.reqSize : (ind+1)*r.reqSize]

zboxcore/zboxutil/http.go

@@ -3,6 +3,7 @@ package zboxutil
 import (
 	"bytes"
 	"context"
+	"crypto/tls"
 	"encoding/json"
 	"io"
 	"net"
@@ -150,7 +151,22 @@ var envProxy proxyFromEnv
 
 func init() {
 	Client = &http.Client{
-		Transport: http.DefaultTransport,
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify:     false,
+				MinVersion:             tls.VersionTLS12,
+				SessionTicketsDisabled: false, // Enable TLS session reuse
+			},
+			DialContext: (&net.Dialer{
+				Timeout:   30 * time.Second,
+				KeepAlive: 45 * time.Second,
+			}).DialContext,
+			MaxIdleConns:        500,
+			MaxIdleConnsPerHost: 100,
+			IdleConnTimeout:     45 * time.Second,
+			DisableKeepAlives:   false,
+			ForceAttemptHTTP2:   true,
+		},
 	}
 
 	FastHttpClient = &fasthttp.Client{