From patchwork Tue Oct 15 11:34:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez via B4 Relay X-Patchwork-Id: 13836227 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2C431E907D for ; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992110; cv=none; b=C2oqB/oWaTRy+9Vz30OSXFgznpRXVrOdvy9nDFEFXGYRUPZD3m+KM15wzvhCqZbDdN0wzBJX9UXW+5njenYXP8RWNU7ptKj2Mcg8Gb2nC9AbvBKliXSB8D6Fi/mOnasx/xTMMuEkrbIaJKQxX15U82PxmBne8FzwVypRJ+I7m88= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728992110; c=relaxed/simple; bh=2I7WkedOlkWTZhE2utxlJW44kuWbM83H7G6oKC3BWKc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MKCmHtDD/xSwfZIQR8GDS4iCyEdPCBI7k/u39RMVxwspim6ZlPwSk+GMMQiqSoKrmYQO7Eh4AdcYAivODbEeR8FRLphLnE30LpSRL+dP34oprhWTtrLpHnj2yTRdV+53haFUTWyPm76r+RYBYeo0GivexojBbUccRnrOdAVGLeo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bKXYRCck; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bKXYRCck" Received: by smtp.kernel.org (Postfix) with ESMTPS id 8B9C0C4CED0; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728992110; bh=2I7WkedOlkWTZhE2utxlJW44kuWbM83H7G6oKC3BWKc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=bKXYRCckz55RMLoiiK5SVWK7qcPI7YtgyS7RZplCOjf0fpk6nf9Zcvbon+lPReDoe rkUBFGa4xkHvrznYQushlTQmvomZyuweAp8IzMBc8RtiKYgafrFpG9AdDTXNlqfKT5 czAiQzxpBIS3CwDeaHZselYMqvN4GSerHn1XdSS8FEv0w4/iqWd+BY9czgoipfQHn7 21ksdXhVIu016soj3aghgRIW072TE81T10yKDVOp49duZdFlN3Pgmz3gja6CBg8E1y kvjfvq7n/1VigvG+hcyjsYoo3/1kZBTp6Hzp1RXX05EKRfbl/lYlessHWVOqMlFIvh Q12vhuRosSujA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 860E6CFC293; Tue, 15 Oct 2024 11:35:10 +0000 (UTC) From: Daniel Gomez via B4 Relay Date: Tue, 15 Oct 2024 13:34:52 +0200 Subject: [PATCH 2/5] guestfs: bringup: check if domain exists Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241015-bringup-guestfs-debug-v1-2-bd74c0c31412@samsung.com> References: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> In-Reply-To: <20241015-bringup-guestfs-debug-v1-0-bd74c0c31412@samsung.com> To: kdevops@lists.linux.dev, Luis Chamberlain Cc: "Daniel Gomez (Samsung)" , Daniel Gomez X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1728992109; l=1281; i=da.gomez@samsung.com; s=20240621; h=from:subject:message-id; bh=r7n0kftrpxoYrS4NehqDL4UaHsnPJitiFNTCeq6FTxM=; b=vp9aLU0cSzArKTbTygFbVbXN1ysAAaVm49NQITltYeX2pbooDuHVIOfLu+aCcrizZahnfbZua ldM31EoLtx/Chhm7EPZLp+tI4YG471JehW3QkyCw3xWbS4NEM7MO09g X-Developer-Key: i=da.gomez@samsung.com; a=ed25519; pk=BqYk31UHkmv0WZShES6pIZcdmPPGay5LbzifAdZ2Ia4= X-Endpoint-Received: by B4 Relay for da.gomez@samsung.com/20240621 with auth_id=175 X-Original-From: Daniel Gomez Reply-To: da.gomez@samsung.com From: Daniel Gomez virsh domstate fails (exit 1) if domain checked does not exist. This conflicts when debugging the script with set -euxo pipefile. Replace the command with virsh list --all and search for the domain in the list. Also, capture the state to avoid trying to start a domain that is already running. Signed-off-by: Daniel Gomez --- scripts/bringup_guestfs.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh index 32aadba0f4e5a0abc81d247f51cdddd0f2255785..5786975e48647321ecbc71ca9be6fb09c8aa63ff 100755 --- a/scripts/bringup_guestfs.sh +++ b/scripts/bringup_guestfs.sh @@ -334,10 +334,12 @@ do # If the guest is already defined, then just stop what we're doing # and plead to the developer to clean things up. # - virsh domstate $name 1>/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "Domain $name is already defined." - virsh start $name + if virsh list --all | grep --quiet --word-regexp "$name"; then + output_domstate=$(virsh domstate $name 2>/dev/null) + echo "Domain $name is already defined. (state: $output_domstate)" + if [ "$output_domstate" != "running" ]; then + virsh start $name + fi exit 0 fi