From nobody Sun Apr 6 22:23:09 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1735115911; cv=none; d=zohomail.com; s=zohoarc; b=EqdDMEryWyzsORoJ70O3P2Wr2HHKRRCssGxlXSPROUk1Nt5r/n0qbeDWS5qB0YfbXWaMmUdzjLqH4Exulk9tZNMl2NgOHWCxnUObkIwHNSdhdXk9MxHmkH18V+P2q+GJgIIKLPtiMtTInXimrl52ETsD+30z4Q+zUWNCVoiYKV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735115911; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MyJFkDoeUbyNu6pFuHgrzeTcWJQh+2xOk2sQbPsr/kw=; b=nea6FKuIxa3qu1NX/lNAY07G5Gi1NrROHAYvH1CIqtF3+ku10pNpghlUzA2/GM2R1h+csV67qoxCqD0/SveCIvQvK31etHyvNY07KgJg+Rykp4vUsrFNftWu+o5hbs9f58IHjhHDbIShPyisXUO2zk/WEcM4DcrIQMln4PmV4I4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735115911034238.44483826143755; Wed, 25 Dec 2024 00:38:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tQMu5-0002dL-PB; Wed, 25 Dec 2024 03:38:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tQMu2-0002cj-Ox for qemu-devel@nongnu.org; Wed, 25 Dec 2024 03:38:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tQMu0-0004Wl-Cd for qemu-devel@nongnu.org; Wed, 25 Dec 2024 03:38:02 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-F9YqC7vzM5yn0YO4Z7tH_A-1; Wed, 25 Dec 2024 03:37:54 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 87B7F195608C; Wed, 25 Dec 2024 08:37:53 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.116.77]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6C9D21956052; Wed, 25 Dec 2024 08:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735115878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=MyJFkDoeUbyNu6pFuHgrzeTcWJQh+2xOk2sQbPsr/kw=; b=PRGDdAqvxHE7CeQjXj9NT4/J+YPItgUe6hbVsaoyyVMEctWInklI8uU9TzDGQrpq4PFEKS 0ISh/jFjskB/QWbVgCwUIUYmMy5kda37kjnmW8wjQ4w3C98GqT6I2o/1gw54XtlVyQ/TMj PAmxzKuf/ZsaSWw15x6E4JoYIPUDswY= X-MC-Unique: F9YqC7vzM5yn0YO4Z7tH_A-1 X-Mimecast-MFC-AGG-ID: F9YqC7vzM5yn0YO4Z7tH_A From: Dehan Meng To: qemu-devel@nongnu.org Cc: demeng@redhat.com, kkostiuk@redhat.com, michael.roth@amd.com Subject: [PATCH] qemu-ga: Optimize freeze-hook script logic of logging error Date: Wed, 25 Dec 2024 16:37:44 +0800 Message-Id: <20241225083744.277374-1-demeng@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=demeng@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.133, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1735115912266116600 Content-Type: text/plain; charset="utf-8" Make sure the error log of fsfreeze hooks when freeze/thaw/snapshot could be logged to system logs if the default logfile of qga can't be written or other situations Signed-off-by: Dehan Meng Reviewed-by: Konstantin Kostiuk Reviewed-by: Yan Vugenfirer --- scripts/qemu-guest-agent/fsfreeze-hook | 36 +++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/scripts/qemu-guest-agent/fsfreeze-hook b/scripts/qemu-guest-ag= ent/fsfreeze-hook index 13aafd4845..c1feb6f5ce 100755 --- a/scripts/qemu-guest-agent/fsfreeze-hook +++ b/scripts/qemu-guest-agent/fsfreeze-hook @@ -19,15 +19,43 @@ is_ignored_file() { return 1 } =20 +USE_SYSLOG=3D0 +# if log file is not writable, fallback to syslog +[ ! -w "$LOGFILE" ] && USE_SYSLOG=3D1 +# try to update log file and fallback to syslog if it fails +touch "$LOGFILE" &>/dev/null || USE_SYSLOG=3D1 + +# Ensure the log file is writable, fallback to syslog if not +log_message() { + local message=3D"$1" + if [ "$USE_SYSLOG" -eq 0 ]; then + printf "%s: %s\n" "$(date)" "$message" >>"$LOGFILE" + else + logger -t qemu-ga-freeze-hook "$message" + fi +} + # Iterate executables in directory "fsfreeze-hook.d" with the specified ar= gs [ ! -d "$FSFREEZE_D" ] && exit 0 + for file in "$FSFREEZE_D"/* ; do is_ignored_file "$file" && continue [ -x "$file" ] || continue - printf "$(date): execute $file $@\n" >>$LOGFILE - "$file" "$@" >>$LOGFILE 2>&1 - STATUS=3D$? - printf "$(date): $file finished with status=3D$STATUS\n" >>$LOGFILE + + log_message "Executing $file $@" + if [ "$USE_SYSLOG" -eq 0 ]; then + "$file" "$@" >>"$LOGFILE" 2>&1 + STATUS=3D$? + else + "$file" "$@" 2>&1 | logger -t qemu-ga-freeze-hook + STATUS=3D${PIPESTATUS[0]} + fi + + if [ $STATUS -ne 0 ]; then + log_message "Error: $file finished with status=3D$STATUS" + else + log_message "$file finished successfully" + fi done =20 exit 0 --=20 2.40.1