From nobody Tue Feb 10 07:02:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1671045982; cv=none; d=zohomail.com; s=zohoarc; b=iMBIwx7Fj+T2zzz900gbqMjib5U8gA+wPcewE83Ie35M0MuY20z1+advu6q8Ocuxu4N2S5Jx2W+YkRJ18hSoZVNhfQ9JpMyIDlu9lA80CdMQiHLT63DHHXGYU4yaYZ8kjMPLZYma7S+8yCVwNie4u2z8MuKwGmMJ+0Ujrqf5Txc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671045982; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZONahv3CYdDnB3ftT+Onf1fpHGZPy5dM3r9s1QitTQs=; b=SAQaEucDWzAFa/V9+k+iOCepQhCeTBVyGZE9TAlupkJeYCqHR7WL6pu3EXFfhv5nA7x+lxOWaxNRUWJkiKlTPxcci2AUJoMbuQs7VjfYJb2DNm+4gO6QVKAcfCe+ZDlxTEIi3RQlewAUzG8bvwVDzbTbRneRKKPG/j3R9sO2fo4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1671045982380353.46249475524166; Wed, 14 Dec 2022 11:26:22 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-374-V_AzXnmUPIO3p_nPBskuNg-1; Wed, 14 Dec 2022 14:26:16 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A92F18A6460; Wed, 14 Dec 2022 19:26:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5440453A0; Wed, 14 Dec 2022 19:26:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 14A871946A41; Wed, 14 Dec 2022 19:26:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5D35B19465B9 for ; Wed, 14 Dec 2022 19:26:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3131BC159BB; Wed, 14 Dec 2022 19:26:10 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A132C15BAD for ; Wed, 14 Dec 2022 19:26:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF463101A521 for ; Wed, 14 Dec 2022 19:26:09 +0000 (UTC) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-67-nx0a9NNQOtO9nzkGpKFQ-g-1; Wed, 14 Dec 2022 14:26:08 -0500 Received: from [192.168.16.26] (helo=dv.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1p5XOI-00EGSm-E7; Wed, 14 Dec 2022 20:26:06 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671045981; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZONahv3CYdDnB3ftT+Onf1fpHGZPy5dM3r9s1QitTQs=; b=TG0Ze+JAts8y6JmrzAD0amLXct9vDZrolAhHoGyVxhvxulVkU1rECOOW/MyvOvFbVBJqsS av+Grw60Zl3K6yHAWd0OyIdeZk370irNVthE0kXKnvOm3ojSt46Rk6XNr11OlyNjCAyYzy PT9NYCfpsTloarA+wp9OPx8KjhixpTY= X-MC-Unique: V_AzXnmUPIO3p_nPBskuNg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: nx0a9NNQOtO9nzkGpKFQ-g-1 From: Oleg Vasilev To: libvir-list@redhat.com Subject: [PATCH v2 1/5] logging: refactor to store config inside log handler Date: Thu, 15 Dec 2022 01:25:46 +0600 Message-Id: <20221214192550.149417-2-oleg.vasilev@virtuozzo.com> In-Reply-To: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> References: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oleg Vasilev , Den Lunev Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671045983293100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Oleg Vasilev --- src/logging/log_daemon.c | 6 ++---- src/logging/log_handler.c | 29 ++++++++++++----------------- src/logging/log_handler.h | 17 ++++++++--------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 9b70ffad2f..8025245350 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -145,8 +145,7 @@ virLogDaemonNew(virLogDaemonConfig *config, bool privil= eged) g_clear_pointer(&srv, virObjectUnref); =20 if (!(logd->handler =3D virLogHandlerNew(privileged, - config->max_size, - config->max_backups, + config, virLogDaemonInhibitor, logd))) goto error; @@ -231,8 +230,7 @@ virLogDaemonNewPostExecRestart(virJSONValue *object, bo= ol privileged, =20 if (!(logd->handler =3D virLogHandlerNewPostExecRestart(child, privileged, - config->max_size, - config->max_back= ups, + config, virLogDaemonInhi= bitor, logd))) goto error; diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index bf1e3f35c5..7342404b00 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -58,8 +58,7 @@ struct _virLogHandler { virObjectLockable parent; =20 bool privileged; - size_t max_size; - size_t max_backups; + virLogDaemonConfig *config; =20 virLogHandlerLogFile **files; size_t nfiles; @@ -185,8 +184,7 @@ virLogHandlerDomainLogFileEvent(int watch, =20 virLogHandler * virLogHandlerNew(bool privileged, - size_t max_size, - size_t max_backups, + virLogDaemonConfig *config, virLogHandlerShutdownInhibitor inhibitor, void *opaque) { @@ -199,8 +197,7 @@ virLogHandlerNew(bool privileged, return NULL; =20 handler->privileged =3D privileged; - handler->max_size =3D max_size; - handler->max_backups =3D max_backups; + handler->config =3D config; handler->inhibitor =3D inhibitor; handler->opaque =3D opaque; =20 @@ -253,8 +250,8 @@ virLogHandlerLogFilePostExecRestart(virLogHandler *hand= ler, } =20 if ((file->file =3D virRotatingFileWriterNew(path, - handler->max_size, - handler->max_backups, + handler->config->max_size, + handler->config->max_backup= s, false, DEFAULT_MODE)) =3D=3D NULL) goto error; @@ -282,8 +279,7 @@ virLogHandlerLogFilePostExecRestart(virLogHandler *hand= ler, virLogHandler * virLogHandlerNewPostExecRestart(virJSONValue *object, bool privileged, - size_t max_size, - size_t max_backups, + virLogDaemonConfig *config, virLogHandlerShutdownInhibitor inhibitor, void *opaque) { @@ -292,8 +288,7 @@ virLogHandlerNewPostExecRestart(virJSONValue *object, size_t i; =20 if (!(handler =3D virLogHandlerNew(privileged, - max_size, - max_backups, + config, inhibitor, opaque))) return NULL; @@ -393,8 +388,8 @@ virLogHandlerDomainOpenLogFile(virLogHandler *handler, file->domname =3D g_strdup(domname); =20 if ((file->file =3D virRotatingFileWriterNew(path, - handler->max_size, - handler->max_backups, + handler->config->max_size, + handler->config->max_backup= s, trunc, DEFAULT_MODE)) =3D=3D NULL) goto error; @@ -525,7 +520,7 @@ virLogHandlerDomainReadLogFile(virLogHandler *handler, =20 virObjectLock(handler); =20 - if (!(file =3D virRotatingFileReaderNew(path, handler->max_backups))) + if (!(file =3D virRotatingFileReaderNew(path, handler->config->max_bac= kups))) goto error; =20 if (virRotatingFileReaderSeek(file, inode, offset) < 0) @@ -579,8 +574,8 @@ virLogHandlerDomainAppendLogFile(virLogHandler *handler, =20 if (!writer) { if (!(newwriter =3D virRotatingFileWriterNew(path, - handler->max_size, - handler->max_backups, + handler->config->max_si= ze, + handler->config->max_ba= ckups, false, DEFAULT_MODE))) goto cleanup; diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index 099378b361..c9af033cd3 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -22,6 +22,7 @@ =20 #include "internal.h" #include "virjson.h" +#include "log_daemon_config.h" =20 typedef struct _virLogHandler virLogHandler; =20 @@ -30,16 +31,14 @@ typedef void (*virLogHandlerShutdownInhibitor)(bool inh= ibit, void *opaque); =20 virLogHandler *virLogHandlerNew(bool privileged, - size_t max_size, - size_t max_backups, - virLogHandlerShutdownInhibitor inhibitor, - void *opaque); + virLogDaemonConfig *config, + virLogHandlerShutdownInhibitor inhibitor, + void *opaque); virLogHandler *virLogHandlerNewPostExecRestart(virJSONValue *child, - bool privileged, - size_t max_size, - size_t max_backups, - virLogHandlerShutdownInhi= bitor inhibitor, - void *opaque); + bool privileged, + virLogDaemonConfig *config, + virLogHandlerShutdownInhibi= tor inhibitor, + void *opaque); =20 void virLogHandlerFree(virLogHandler *handler); =20 --=20 2.38.1 From nobody Tue Feb 10 07:02:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1671045989; cv=none; d=zohomail.com; s=zohoarc; b=hfUgXOBngc/JHc5ie2y6D7yyphzYgs4/TZy2ucenaJvIJev4wi1NB9s5JJ7cvOWKQ2uIiRvApbwPO7cHssBUveOqJgK8zDht3lVCVli/GhhzZaxZM7XfxUDuHKA1agNXCwNxyROnliwvDr2BngDmIJxSINR9q+dnWxGROVlObd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671045989; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sprRTfVyPhOnUuYJA8Jz6h+SHZ90iJ0QA9u+IlcN/oY=; b=Ah3hVIpQEmbDx/aEnt/RklxzKvcSL0fNJvLF/aIrpqa53Vv18fxfgbQaoS52GE+ZcbspKKDfzmbaemffgukMy/5SBR0jAbetwSb4uSyGDN006ApzzvHY0yVGRmfSf7FUmaYtYmQcwVVglZ7qjjEsnJiQn8yvMqlxMuQM8ZdKcRM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1671045989167286.04456427012155; Wed, 14 Dec 2022 11:26:29 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-DMj2YHvMOrWlFLvujBfryQ-1; Wed, 14 Dec 2022 14:26:19 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 182D018A646E; Wed, 14 Dec 2022 19:26:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0207C4010E36; Wed, 14 Dec 2022 19:26:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 62CB71946A50; Wed, 14 Dec 2022 19:26:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B1CB719465B9 for ; Wed, 14 Dec 2022 19:26:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A20DF40BC781; Wed, 14 Dec 2022 19:26:10 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9AF9B400D796 for ; Wed, 14 Dec 2022 19:26:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7A673101A521 for ; Wed, 14 Dec 2022 19:26:10 +0000 (UTC) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-331-k-AvWAolOnWI6L-oO3RDLQ-1; Wed, 14 Dec 2022 14:26:08 -0500 Received: from [192.168.16.26] (helo=dv.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1p5XOJ-00EGSm-7N; Wed, 14 Dec 2022 20:26:07 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671045984; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sprRTfVyPhOnUuYJA8Jz6h+SHZ90iJ0QA9u+IlcN/oY=; b=ERg7Qg4gl+nB4uSjke7OlJ92YfUtYySTV1I67rGBIgcRWRjm9mrxPAy4hZrHxQTZRON15E k1Ugp7tRB5nFQjuNJ4msAU9+eBJGR5fQcdZ/8MfsCJ/VhsYfZpMQivSNJWeoYkYXx4DBt9 XuoCppFRK/o1NKF2RQY+2Ux09537BG0= X-MC-Unique: DMj2YHvMOrWlFLvujBfryQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: k-AvWAolOnWI6L-oO3RDLQ-1 From: Oleg Vasilev To: libvir-list@redhat.com Subject: [PATCH v2 2/5] logging: move virLogHandler to header Date: Thu, 15 Dec 2022 01:25:47 +0600 Message-Id: <20221214192550.149417-3-oleg.vasilev@virtuozzo.com> In-Reply-To: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> References: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oleg Vasilev , Den Lunev Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671045991383100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Oleg Vasilev --- src/logging/log_handler.c | 26 -------------------------- src/logging/log_handler.h | 31 ++++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 7342404b00..8fc7e9b2a8 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -22,11 +22,9 @@ =20 #include "log_handler.h" #include "virerror.h" -#include "virobject.h" #include "virfile.h" #include "viralloc.h" #include "virlog.h" -#include "virrotatingfile.h" #include "viruuid.h" #include "virutil.h" =20 @@ -42,30 +40,6 @@ VIR_LOG_INIT("logging.log_handler"); =20 #define DEFAULT_MODE 0600 =20 -typedef struct _virLogHandlerLogFile virLogHandlerLogFile; -struct _virLogHandlerLogFile { - virRotatingFileWriter *file; - int watch; - int pipefd; /* Read from QEMU via this */ - bool drained; - - char *driver; - unsigned char domuuid[VIR_UUID_BUFLEN]; - char *domname; -}; - -struct _virLogHandler { - virObjectLockable parent; - - bool privileged; - virLogDaemonConfig *config; - - virLogHandlerLogFile **files; - size_t nfiles; - - virLogHandlerShutdownInhibitor inhibitor; - void *opaque; -}; =20 static virClass *virLogHandlerClass; static void virLogHandlerDispose(void *obj); diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index c9af033cd3..d473a19fc6 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -23,13 +23,38 @@ #include "internal.h" #include "virjson.h" #include "log_daemon_config.h" - -typedef struct _virLogHandler virLogHandler; - +#include "virobject.h" +#include "virrotatingfile.h" =20 typedef void (*virLogHandlerShutdownInhibitor)(bool inhibit, void *opaque); =20 +typedef struct _virLogHandlerLogFile virLogHandlerLogFile; +struct _virLogHandlerLogFile { + virRotatingFileWriter *file; + int watch; + int pipefd; /* Read from QEMU via this */ + bool drained; + + char *driver; + unsigned char domuuid[VIR_UUID_BUFLEN]; + char *domname; +}; + +typedef struct _virLogHandler virLogHandler; +struct _virLogHandler { + virObjectLockable parent; + + bool privileged; + virLogDaemonConfig *config; + + virLogHandlerLogFile **files; + size_t nfiles; + + virLogHandlerShutdownInhibitor inhibitor; + void *opaque; +}; + virLogHandler *virLogHandlerNew(bool privileged, virLogDaemonConfig *config, virLogHandlerShutdownInhibitor inhibitor, --=20 2.38.1 From nobody Tue Feb 10 07:02:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1671046024; cv=none; d=zohomail.com; s=zohoarc; b=fr0dyIVYVE0/+GkaViH6jaPoWaCEexplrBqsqQuDydp5CM0GQSSuDVRyFTLxS8Woy237hh0knwqrb6r2ZvfqBwhqxTlaZXtpa9KT2yS1WySM56xSC6kBDqu1/3nWtrSXMaOq1AHMun5we9iupKX21buKJdMPxMSJdkgeKibkQ4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671046024; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=waJlYdSpYzvghiucbjvfcPE/g0NYYw5NEbAFAIUwzkc=; b=XMPBVVQYOfXjOTAB5wUOhayGCSCFOB6xYhQ1Ubt4czoNQG5FfZ62kY5shEgJ9L2AG7bRfQwKyX67335Oqlneb2HJ+WKLMjDihy1xrkBs6dsPuyy0pd8KH7G4IXBUFwpcVcc6FihO9qUPwN+/wZoTFM+VngkWHHAM1g0DZA/VtLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1671046024937291.13541357272925; Wed, 14 Dec 2022 11:27:04 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-575-8aKQwU-0Mc-fWLU7f7MnCQ-1; Wed, 14 Dec 2022 14:26:21 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BFC378065D8; Wed, 14 Dec 2022 19:26:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C30BC16020; Wed, 14 Dec 2022 19:26:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5E1641946A4D; Wed, 14 Dec 2022 19:26:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 96B6A19465B9 for ; Wed, 14 Dec 2022 19:26:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6C2C8C15BAD; Wed, 14 Dec 2022 19:26:14 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast09.extmail.prod.ext.rdu2.redhat.com [10.11.55.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64FFEC15BA0 for ; Wed, 14 Dec 2022 19:26:14 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 48E0F29ABA28 for ; Wed, 14 Dec 2022 19:26:14 +0000 (UTC) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-578-_896jiimO4a8UkhKl4eLxw-1; Wed, 14 Dec 2022 14:26:09 -0500 Received: from [192.168.16.26] (helo=dv.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1p5XOK-00EGSm-0Z; Wed, 14 Dec 2022 20:26:08 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671046022; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=waJlYdSpYzvghiucbjvfcPE/g0NYYw5NEbAFAIUwzkc=; b=OjfQt42EkBto6f4/jK3bI5RHsnu1kwJ4PHVVO47JOcCXspOTBr9jJqxNMKsOw9m/mqrK5S KJNgFynO0XRphjekGgePUsTnJvVS0QPQsMTu8uOaQBOC122jTklFtCU50DuM3NqHOzgE6y E9vW/gU7ztholvlMuN5kmZ+Hixya+6M= X-MC-Unique: 8aKQwU-0Mc-fWLU7f7MnCQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: _896jiimO4a8UkhKl4eLxw-1 From: Oleg Vasilev To: libvir-list@redhat.com Subject: [PATCH v2 3/5] logging: add configuration for future log cleaner Date: Thu, 15 Dec 2022 01:25:48 +0600 Message-Id: <20221214192550.149417-4-oleg.vasilev@virtuozzo.com> In-Reply-To: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> References: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oleg Vasilev , Den Lunev Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671046025584100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We want to specify the folder to clean and how much time can a log chain live. Signed-off-by: Oleg Vasilev --- src/logging/log_daemon_config.c | 9 +++++++++ src/logging/log_daemon_config.h | 3 +++ src/logging/test_virtlogd.aug.in | 2 ++ src/logging/virtlogd.aug | 2 ++ src/logging/virtlogd.conf | 14 ++++++++++++++ 5 files changed, 30 insertions(+) diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_confi= g.c index 4436745488..248bd927d3 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -28,6 +28,7 @@ #include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_CONF +#define DEFAULT_LOG_ROOT LOCALSTATEDIR "/log/libvirt/" =20 VIR_LOG_INIT("logging.log_daemon_config"); =20 @@ -60,6 +61,7 @@ virLogDaemonConfigNew(bool privileged G_GNUC_UNUSED) data->admin_max_clients =3D 5000; data->max_size =3D 1024 * 1024 * 2; data->max_backups =3D 3; + data->max_age_days =3D 0; =20 return data; } @@ -72,6 +74,7 @@ virLogDaemonConfigFree(virLogDaemonConfig *data) =20 g_free(data->log_filters); g_free(data->log_outputs); + g_free(data->log_root); =20 g_free(data); } @@ -94,6 +97,12 @@ virLogDaemonConfigLoadOptions(virLogDaemonConfig *data, return -1; if (virConfGetValueSizeT(conf, "max_backups", &data->max_backups) < 0) return -1; + if (virConfGetValueSizeT(conf, "max_age_days", &data->max_age_days) < = 0) + return -1; + if (virConfGetValueString(conf, "log_root", &data->log_root) < 0) + return -1; + if (!data->log_root) + data->log_root =3D g_strdup(DEFAULT_LOG_ROOT); =20 return 0; } diff --git a/src/logging/log_daemon_config.h b/src/logging/log_daemon_confi= g.h index 2ab0f67c96..43922feedf 100644 --- a/src/logging/log_daemon_config.h +++ b/src/logging/log_daemon_config.h @@ -33,6 +33,9 @@ struct _virLogDaemonConfig { =20 size_t max_backups; size_t max_size; + + char *log_root; + size_t max_age_days; }; =20 =20 diff --git a/src/logging/test_virtlogd.aug.in b/src/logging/test_virtlogd.a= ug.in index cd5b0d91f8..8dfad39506 100644 --- a/src/logging/test_virtlogd.aug.in +++ b/src/logging/test_virtlogd.aug.in @@ -9,3 +9,5 @@ module Test_virtlogd =3D { "admin_max_clients" =3D "5" } { "max_size" =3D "2097152" } { "max_backups" =3D "3" } + { "max_age_days" =3D "0" } + { "log_root" =3D "/var/log/libvirt" } diff --git a/src/logging/virtlogd.aug b/src/logging/virtlogd.aug index 0f1b290c72..bdf61dea6e 100644 --- a/src/logging/virtlogd.aug +++ b/src/logging/virtlogd.aug @@ -31,6 +31,8 @@ module Virtlogd =3D | int_entry "admin_max_clients" | int_entry "max_size" | int_entry "max_backups" + | int_entry "max_age_days" + | str_entry "log_root" =20 (* Each entry in the config is one of the following three ... *) let entry =3D logging_entry diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index c53a1112bd..5214e96121 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -101,3 +101,17 @@ # Maximum number of backup files to keep. Defaults to 3, # not including the primary active file #max_backups =3D 3 + +# Maximum age for log files to live after the last modification. +# Defaults to 0, which means "forever". +# +# WARNING: since virtlogd has no way to differentiate which files it used = to +# manage, the garbage collection mechanism will collect ALL files, once it= s age +# reach max_age_days. Use only if you know what you mean. +#max_age_days =3D 0 + +# Root of all logs managed by virtlogd. Used to GC logs from obsolete mach= ines. +# +# WARNING: all files under this location potentially can be GC-ed. See the +# warning for max_age_days. +#log_root =3D "/var/log/libvirt" --=20 2.38.1 From nobody Tue Feb 10 07:02:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1671045983; cv=none; d=zohomail.com; s=zohoarc; b=MRYZfhxYxkd3xYsQvuFCI7E6KNVg8YckESvkj2fM6S+merwqTf681zOyKwpYaBkFEAou1GQQpIb8+uN7EjhIKQ6h84DsfkCwGhyxoYpsRvbdOW5HwVwJ8RFj6ajvURa/FABEh6LCyxtvajsrojCGEgIO6HxrEVOrAmPoRj14xF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671045983; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sw9NRhWswb8z5id/w7lCrwjbDdhapaAFwgQm48Ft/wE=; b=amKUH/gqsKuA9Pgk5MYPam4Cy9Bou8U1YU8OAdZxOKMvMDi18Y5+oGylXSPRFr9ZR1HQZTuBk7RU4+yoY3Y+Pv6AGZWKQhoc60kDWRB6Yi5Jncpci65KEetLwwaB91LeyCxa5ViMMrfxsv0+V8Izr+GySv+x2em7c9/k/yl6rfE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1671045983046257.9763959547888; Wed, 14 Dec 2022 11:26:23 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-509-zYhSX9SKNraxL39IydM53w-1; Wed, 14 Dec 2022 14:26:20 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 58654805564; Wed, 14 Dec 2022 19:26:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 407AB492C14; Wed, 14 Dec 2022 19:26:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A9D511946A66; Wed, 14 Dec 2022 19:26:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4AA4D1946A4E for ; Wed, 14 Dec 2022 19:26:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3D07F14171C0; Wed, 14 Dec 2022 19:26:12 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast09.extmail.prod.ext.rdu2.redhat.com [10.11.55.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 351F714171BE for ; Wed, 14 Dec 2022 19:26:12 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 11C1629A9CA0 for ; Wed, 14 Dec 2022 19:26:12 +0000 (UTC) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-618-U-wYZb7aO_mtXFYjB2cucg-1; Wed, 14 Dec 2022 14:26:10 -0500 Received: from [192.168.16.26] (helo=dv.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1p5XOK-00EGSm-Pz; Wed, 14 Dec 2022 20:26:09 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671045982; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sw9NRhWswb8z5id/w7lCrwjbDdhapaAFwgQm48Ft/wE=; b=Tn/X3CeECD4TqcSJTCgZ7qV2XUI6JrA5LdgdxTc+7he93SV7XGPi6O4qcVlJeUlehBs5YW 4Jt9zypTNVGoQhn1cfAKC2OFbnECQYLlK5hXkUZe96Typ/QYXq9qbTTtZmhJ6hQ0XqxiYw hDUM/AB0DH/D+Ys/G3a6b90AmGdVk28= X-MC-Unique: zYhSX9SKNraxL39IydM53w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: U-wYZb7aO_mtXFYjB2cucg-1 From: Oleg Vasilev To: libvir-list@redhat.com Subject: [PATCH v2 4/5] logging: add log cleanup for obsolete domains Date: Thu, 15 Dec 2022 01:25:49 +0600 Message-Id: <20221214192550.149417-5-oleg.vasilev@virtuozzo.com> In-Reply-To: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> References: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oleg Vasilev , Den Lunev Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671045983339100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Before, logs from deleted machines have been piling up, since there were no garbage collection mechanism. Now, virtlogd can be configured to periodically scan the log folder for orphan logs with no recent modificatio= ns and delete it. A single chain of recent and rotated logs is deleted in a single transactio= n. Signed-off-by: Oleg Vasilev --- po/POTFILES | 1 + src/logging/log_cleaner.c | 276 ++++++++++++++++++++++++++++++++++++++ src/logging/log_cleaner.h | 29 ++++ src/logging/log_handler.h | 2 + src/logging/meson.build | 1 + 5 files changed, 309 insertions(+) create mode 100644 src/logging/log_cleaner.c create mode 100644 src/logging/log_cleaner.h diff --git a/po/POTFILES b/po/POTFILES index 169e2a41dc..2fb6d18e27 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -123,6 +123,7 @@ src/locking/lock_driver_lockd.c src/locking/lock_driver_sanlock.c src/locking/lock_manager.c src/locking/sanlock_helper.c +src/logging/log_cleaner.c src/logging/log_daemon.c src/logging/log_daemon_dispatch.c src/logging/log_handler.c diff --git a/src/logging/log_cleaner.c b/src/logging/log_cleaner.c new file mode 100644 index 0000000000..03de9c17ee --- /dev/null +++ b/src/logging/log_cleaner.c @@ -0,0 +1,276 @@ +/* + * log_cleaner.c: cleans obsolete log files + * + * Copyright (C) 2022 Virtuozzo International GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * . + */ + +#include + +#include "log_cleaner.h" +#include "log_handler.h" + +#include "virerror.h" +#include "virobject.h" +#include "virfile.h" +#include "viralloc.h" +#include "virlog.h" +#include "virrotatingfile.h" +#include "virstring.h" + +#define VIR_FROM_THIS VIR_FROM_LOGGING + +/* Cleanup log root (/var/log/libvirt) and all subfolders (e.g. /var/log/l= ibvirt/qemu) */ +#define CLEANER_LOG_DEPTH 1 +#define CLEANER_LOG_TIMEOUT_MS (24 * 3600 * 1000) /* One day */ +#define MAX_TIME ((time_t) G_MAXINT64) + +static GRegex *log_regex; + +typedef struct _virLogCleanerChain virLogCleanerChain; +struct _virLogCleanerChain { + int rotated_max_index; + time_t last_modified; +}; + +typedef struct _virLogCleanerData virLogCleanerData; +struct _virLogCleanerData { + virLogHandler *handler; + time_t oldest_to_keep; + GHashTable *chains; +}; + +static const char* +virLogCleanerParseFilename(const char* path, + int* rotated_index) +{ + g_autoptr(GMatchInfo) matchInfo =3D NULL; + g_autofree const char* rotated_index_str =3D NULL; + g_autofree const char *clear_path =3D NULL; + const char* chain_prefix =3D NULL; + + clear_path =3D realpath(path, NULL); + if (!clear_path) { + virReportSystemError(errno, + _("Failed to resolve path '%s'"), + path); + return NULL; + } + + if (!g_regex_match(log_regex, path, 0, &matchInfo)) { + return NULL; + } + + chain_prefix =3D g_match_info_fetch(matchInfo, 1); + if (!rotated_index) + return chain_prefix; + + *rotated_index =3D 0; + rotated_index_str =3D g_match_info_fetch(matchInfo, 2); + + if (!rotated_index_str) + return chain_prefix; + + if (virStrToLong_i(rotated_index_str+1, NULL, 10, rotated_index) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to parse rotated index from '%s'"), + rotated_index_str); + return NULL; + } + return chain_prefix; +} + +static void +virLogCleanerProcessFile(virLogCleanerData* data, + const char* path, + struct stat* sb) +{ + int rotated_index =3D 0; + g_autofree const char *chain_prefix =3D NULL; + virLogCleanerChain *chain; + + if (!S_ISREG(sb->st_mode)) { + return; + } + + chain_prefix =3D virLogCleanerParseFilename(path, &rotated_index); + + if (!chain_prefix) { + return; + } + + if (rotated_index > data->handler->config->max_backups) { + if (unlink(path) < 0) { + virReportSystemError(errno, _("Unable to delete %s"), path); + } + return; + } + + chain =3D g_hash_table_lookup(data->chains, chain_prefix); + + if (!chain) { + chain =3D g_new0(virLogCleanerChain, 1); + g_hash_table_insert(data->chains, (void *) chain_prefix, chain); + chain_prefix =3D NULL; /* Moved to hash table */ + } + + chain->last_modified =3D MAX(chain->last_modified, sb->st_mtime); + chain->rotated_max_index =3D MAX(chain->rotated_max_index, + rotated_index); +} + +static GHashTable* +virLogCleanerCreateTable(virLogHandler *handler) +{ + /* (const char*) chain_prefix -> (virLogCleanerChain*) chain */ + GHashTable *chains =3D g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, g_free); + size_t i; + virLogHandlerLogFile *file; + const char *chain_prefix; + virLogCleanerChain* chain; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(handler); + + for (i =3D 0; i < handler->nfiles; i++) { + file =3D handler->files[i]; + chain_prefix =3D virLogCleanerParseFilename(virRotatingFileWriterG= etPath(file->file), + NULL); + if (!chain_prefix) { + continue; + } + + chain =3D g_new0(virLogCleanerChain, 1); + chain->last_modified =3D (time_t) G_MAXINT64; + g_hash_table_insert(chains, (void *) chain_prefix, chain); + } + + return chains; +} + +static void +virLogCleanerProcessFolder(virLogCleanerData *data, + const char *path, + int depth_left) +{ + DIR *dir; + struct dirent *entry; + struct stat sb; + + if (virDirOpenIfExists(&dir, path) < 0) + return; + + while (virDirRead(dir, &entry, path) > 0) { + g_autofree char *newpath =3D NULL; + if (STREQ(entry->d_name, ".")) + continue; + if (STREQ(entry->d_name, "..")) + continue; + + newpath =3D g_strdup_printf("%s/%s", path, entry->d_name); + + if (stat(newpath, &sb) < 0) { + virReportSystemError(errno, _("Unable to stat %s"), newpath); + continue; + } + + if (S_ISDIR(sb.st_mode)) { + if (depth_left > 0) + virLogCleanerProcessFolder(data, newpath, depth_left - 1); + continue; + } + + virLogCleanerProcessFile(data, newpath, &sb); + } + + virDirClose(dir); +} + +static void +virLogCleanerChainCB(gpointer key, + gpointer value, + gpointer user_data) +{ + const char* chain_prefix =3D key; + virLogCleanerChain* chain =3D value; + virLogCleanerData* data =3D user_data; + size_t i; + + if (chain->last_modified > data->oldest_to_keep) { + return; + } + + for (i =3D 0; i <=3D chain->rotated_max_index; i++) { + g_autofree char* path =3D NULL; + if (i =3D=3D 0) { + path =3D g_strdup_printf("%s.log", chain_prefix); + } else { + path =3D g_strdup_printf("%s.log.%ld", chain_prefix, i); + } + if (unlink(path) < 0) { + virReportSystemError(errno, _("Unable to delete %s"), path); + } + } +} + +static void +virLogCleanerTimer(int timer G_GNUC_UNUSED, void* opaque) +{ + virLogHandler *handler =3D opaque; + virLogCleanerData data =3D { + .handler =3D handler, + .oldest_to_keep =3D time(NULL) - 3600 * 24 * handler->config->max_= age_days, + .chains =3D virLogCleanerCreateTable(handler), + }; + + /* First prepare the hashmap of chains to delete */ + virLogCleanerProcessFolder(&data, + handler->config->log_root, + CLEANER_LOG_DEPTH); + g_hash_table_foreach(data.chains, virLogCleanerChainCB, &data); + g_hash_table_destroy(data.chains); +} + +int +virLogCleanerInit(virLogHandler *handler) +{ + if (handler->config->max_age_days <=3D 0) { + return 0; + } + + log_regex =3D g_regex_new("^(.*)\\.log(\\.(\\d+))?$", 0, 0, NULL); + if (!log_regex) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to compile regex")); + return -1; + } + + handler->cleanup_log_timer =3D virEventAddTimeout(CLEANER_LOG_TIMEOUT_= MS, + virLogCleanerTimer, + handler, NULL); + return handler->cleanup_log_timer; +} + +void +virLogCleanerShutdown(virLogHandler *handler) +{ + if (handler->cleanup_log_timer !=3D -1) { + virEventRemoveTimeout(handler->cleanup_log_timer); + handler->cleanup_log_timer =3D -1; + } + + g_regex_unref(log_regex); + log_regex =3D NULL; +} diff --git a/src/logging/log_cleaner.h b/src/logging/log_cleaner.h new file mode 100644 index 0000000000..1a9a94b68d --- /dev/null +++ b/src/logging/log_cleaner.h @@ -0,0 +1,29 @@ +/* + * log_cleaner.h: cleans obsolete log files + * + * Copyright (C) 2022 Virtuozzo International GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * . + */ + +#pragma once + +#include "log_handler.h" + +int +virLogCleanerInit(virLogHandler *handler); + +void +virLogCleanerShutdown(virLogHandler *handler); diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index d473a19fc6..97dad27eda 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -48,6 +48,8 @@ struct _virLogHandler { bool privileged; virLogDaemonConfig *config; =20 + int cleanup_log_timer; + virLogHandlerLogFile **files; size_t nfiles; =20 diff --git a/src/logging/meson.build b/src/logging/meson.build index 7066f16fad..fa6af50fa6 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -30,6 +30,7 @@ log_daemon_sources =3D files( 'log_daemon_config.c', 'log_daemon_dispatch.c', 'log_handler.c', + 'log_cleaner.c', ) =20 if conf.has('WITH_REMOTE') --=20 2.38.1 From nobody Tue Feb 10 07:02:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1671045987; cv=none; d=zohomail.com; s=zohoarc; b=NEqcGJfLwTd8TXOJtO+GMJAAK0qE/lCLFHzBr0yMuW8UBEB1IbApwNHaWnoBTgSwJeepcD8cmX5TebeK2fQFqNpHd/o+4q/Ei+fLNXihcmeDsCNwXme+QUtW0PffHPa5nZWS08fSa/AvLHOvsNOFtntoTxBuR9tp3GKudjLTtFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671045987; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fx2UFJchgmQN/wDkYiCDP7LHrQEhd+ZauXoAvR2lqfQ=; b=Wn/LYCosOwdhWa0BU64ocjPUi1xmaC3G9ygMfpCAlBf4e6mLv8iz1s13IEzq69JJf4XxZLG3MJdpSAJvLbgs2Ql67SvXAJ+3Ghsd8Ns2ChlvMNvx+m2Y5uxS4XSHuxHU0fllwSEU3j8XdprAM+afg8b7l0JawjxFAGQ0xc3SU6U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1671045987022771.0678706784238; Wed, 14 Dec 2022 11:26:27 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-206-uhpODnmLOHG8c8hvl8kMgQ-1; Wed, 14 Dec 2022 14:26:22 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4436D85D06A; Wed, 14 Dec 2022 19:26:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 298DE400D796; Wed, 14 Dec 2022 19:26:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1D1C41946A41; Wed, 14 Dec 2022 19:26:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2F56719465B9 for ; Wed, 14 Dec 2022 19:26:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2213B492C14; Wed, 14 Dec 2022 19:26:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A9B0492C18 for ; Wed, 14 Dec 2022 19:26:13 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03AA8857A89 for ; Wed, 14 Dec 2022 19:26:13 +0000 (UTC) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-92-vRC74_WKO3G-oOu5eGuzDA-1; Wed, 14 Dec 2022 14:26:11 -0500 Received: from [192.168.16.26] (helo=dv.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1p5XOL-00EGSm-JC; Wed, 14 Dec 2022 20:26:09 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671045986; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=fx2UFJchgmQN/wDkYiCDP7LHrQEhd+ZauXoAvR2lqfQ=; b=RqXDMBq/smNolykKJVwiRkP11SXCk/gC/sVYXh0SWUrer6Fb0d6FI9PSqchQqCE0zzrAH+ Q/UCm4Q9oqUE+k2PEv9Uta/vevrxVHiJf//rULj0qWeaV/VRsfl7qFe2lXeGQky8TF/zOL V21TGEjLyNPFVHrNPOx2SNJEKrVzLpo= X-MC-Unique: uhpODnmLOHG8c8hvl8kMgQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: vRC74_WKO3G-oOu5eGuzDA-1 From: Oleg Vasilev To: libvir-list@redhat.com Subject: [PATCH v2 5/5] logging: use the log cleaner Date: Thu, 15 Dec 2022 01:25:50 +0600 Message-Id: <20221214192550.149417-6-oleg.vasilev@virtuozzo.com> In-Reply-To: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> References: <20221214192550.149417-1-oleg.vasilev@virtuozzo.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oleg Vasilev , Den Lunev Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671045987398100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Actually use the log cleaner introduced by previous commit. Signed-off-by: Oleg Vasilev --- src/logging/log_handler.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 8fc7e9b2a8..a739211c7c 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -21,6 +21,7 @@ #include =20 #include "log_handler.h" +#include "log_cleaner.h" #include "virerror.h" #include "virfile.h" #include "viralloc.h" @@ -175,7 +176,15 @@ virLogHandlerNew(bool privileged, handler->inhibitor =3D inhibitor; handler->opaque =3D opaque; =20 + if (virLogCleanerInit(handler) < 0) { + goto error; + } + return handler; + + error: + virObjectUnref(handler); + return NULL; } =20 =20 @@ -313,6 +322,8 @@ virLogHandlerDispose(void *obj) virLogHandler *handler =3D obj; size_t i; =20 + virLogCleanerShutdown(handler); + for (i =3D 0; i < handler->nfiles; i++) { handler->inhibitor(false, handler->opaque); virLogHandlerLogFileFree(handler->files[i]); --=20 2.38.1