chore: refine some code

.github/workflows/e2e-test.yml

@@ -50,15 +50,15 @@ jobs:
       - name: Build and Start Greenfield Blockchain
         run: |
           bash ./test/e2e/spworkflow/e2e_test.sh --startChain
-#     # Build and Start Greenfield SP
+      # Build and Start Greenfield SP
       - name: Build and Start Greenfield SP
         run: |
           bash ./test/e2e/spworkflow/e2e_test.sh --startSP
       # Build Greenfield Cmd
       - name: Build Greenfield Cmd
         run: |
           bash ./test/e2e/spworkflow/e2e_test.sh --buildCmd
-#     # Use Greenfield Cmd Running SP E2E Test
+      # Use Greenfield Cmd Running SP E2E Test
       - name: Run Greenfield SP E2E Test
         run: |
           bash ./test/e2e/spworkflow/e2e_test.sh --runTest

Makefile

@@ -50,6 +50,7 @@ lint:
 mock-gen:
 	mockgen -source=core/spdb/spdb.go -destination=core/spdb/spdb_mock.go -package=spdb
 	mockgen -source=store/bsdb/database.go -destination=store/bsdb/database_mock.go -package=bsdb
+	mockgen -source=core/task/task.go -destination=core/task/task_mock.go -package=task
 
 # only run unit tests, exclude e2e tests
 test:

base/gfspconfig/config.go

@@ -276,6 +276,11 @@ type ManagerConfig struct {
 	SubscribeBucketMigrateEventIntervalMillisecond uint     `comment:"optional"`
 	GVGPreferSPList                                []uint32 `comment:"optional"`
 	SPBlackList                                    []uint32 `comment:"optional"`
-	EnableTaskRetryScheduler                       bool     `comment:"optional"`
-	RejectUnsealThresholdSecond                    uint64   `comment:"optional"`
+
+	// EnableTaskRetryScheduler is used to enable task retry scheduler.
+	EnableTaskRetryScheduler bool `comment:"optional"`
+	// RejectUnsealThresholdSecond is as the following meanings:
+	// retry replicate and seal task if the task's create timestamp + RejectUnsealThresholdSecond > now.time()
+	// retry reject unseal if the task's create timestamp + RejectUnsealThresholdSecond < now.time() && timestamp + 2*RejectUnsealThresholdSecond > now.time()
+	RejectUnsealThresholdSecond uint64 `comment:"optional"`
 }

base/types/gfsptask/approval.go

@@ -88,7 +88,7 @@ func (m *GfSpCreateBucketApprovalTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpCreateBucketApprovalTask) SetRetry(retry int) {
+func (m *GfSpCreateBucketApprovalTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -230,7 +230,7 @@ func (m *GfSpMigrateBucketApprovalTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpMigrateBucketApprovalTask) SetRetry(retry int) {
+func (m *GfSpMigrateBucketApprovalTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -378,7 +378,7 @@ func (m *GfSpCreateObjectApprovalTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpCreateObjectApprovalTask) SetRetry(retry int) {
+func (m *GfSpCreateObjectApprovalTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -536,7 +536,7 @@ func (m *GfSpReplicatePieceApprovalTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpReplicatePieceApprovalTask) SetRetry(retry int) {
+func (m *GfSpReplicatePieceApprovalTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 

base/types/gfsptask/download.go

@@ -94,7 +94,7 @@ func (m *GfSpDownloadObjectTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpDownloadObjectTask) SetRetry(retry int) {
+func (m *GfSpDownloadObjectTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -259,7 +259,7 @@ func (m *GfSpDownloadPieceTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpDownloadPieceTask) SetRetry(retry int) {
+func (m *GfSpDownloadPieceTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -419,7 +419,7 @@ func (m *GfSpChallengePieceTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpChallengePieceTask) SetRetry(retry int) {
+func (m *GfSpChallengePieceTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 

base/types/gfsptask/gc.go

@@ -86,7 +86,7 @@ func (m *GfSpGCObjectTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpGCObjectTask) SetRetry(retry int) {
+func (m *GfSpGCObjectTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -240,7 +240,7 @@ func (m *GfSpGCZombiePieceTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpGCZombiePieceTask) SetRetry(retry int) {
+func (m *GfSpGCZombiePieceTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -375,7 +375,7 @@ func (m *GfSpGCMetaTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpGCMetaTask) SetRetry(retry int) {
+func (m *GfSpGCMetaTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 

base/types/gfsptask/migrate_gvg.go

@@ -89,7 +89,7 @@ func (m *GfSpMigrateGVGTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpMigrateGVGTask) SetRetry(retry int) {
+func (m *GfSpMigrateGVGTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -306,7 +306,7 @@ func (m *GfSpGCBucketMigrationTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpGCBucketMigrationTask) SetRetry(retry int) {
+func (m *GfSpGCBucketMigrationTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 

base/types/gfsptask/recovery.go

@@ -93,7 +93,7 @@ func (m *GfSpRecoverPieceTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpRecoverPieceTask) SetRetry(retry int) {
+func (m *GfSpRecoverPieceTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 

base/types/gfsptask/task.go

@@ -51,8 +51,8 @@ func (m *GfSpTask) IncRetry() {
 	m.Retry++
 }
 
-func (m *GfSpTask) SetRetry(retry int) {
-	m.Retry = int64(retry)
+func (m *GfSpTask) SetRetry(retry int64) {
+	m.Retry = retry
 }
 
 func (m *GfSpTask) ExceedRetry() bool {

base/types/gfsptask/upload.go

@@ -93,7 +93,7 @@ func (m *GfSpUploadObjectTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpUploadObjectTask) SetRetry(retry int) {
+func (m *GfSpUploadObjectTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -255,7 +255,7 @@ func (m *GfSpResumableUploadObjectTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpResumableUploadObjectTask) SetRetry(retry int) {
+func (m *GfSpResumableUploadObjectTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -405,7 +405,7 @@ func (m *GfSpReplicatePieceTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpReplicatePieceTask) SetRetry(retry int) {
+func (m *GfSpReplicatePieceTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -590,7 +590,7 @@ func (m *GfSpSealObjectTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpSealObjectTask) SetRetry(retry int) {
+func (m *GfSpSealObjectTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 
@@ -760,7 +760,7 @@ func (m *GfSpReceivePieceTask) IncRetry() {
 	m.GetTask().IncRetry()
 }
 
-func (m *GfSpReceivePieceTask) SetRetry(retry int) {
+func (m *GfSpReceivePieceTask) SetRetry(retry int64) {
 	m.GetTask().SetRetry(retry)
 }
 

core/spdb/entity.go

@@ -19,13 +19,13 @@ const (
 
 // UploadObjectMeta defines the upload object state and related seal info, etc.
 type UploadObjectMeta struct {
-	ObjectID             uint64
-	TaskState            storetypes.TaskState
-	GlobalVirtualGroupID uint32
-	SecondaryEndpoints   []string
-	SecondarySignatures  [][]byte
-	ErrorDescription     string
-	UpdateTimeStamp      int64
+	ObjectID              uint64
+	TaskState             storetypes.TaskState
+	GlobalVirtualGroupID  uint32
+	SecondaryEndpoints    []string
+	SecondarySignatures   [][]byte
+	ErrorDescription      string
+	CreateTimeStampSecond int64
 }
 
 // GCObjectMeta defines the gc object range progress info.

core/spdb/spdb.go

@@ -43,9 +43,9 @@ type UploadObjectProgressDB interface {
 	// GetUploadMetasToSealByStartTS queries the replicate_done/seal_doing object to continue seal.
 	// It is used in task retry scheduler.
 	GetUploadMetasToSealByStartTS(limit int, startTimeStamp int64) ([]*UploadObjectMeta, error)
-	// GetUploadMetasToRejectByRangeTS queries the upload_done/replicate_doing object to reject.
+	// GetUploadMetasToRejectUnsealByRangeTS queries the upload_done/replicate_doing object to reject.
 	// It is used in task retry scheduler.
-	GetUploadMetasToRejectByRangeTS(limit int, startTimeStamp int64, endTimeStamp int64) ([]*UploadObjectMeta, error)
+	GetUploadMetasToRejectUnsealByRangeTS(limit int, startTimeStamp int64, endTimeStamp int64) ([]*UploadObjectMeta, error)
 	// InsertPutEvent inserts a new upload event progress.
 	InsertPutEvent(task coretask.Task) error
 }