JFMIG-29 - Fix #Artifacts are intermittently being overridden during transfer resulting in artifacts being moved to trashcan (#1518)

Author: amithins

artifactory/commands/transferfiles/state/statemanager_test.go

@@ -35,6 +35,24 @@ func TestFilesDiffRange(t *testing.T) {
 	_ = addAndAssertNewDiffPhase(t, stateManager, 3, diffStart)
 }
 
+func TestPhase2CompletedPersistedAfterSaveStateAndSnapshots(t *testing.T) {
+	stateManager, cleanUp := InitStateTest(t)
+	defer cleanUp()
+
+	assert.NoError(t, stateManager.SetRepoState(repo1Key, 0, 0, false, true))
+	assert.NoError(t, stateManager.SetRepoFullTransferStarted(time.Now()))
+	diffStart := time.Now()
+	assert.NoError(t, stateManager.AddNewDiffToState(diffStart))
+	setAndAssertFilesDiffCompleted(t, stateManager, 1)
+	assert.NoError(t, stateManager.SaveStateAndSnapshots())
+
+	loaded, exists, err := LoadTransferState(repo1Key, false)
+	assert.NoError(t, err)
+	assert.True(t, exists)
+	assert.Len(t, loaded.CurrentRepo.Diffs, 1)
+	assert.True(t, loaded.CurrentRepo.Diffs[0].Completed, "Phase 2 completed=true must be persisted to disk after SaveStateAndSnapshots")
+}
+
 func assertRepoTransferred(t *testing.T, stateManager *TransferStateManager, expected bool) {
 	transferred, err := stateManager.IsRepoTransferred()
 	assert.NoError(t, err)

artifactory/commands/transferfiles/transfer.go

@@ -520,7 +520,19 @@ func (tdc *TransferFilesCommand) startPhase(newPhase *transferPhase, repo string
 		return err
 	}
 	printPhaseChange("Done running '" + (*newPhase).getPhaseName() + "' for repo '" + repo + "'.")
-	return (*newPhase).phaseDone()
+	err = (*newPhase).phaseDone()
+	if err != nil {
+		return err
+	}
+	// Persist state after each phase so Phase 2 completed=true and HandledRange are not lost
+	// when the next repo's SetRepoState replaces in-memory state before the throttle persists.
+	if tdc.stateManager.CurrentRepo.Name != "" {
+		if saveErr := tdc.stateManager.SaveStateAndSnapshots(); saveErr != nil {
+			log.Error("Couldn't save transfer state", saveErr)
+			return saveErr
+		}
+	}
+	return nil
 }
 
 // Handle interrupted signal.