From patchwork Tue Dec 13 05:29:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Ren X-Patchwork-Id: 9471787 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D012A60760 for ; Tue, 13 Dec 2016 05:31:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1D9A28528 for ; Tue, 13 Dec 2016 05:31:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6EA128542; Tue, 13 Dec 2016 05:31:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4526B28528 for ; Tue, 13 Dec 2016 05:31:51 +0000 (UTC) Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uBD5VGUi012838 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Dec 2016 05:31:17 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id uBD5VGGm009943 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Dec 2016 05:31:16 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1cGfgK-0007y4-HM; Mon, 12 Dec 2016 21:31:16 -0800 Received: from userv0022.oracle.com ([156.151.31.74]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1cGfft-0007qr-AW; Mon, 12 Dec 2016 21:30:49 -0800 Received: from aserp1020.oracle.com (aserp1020.oracle.com [141.146.126.67]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id uBD5UmcT024325 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Dec 2016 05:30:49 GMT Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by aserp1020.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uBD5UmsO019056 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 13 Dec 2016 05:30:48 GMT Received: from pps.filterd (userp2030.oracle.com [127.0.0.1]) by userp2030.oracle.com (8.16.0.17/8.16.0.17) with SMTP id uBD5RM8U011869; Tue, 13 Dec 2016 05:30:48 GMT Authentication-Results: oracle.com; spf=pass smtp.mailfrom=zren@suse.com Received: from prv3-mh.provo.novell.com (prv3-mh.provo.novell.com [137.65.250.26]) by userp2030.oracle.com with ESMTP id 278b21rkd9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2016 05:30:47 +0000 Received: from laptop.apac.novell.com (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by prv3-mh.provo.novell.com with ESMTP (TLS encrypted); Mon, 12 Dec 2016 22:30:36 -0700 From: Eric Ren To: ocfs2-test-devel@oss.oracle.com Date: Tue, 13 Dec 2016 13:29:26 +0800 Message-Id: <1481606975-13186-9-git-send-email-zren@suse.com> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1481606975-13186-1-git-send-email-zren@suse.com> References: <1481606975-13186-1-git-send-email-zren@suse.com> X-PDR: PASS X-ServerName: prv3-mh.provo.novell.com X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:microfocus.com ~all X-Proofpoint-Virus-Version: vendor=nai engine=5800 definitions=8377 signatures=670775 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1612130094 Cc: ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH 08/17] multiple node: pass cross_delete the right log file X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: aserv0021.oracle.com [141.146.126.233] X-Virus-Scanned: ClamAV using ClamSMTP Pass cross_delete the right log file. However, openmpi should log into config.LOGFILE, because other remote nodes only have this common log file. Signed-off-by: Eric Ren --- programs/cross_delete/cross_delete.py | 4 ++-- programs/python_common/multiple_run.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cross_delete/cross_delete.py b/programs/cross_delete/cross_delete.py index ec3097c..1694d51 100755 --- a/programs/cross_delete/cross_delete.py +++ b/programs/cross_delete/cross_delete.py @@ -305,7 +305,7 @@ o2tf.OpenMPIInit(DEBUGON, ','.join(nodelist), logfile, 'ssh') cmdline = os.path.join(config.BINDIR, 'crdel_gen_files.py') ret = o2tf.openmpi_run( DEBUGON, nproc, str('%s -s %s -l %s -t %s' % \ (cmdline, stagedir, - options.logfile, + config.LOGFILE, tarfile) ), ','.join(nodelist), 'ssh', @@ -324,7 +324,7 @@ o2tf.OpenMPIInit(DEBUGON, ','.join(nodelist), logfile, 'ssh') else: cmdline = os.path.join(config.BINDIR, 'crdel_del_files.py') ret = o2tf.openmpi_run( DEBUGON, nproc, str('%s -s %s -l %s ' % \ - (cmdline, stagedir, options.logfile) ), + (cmdline, stagedir, config.LOGFILE) ), ','.join(nodelist), 'ssh', options.interface, diff --git a/programs/python_common/multiple_run.sh b/programs/python_common/multiple_run.sh index 4340c40..9e2237a 100755 --- a/programs/python_common/multiple_run.sh +++ b/programs/python_common/multiple_run.sh @@ -318,7 +318,7 @@ run_cross_delete_test() local workplace=${MOUNT_POINT}/cross_delete_test run_common_testcase "cross_delete" "sparse,unwritten,inline-data" \ -"${BINDIR}/cross_delete.py -c 1 -i ${INTERFACE} -d ${workplace} -n ${NODE_LIST} -t ${KERNELSRC}" +"${BINDIR}/cross_delete.py -c 1 -l ${logfile} -i ${INTERFACE} -d ${workplace} -n ${NODE_LIST} -t ${KERNELSRC}" } run_write_append_truncate_test()