DAOS-16312 control: Always use --force for dmg system stop

Allow-unstable-test: true Features: control Signed-off-by: Tom Nabarro <[email protected]>
daos-stack · Jan 28, 2025 · 28ddd5c · 28ddd5c
1 parent 6a1c698
commit 28ddd5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/control/lib/control/system.go b/src/control/lib/control/system.go
@@ -474,7 +474,8 @@ func SystemStop(ctx context.Context, rpcClient UnaryInvoker, req *SystemStopReq)
 		Hosts: req.Hosts.String(),
 		Ranks: req.Ranks.String(),
 		Sys:   req.getSystem(rpcClient),
-		Force: req.Force,
+		// DAOS-16312: Always force stop engine processes.
+		Force: true,
 	}
 	req.setRPC(func(ctx context.Context, conn *grpc.ClientConn) (proto.Message, error) {
 		return mgmtpb.NewMgmtSvcClient(conn).SystemStop(ctx, pbReq)

diff --git a/src/control/server/mgmt_system.go b/src/control/server/mgmt_system.go
@@ -902,8 +902,10 @@ func (svc *mgmtSvc) SystemStop(ctx context.Context, req *mgmtpb.SystemStopReq) (
 		return nil, err
 	}
 
-	// First phase: Prepare the ranks for shutdown, but only if the request
-	// is for an unforced full system stop.
+	// First phase: Prepare the ranks for shutdown, but only if the request is for an unforced
+	// full system stop.
+	// DAOS-16312: Note that if force is always specified in request, PrepShutdown will never
+	// be called.
 	if fReq.FullSystem && !fReq.Force {
 		fReq.Method = control.PrepShutdownRanks
 		fResp, _, err = svc.rpcFanout(ctx, fReq, fResp, true)