From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 006043858407 for ; Tue, 9 Jan 2024 22:10:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 006043858407 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 006043858407 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704838262; cv=none; b=Sr51T8BdsBJRIfMoVNcfGP9jtZS+KCfNH4k24cFxB8m6jEqhk9sfKpEuUoO7/xWdexHgRGgcpdwsRxW+92Om3WHHIn530lF5dy/6aG6jZdOKs2btD5PXheP1coNoRZZUzbVbzY89T9C1vsSpvlpzQjv5ZnfoOtux6OogLQojGlE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704838262; c=relaxed/simple; bh=vtMKfAfeoTYaEDAnImJiuJcs1VPhfz9ReKI2y0vLots=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=FsFKRR/I+DlEMq1YeY6HSnkh9i7iJsl+aWxDJw13DwtcSh3+Coj14PZEgvspuJECpVT3XUxJxqCZdgArMlLIe/f7RL971RrUBQS7k8DP+wx1dDAzKHPUhpveQgJWKKMkxQWBk1xbw88S5gDYl9CeHfowS6UztqHpNxD+eO6gYAk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from csb.redhat.com (deer0x03.wildebeest.org [172.31.17.133]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 4A9C3302BB42; Tue, 9 Jan 2024 23:10:58 +0100 (CET) Received: by csb.redhat.com (Postfix, from userid 10916) id 06F2BCB98D; Tue, 9 Jan 2024 23:10:58 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] JanitorConfigurator: Only keep logs for 6 weeks Date: Tue, 9 Jan 2024 23:10:54 +0100 Message-Id: <20240109221054.1094758-1-mark@klomp.org> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The logs are the biggest part of the sqlite database. Also add --progress_timeout=300 to the reload script. The default 30 seconds is too low when the buildbot is busy. --- SETUP | 2 +- builder/master.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SETUP b/SETUP index cd7149e..42ade11 100644 --- a/SETUP +++ b/SETUP @@ -66,7 +66,7 @@ buildbot stop /sourceware/builder/buildbot/builder - buildbot-reload.sh #!/bin/bash source /sourceware/builder/buildbot-env/bin/activate -buildbot reconfig /sourceware/builder/buildbot/builder +buildbot reconfig --progress_timeout=300 /sourceware/builder/buildbot/builder Use this in the systemd unit file /etc/systemd/system/buildbot.service diff --git a/builder/master.cfg b/builder/master.cfg index 3048fef..75fb312 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -5241,10 +5241,10 @@ c['revlink'] = revlinkmultiplexer import datetime -# configure a janitor which will delete all logs older than ~2.5 months, +# configure a janitor which will delete all logs older than ~1.5 months, # and will run on sundays at noon. c['configurators'] = [util.JanitorConfigurator( - logHorizon=datetime.timedelta(weeks=10), + logHorizon=datetime.timedelta(weeks=6), hour=12, dayOfWeek=6 )] -- 2.39.3