From patchwork Tue Jun 15 12:15:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 1492159 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G46hw4lQ8z9sWX; Tue, 15 Jun 2021 22:15:28 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lt7yX-0004GT-3h; Tue, 15 Jun 2021 12:15:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lt7yV-0004GH-Bh for kernel-team@lists.ubuntu.com; Tue, 15 Jun 2021 12:15:23 +0000 Received: from mail-ed1-f70.google.com ([209.85.208.70]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lt7yV-0001fQ-3X for kernel-team@lists.ubuntu.com; Tue, 15 Jun 2021 12:15:23 +0000 Received: by mail-ed1-f70.google.com with SMTP id y18-20020a0564022712b029038ffac1995eso22223069edd.12 for ; Tue, 15 Jun 2021 05:15:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H6BzHGnAVhUePYHVgERrjcZBI4ip1TQLqmQ0AJ4Soog=; b=XZ0l0TpA9G7nHwr6LiZyoeBH6sUlx42GnV2UrZpoU+RTcWZLpAzNhWLfHKabxoXO/4 w7vGPbVSd1qfv4vFr0YdGhjUhMosT2D2UcZPvonnxnx4BRNHMimEc738rMilERAAAZmD eU4pCszS5ckUo13ROkx5HuUgguzSKYMoZbGiN5bfWf7zqyAqK+5Wi56Fi22WavmLpNSF to0s8IQYyNqv8zIFciZ3EmhKAn25gPc21Drvx3Zq7p2ga4gDrZoLdA/gBEQB5A81hTWs I9UR+B0zC/2SLP5F3N6xD/CVl1XcajthMWDc9Dsh2z66Q9QKejn8hXVHcXkHlloSV8ok 0U9Q== X-Gm-Message-State: AOAM533EiSvgRf2K7yKGq0mQohFZTSLsICnn8848lzN9zkKpvrkbu2PL uyJHD8QdOTY7K18aB4BjMg2OMjfXBo8d8SrVaqxyJTKw36w/RICgXg560BvgLGGrnjonHse/CQ7 tTanBymsWH7wZuPRgAfN/1/fgpOyh56cKCgrXEe4Q+g== X-Received: by 2002:a17:906:7d0:: with SMTP id m16mr20518008ejc.319.1623759322130; Tue, 15 Jun 2021 05:15:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZmdG3Pf0p1qoU7PuP/Xr9fFgxVFVlPJ6B6qSO53+R1VXrI1ASi920K2ndjcij8s6/eFCV7w== X-Received: by 2002:a17:906:7d0:: with SMTP id m16mr20517968ejc.319.1623759321817; Tue, 15 Jun 2021 05:15:21 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-177-222.adslplus.ch. [188.155.177.222]) by smtp.gmail.com with ESMTPSA id t17sm6730386edv.75.2021.06.15.05.15.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 05:15:21 -0700 (PDT) From: Krzysztof Kozlowski To: kernel-team@lists.ubuntu.com Subject: [ACT][PATCH] UBUNTU: SAUCE: ubuntu_lttng_smoke_test: adjust memory limit to fix OOM Date: Tue, 15 Jun 2021 14:15:17 +0200 Message-Id: <20210615121517.27517-1-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The test was failing on Azure Standard_B1ms instance due to OOM killer: utils:0153| [stdout] gcc: fatal error: Killed signal terminated program cc1 In journalctl: kernel: cc1 invoked oom-killer: gfp_mask=0x100cca(GFP_HIGHUSER_MOVABLE), order=0, oom_score_adj=0 ... kernel: Free swap = 0kB kernel: Total swap = 0kB kernel: 524174 pages RAM The test sets up a swap on low-memory machines, however the detected total memory on Standard_B1ms was 1.878 GB, so slightly below the 1.8 threshold and the swap was not setup. Bump the threshold to really higher value, so this lack of memory won't hit us. Setting up swap (when not needed) should not impact the test, except making setup() slightly slower. BugLink: https://bugs.launchpad.net/bugs/1847989 Signed-off-by: Krzysztof Kozlowski Acked-by: Po-Hsu Lin --- ubuntu_lttng_smoke_test/ubuntu_lttng_smoke_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu_lttng_smoke_test/ubuntu_lttng_smoke_test.py b/ubuntu_lttng_smoke_test/ubuntu_lttng_smoke_test.py index 434a5ac2e5b0..899d91652162 100755 --- a/ubuntu_lttng_smoke_test/ubuntu_lttng_smoke_test.py +++ b/ubuntu_lttng_smoke_test/ubuntu_lttng_smoke_test.py @@ -40,7 +40,7 @@ class ubuntu_lttng_smoke_test(test.test): df_gb = os.statvfs('/').f_bsize * os.statvfs('/').f_bavail / (1024.**3) cmd = 'swapon --show' swapon = utils.system_output(cmd) - if mem_gb < 1.8 and df_gb > 4.0 and swapon == '': + if mem_gb < 3.0 and df_gb > 4.0 and swapon == '': swap_file = '/tmp/swapfile' cmd = 'fallocate -l 2G %s' % swap_file utils.system(cmd)