From nobody Sun Apr 28 08:45:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532591731910766.8573861697428; Thu, 26 Jul 2018 00:55:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35719307C94F; Thu, 26 Jul 2018 07:55:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D58C417134; Thu, 26 Jul 2018 07:55:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6DC1A18037ED; Thu, 26 Jul 2018 07:55:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6Q7tNZN001752 for ; Thu, 26 Jul 2018 03:55:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 15E8F10FFE54; Thu, 26 Jul 2018 07:55:23 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA8EA10FFE52 for ; Thu, 26 Jul 2018 07:55:20 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 26 Jul 2018 09:55:17 +0200 Message-Id: <520d46fdb1b65fa93e2a08d100e1f1461a900ba5.1532591717.git.mprivozn@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] networkGetDHCPLeases: Don't always report error if unable to read leases file X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 26 Jul 2018 07:55:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1600468 If we are unable to read leases file (no matter what the reason is), we return 0 - just like if there were no leases. However, because we use virFileReadAll() an error is printed into the log. Note that not all networks have leases file - only those for which we start dnsmasq. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/network/bridge_driver.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a7826e9b63..5839021caf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4235,13 +4235,20 @@ networkGetDHCPLeases(virNetworkPtr net, custom_lease_file =3D networkDnsmasqLeaseFileNameCustom(driver, def->b= ridge); =20 /* Read entire contents */ - if ((custom_lease_file_len =3D virFileReadAll(custom_lease_file, - VIR_NETWORK_DHCP_LEASE_FIL= E_SIZE_MAX, - &lease_entries)) < 0) { - /* Even though src/network/leaseshelper.c guarantees the existence= of - * leases file (even if no leases are present), and the control re= aches - * here, instead of reporting error, return 0 leases */ - rv =3D 0; + if ((custom_lease_file_len =3D virFileReadAllQuiet(custom_lease_file, + VIR_NETWORK_DHCP_LEAS= E_FILE_SIZE_MAX, + &lease_entries)) < 0)= { + /* Not all networks are guaranteed to have leases file. + * Only those which run dnsmasq. Therefore, if we failed + * to read the leases file, don't report error. Return 0 + * leases instead. */ + if (errno !=3D ENOENT) { + virReportSystemError(errno, + _("Unable to read leases file: %s"), + custom_lease_file); + } else { + rv =3D 0; + } goto error; } =20 --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list