fix to avoid deletion when token already present in JobStore

cr: https://code.amazon.com/reviews/CR-62891510

agent/task/pool.go

@@ -252,7 +252,8 @@ func (p *pool) AcquireBufferToken(jobId string) PoolErrorCode {
 		// removing expired tokens only when the job queue is full
 		expirationTime := currentTime.Add(time.Duration(-unusedTokenValidityInMinutes) * time.Minute)
 		for tokenId, tokenTime := range p.tokenHoldingJobIds {
-			if tokenTime.Before(expirationTime) {
+			// hasJob condition added to handle long-running commands
+			if tokenTime.Before(expirationTime) && !p.HasJob(tokenId) {
 				p.log.Warnf("removing expired token %v from the TokenBuffer", tokenId)
 				delete(p.tokenHoldingJobIds, tokenId)
 			}

agent/task/pool_test.go

@@ -108,6 +108,24 @@ func TestAcquireToken_ExpiredToken(t *testing.T) {
 	assert.Equal(t, JobQueueFull, errorCode)
 }
 
+// TestAcquireToken_JobAlreadyPresentInJobStore_ShouldNotDeleteToken
+// tests expired token deletion when the job already present in Job Store
+func TestAcquireToken_JobAlreadyPresentInJobStore_ShouldNotDeleteToken(t *testing.T) {
+	// basic pool
+	poolRef := NewPool(logger, 1, 2, 100*time.Millisecond, times.NewMockedClock())
+	poolObj := poolRef.(*pool)
+	expirationTime := time.Now().Add(time.Duration(-unusedTokenValidityInMinutes-2) * time.Minute) // added extra expiry
+	// If buffer full, delete tokens only not in job store
+	// In this case, no deletion happens
+	poolObj.tokenHoldingJobIds["job 1"] = &expirationTime
+	poolObj.jobStore.AddJob("job 1", &JobToken{})
+	poolObj.tokenHoldingJobIds["job 2"] = &expirationTime
+	poolObj.jobStore.AddJob("job 2", &JobToken{})
+
+	errorCode := poolObj.AcquireBufferToken("job 3")
+	assert.Equal(t, JobQueueFull, errorCode)
+}
+
 // TestReleaseAndToken_BasicTest test basic release and acquire tokens operations
 func TestReleaseAndToken_BasicTest(t *testing.T) {
 	workerLimit := 5