From patchwork Fri Mar 2 03:14:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 7044 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CC95F23EAE for ; Fri, 2 Mar 2012 03:14:13 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6788CA1845B for ; Fri, 2 Mar 2012 03:14:13 +0000 (UTC) Received: by iage36 with SMTP id e36so2311350iag.11 for ; Thu, 01 Mar 2012 19:14:12 -0800 (PST) Received: by 10.50.193.131 with SMTP id ho3mr250533igc.55.1330658052848; Thu, 01 Mar 2012 19:14:12 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.53.18 with SMTP id k18csp291ibg; Thu, 1 Mar 2012 19:14:12 -0800 (PST) Received: by 10.216.136.73 with SMTP id v51mr211774wei.15.1330658051565; Thu, 01 Mar 2012 19:14:11 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id e56si3197770wed.9.2012.03.01.19.14.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Mar 2012 19:14:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1S3Iwc-0006kY-T8 for ; Fri, 02 Mar 2012 03:14:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id CD140E15CF for ; Fri, 2 Mar 2012 03:14:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 238 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 238: add support for optionally including a job id in the process name as seen by top (Zygmunt) Message-Id: <20120302031410.2848.14227.launchpad@ackee.canonical.com> Date: Fri, 02 Mar 2012 03:14:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14886"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 994cc50448d326118b716554da5c65f26ba1e8e1 X-Gm-Message-State: ALoCoQnN8WseGxqqw4IMYVyqC0mdiJQvshZ4qRbFnQ+mGjLH15mJtQC/50Lq7XO6scya5Vu9Kdaz Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~zkrynicki/lava-dispatcher/fix-944088/+merge/95414 proposed by: Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 238 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Fri 2012-03-02 16:10:00 +1300 message: add support for optionally including a job id in the process name as seen by top (Zygmunt) modified: lava-dispatch lava_dispatcher/job.py --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava-dispatch' --- lava-dispatch 2011-12-01 15:12:02 +0000 +++ lava-dispatch 2012-03-01 17:10:04 +0000 @@ -24,7 +24,7 @@ import sys import logging.config -from linaro_json.schema import ValidationError +from json_schema_validator.errors import ValidationError from lava_dispatcher.job import LavaTestJob from lava_dispatcher.config import get_config @@ -39,6 +39,9 @@ parser.add_option( "--validate", action='store_true', help="Just validate the job file, do not execute any steps.") +parser.add_option( + "--job-id", action='store', default=None, + help="Set the scheduler job identifier. This alters process name for easier debugging") (options, args) = parser.parse_args() @@ -61,6 +64,16 @@ DATEFMT= '%Y-%m-%d %I:%M:%S %p' logging.basicConfig(format=FORMAT,datefmt=DATEFMT) +# Set process id if job-id was passed to dispatcher +if options.job_id: + try: + from setproctitle import getproctitle, setproctitle + except ImportError: + logging.warning("Unable to set import 'setproctitle', process name cannot be changed") + else: + setproctitle("%s [job: %s]" % (getproctitle(), options.job_id)) + + config = get_config("lava-dispatcher", options.config_dir) logging_level = config.get("LOGGING_LEVEL") logging.root.setLevel(int(logging_level)) === modified file 'lava_dispatcher/job.py' --- lava_dispatcher/job.py 2012-02-15 02:43:21 +0000 +++ lava_dispatcher/job.py 2012-03-01 16:17:19 +0000 @@ -23,7 +23,8 @@ import pexpect import traceback -from linaro_json.schema import Schema, Validator +from json_schema_validator.schema import Schema +from json_schema_validator.validator import Validator from lava_dispatcher.actions import get_all_cmds from lava_dispatcher.client.base import CriticalError, GeneralError