follow-up

* reb-marked; prev. commit: baa11bf

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

ais/htcommon.go

@@ -673,7 +673,7 @@ func (t *target) fillNsti(nsti *cos.NodeStateInfo) {
 	marked := xreg.GetRebMarked()
 
 	// (running | interrupted | ok)
-	if xreb := marked.Xact; xreb != nil && !xreb.IsAborted() && !xreb.Finished() {
+	if xreb := marked.Xact; xreb != nil {
 		nsti.Flags = nsti.Flags.Set(cos.Rebalancing)
 	} else if marked.Interrupted {
 		nsti.Flags = nsti.Flags.Set(cos.RebalanceInterrupted)

reb/status.go

@@ -24,7 +24,7 @@ func (reb *Reb) RebStatus(status *Status) {
 		marked = xreg.GetRebMarked()
 	)
 	status.Aborted = marked.Interrupted
-	status.Running = marked.Xact != nil && marked.Xact.Running()
+	status.Running = marked.Xact != nil
 
 	// rlock
 	reb.mu.Lock()

xact/xreg/marker.go

@@ -1,6 +1,6 @@
 // Package xreg provides registry and (renew, find) functions for AIS eXtended Actions (xactions).
 /*
- * Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2018-2024, NVIDIA CORPORATION. All rights reserved.
  */
 package xreg
 
@@ -15,23 +15,24 @@ func GetRebMarked() (out xact.Marked) {
 	dreg.entries.mtx.RLock()
 	entry := dreg.entries.findRunningKind(apc.ActRebalance)
 	dreg.entries.mtx.RUnlock()
-	if entry != nil {
-		out.Xact = entry.Get()
-	} else {
+
+	if entry == nil {
 		out.Interrupted = fs.MarkerExists(fname.RebalanceMarker)
 		out.Restarted = fs.MarkerExists(fname.NodeRestartedPrev)
+	} else if xreb := entry.Get(); xreb != nil && xreb.Running() {
+		out.Xact = xreb
 	}
-	return
+	return out
 }
 
 func GetResilverMarked() (out xact.Marked) {
 	dreg.entries.mtx.RLock()
 	entry := dreg.entries.findRunningKind(apc.ActResilver)
 	dreg.entries.mtx.RUnlock()
-	if entry != nil {
-		out.Xact = entry.Get()
-	} else {
+	if entry == nil {
 		out.Interrupted = fs.MarkerExists(fname.ResilverMarker)
+	} else if xres := entry.Get(); xres != nil && xres.Running() {
+		out.Xact = xres
 	}
-	return
+	return out
 }