tests: a job we try to abort may have already finished

Signed-off-by: Alex Aizman <[email protected]>

ais/prxlso.go

@@ -287,7 +287,7 @@ func (b *lsobjBuffers) housekeep(now int64) (num int) {
 	b.buffers.Range(func(key, value any) bool {
 		buffer := value.(*lsobjBuffer)
 		num++
-		// mono.Since(buffer.lastAccess.Load()) > lsobjBufferTTL
+		// mono.Since(lastAccess)
 		if now-buffer.lastAccess.Load() > int64(lsobjBufferTTL) {
 			b.buffers.Delete(key)
 		}
@@ -518,7 +518,7 @@ func (c *lsobjCaches) housekeep(now int64) (num int) {
 		cache.mtx.Lock()
 		for _, interval := range cache.intervals {
 			num++
-			// mono.Since(interval.lastAccess) > cacheIntervalTTL
+			// mono.Since(lastAccess)
 			if now-interval.lastAccess > int64(cacheIntervalTTL) {
 				toRemove = append(toRemove, interval)
 			}

ais/test/bucket_test.go

@@ -2792,13 +2792,36 @@ func testCopyBucketAbort(t *testing.T, srcBck cmn.Bck, m *ioContext, sleep time.
 	time.Sleep(time.Second)
 	snaps, err := api.QueryXactionSnaps(baseParams, &xact.ArgsMsg{ID: xid})
 	tassert.CheckError(t, err)
-	aborted, err := snaps.IsAborted(xid)
+	aborted, finished := _isAbortedOrFinished(xid, snaps)
 	tassert.CheckError(t, err)
-	tassert.Errorf(t, aborted, "failed to abort copy-bucket: %q, %v", xid, err)
+	tassert.Errorf(t, aborted || finished, "expecting copy-bucket %q to abort or finish", xid)
+
+	if finished {
+		tlog.Logf("%s[%s] already finished\n", apc.ActCopyBck, xid)
+	}
 
 	bcks, err := api.ListBuckets(baseParams, cmn.QueryBcks(dstBck), apc.FltExists)
 	tassert.CheckError(t, err)
-	tassert.Errorf(t, !tools.BucketsContain(bcks, cmn.QueryBcks(dstBck)), "should not contain destination bucket %s", dstBck)
+	if aborted {
+		tassert.Errorf(t, !tools.BucketsContain(bcks, cmn.QueryBcks(dstBck)),
+			"when aborted, should not contain destination bucket %s", dstBck)
+	}
+}
+
+func _isAbortedOrFinished(xid string, xs xact.MultiSnap) (aborted, finished bool) {
+	for _, snaps := range xs {
+		for _, xsnap := range snaps {
+			if xid == xsnap.ID {
+				if xsnap.IsAborted() {
+					return true, false
+				}
+				if !xsnap.Finished() {
+					return false, false
+				}
+			}
+		}
+	}
+	return false, true
 }
 
 func testCopyBucketDryRun(t *testing.T, srcBck cmn.Bck, m *ioContext) {

xact/api.go

@@ -452,20 +452,6 @@ func (xs MultiSnap) RunningTarget(xid string) (string /*tid*/, *core.Snap, error
 	return "", nil, nil
 }
 
-func (xs MultiSnap) IsAborted(xid string) (bool, error) {
-	if err := xs.checkEmptyID(xid); err != nil {
-		return false, err
-	}
-	for _, snaps := range xs {
-		for _, xsnap := range snaps {
-			if (xid == xsnap.ID || xid == "") && xsnap.IsAborted() {
-				return true, nil
-			}
-		}
-	}
-	return false, nil
-}
-
 // (all targets, all xactions)
 func (xs MultiSnap) IsIdle(xid string) (aborted, running, notstarted bool) {
 	if xid != "" {