Merge pull request #127 from LiilyZhang/issue3308

Issue 3308 - Bug: AgentAutoUpgrade in middle of MMS object download t…
open-horizon · Jun 16, 2022 · 8a9b681 · 8a9b681
2 parents 17d24c9 + 291de88
commit 8a9b681
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/communications/httpCommunication.go b/core/communications/httpCommunication.go
@@ -919,6 +919,7 @@ func (communication *HTTP) GetDataByChunk(metaData common.MetaData, offset int64
 		return nil
 	}
 
+	// update ESS notification to "getdata"
 	if err := updateGetDataNotification(metaData, metaData.OriginType, metaData.OriginID, offset); err != nil {
 		common.ObjectLocks.Unlock(lockIndex)
 		return err

diff --git a/core/communications/notificationHandler.go b/core/communications/notificationHandler.go
@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
+	"math"
 	"os"
 	"sort"
 	"sync"
@@ -1848,7 +1849,7 @@ func getOffsetsForResendFromScratch(notification common.Notification, metaData c
 		return offsets
 	}
 
-	maxInflightChunks := 1
+	maxInflightChunks := math.MaxInt32
 	if protocol == common.MQTTProtocol {
 		maxInflightChunks = common.Configuration.MaxInflightChunks
 	}
@@ -1861,7 +1862,7 @@ func getOffsetsForResendFromScratch(notification common.Notification, metaData c
 		return offsets
 	}
 
-	if metaData.ChunkSize <= 0 || metaData.ObjectSize <= 0 {
+	if metaData.ChunkSize <= 0 || metaData.ObjectSize <= 0 || !common.Configuration.EnableDataChunk {
 		offsets = append(offsets, 0)
 	} else {
 		var offset int64