From patchwork Thu Nov 5 20:23:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 57936 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA5KNikD013665 for ; Thu, 5 Nov 2009 20:23:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758605AbZKEUXH (ORCPT ); Thu, 5 Nov 2009 15:23:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758588AbZKEUXF (ORCPT ); Thu, 5 Nov 2009 15:23:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29945 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758371AbZKEUXE (ORCPT ); Thu, 5 Nov 2009 15:23:04 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nA5KN5Br004507; Thu, 5 Nov 2009 15:23:06 -0500 Received: from localhost.localdomain (vpn-9-31.rdu.redhat.com [10.11.9.31]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nA5KN3Xs020378; Thu, 5 Nov 2009 15:23:04 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, jadmanski@google.com, Lucas Meneghel Rodrigues Subject: [PATCH] Make client behavior configurable: drop_caches Date: Thu, 5 Nov 2009 18:23:02 -0200 Message-Id: <1257452582-5586-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/client/bin/autotest b/client/bin/autotest index fe8f2c7..2d47843 100755 --- a/client/bin/autotest +++ b/client/bin/autotest @@ -6,6 +6,7 @@ import os, sys, shutil import common from optparse import OptionParser from autotest_lib.client.bin import job +from autotest_lib.client.common_lib import global_config # Use the name of the binary to find the real installation directory @@ -58,5 +59,9 @@ options, args = parser.parse_args() if len(args) != 1: usage() +drop_caches = global_config.global_config.get_config_value('CLIENT', + 'drop_caches', + type=bool) + # JOB: run the specified job control file. -job.runjob(os.path.realpath(args[0]), options) +job.runjob(os.path.realpath(args[0]), drop_caches, options) diff --git a/client/bin/job.py b/client/bin/job.py index ebfb3a3..6099188 100755 --- a/client/bin/job.py +++ b/client/bin/job.py @@ -15,6 +15,8 @@ from autotest_lib.client.bin import config, sysinfo, test, local_host from autotest_lib.client.bin import partition as partition_lib from autotest_lib.client.common_lib import error, barrier, log, logging_manager from autotest_lib.client.common_lib import base_packages, packages +from autotest_lib.client.common_lib import global_config + LAST_BOOT_TAG = object() NO_DEFAULT = object() @@ -251,7 +253,10 @@ class base_job(object): """ Perform the drop caches initialization. """ - self.drop_caches_between_iterations = True + self.drop_caches_between_iterations = ( + global_config.global_config.get_config_value('CLIENT', + 'drop_caches_between_iterations', + type=bool)) self.drop_caches = drop_caches if self.drop_caches: logging.debug("Dropping caches") @@ -1339,7 +1344,7 @@ class disk_usage_monitor: return decorator -def runjob(control, options): +def runjob(control, drop_caches, options): """ Run a job using the given control file. @@ -1367,7 +1372,7 @@ def runjob(control, options): if options.cont and not os.path.exists(state): raise error.JobComplete("all done") - myjob = job(control, options) + myjob = job(control=control, drop_caches=drop_caches, options=options) # Load in the users control file, may do any one of: # 1) execute in toto diff --git a/global_config.ini b/global_config.ini index cc20a96..d018374 100644 --- a/global_config.ini +++ b/global_config.ini @@ -28,7 +28,6 @@ parse_failed_repair_default: 0 # Autotest potential install paths client_autodir_paths: /usr/local/autotest,/home/autotest - [SERVER] hostname: autotest # Turn on RPC Logging @@ -48,6 +47,12 @@ smtp_port: smtp_user: smtp_password: +[CLIENT] +# Drop test client caches between every test execution +drop_caches: True +# Drop test client caches between every test iteration execution +drop_caches_between_iterations: True + [SCHEDULER] die_on_orphans: False enable_scheduler: True