From patchwork Tue Dec 13 05:29:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Ren X-Patchwork-Id: 9471793 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 CA91560760 for ; Tue, 13 Dec 2016 05:32:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCC5D284DC for ; Tue, 13 Dec 2016 05:32:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1A1F28537; Tue, 13 Dec 2016 05:32:02 +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 5AB31284DC for ; Tue, 13 Dec 2016 05:32:02 +0000 (UTC) Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uBD5VU02013075 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Dec 2016 05:31:31 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id uBD5VUUj023010 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Dec 2016 05:31:30 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 1cGfgY-00083g-Ef; Mon, 12 Dec 2016 21:31:30 -0800 Received: from userv0022.oracle.com ([156.151.31.74]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1cGfgQ-00080a-8D; Mon, 12 Dec 2016 21:31:22 -0800 Received: from userp1030.oracle.com (userp1030.oracle.com [156.151.31.80]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id uBD5VMSu025375 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Dec 2016 05:31:22 GMT Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89]) by userp1030.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uBD5VL3v020191 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 13 Dec 2016 05:31:21 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 uBD5RUfn011939; Tue, 13 Dec 2016 05:31:21 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 278b21rmc9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2016 05:31:21 +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:31:14 -0700 From: Eric Ren To: ocfs2-test-devel@oss.oracle.com Date: Tue, 13 Dec 2016 13:29:33 +0800 Message-Id: <1481606975-13186-16-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 15/17] Handle the case when a symbolic link device is given 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: aserv0022.oracle.com [141.146.126.234] X-Virus-Scanned: ClamAV using ClamSMTP It's a usual case that the shared disk is given in symbolic name, like iscsi disk "/dev/disk/by-path/disk". So work out the typical device name in such case. Signed-off-by: Eric Ren --- programs/discontig_bg_test/discontig_runner.sh | 5 +++++ programs/python_common/multiple_run.sh | 13 +++++++++++++ programs/python_common/single_run-WIP.sh | 6 ++++++ 3 files changed, 24 insertions(+) diff --git a/programs/discontig_bg_test/discontig_runner.sh b/programs/discontig_bg_test/discontig_runner.sh index 4c13adb..182ca3a 100755 --- a/programs/discontig_bg_test/discontig_runner.sh +++ b/programs/discontig_bg_test/discontig_runner.sh @@ -126,6 +126,11 @@ function f_setup() if [ -z "${DEVICE}" ];then f_usage fi + + # if a symbollink is given, work out the typical device name, like /dev/sda + if [ -L ${DEVICE} ];then + DEVICE=`readlink -f ${DEVICE}` + fi if [ -z "${MOUNT_POINT}" ];then f_usage diff --git a/programs/python_common/multiple_run.sh b/programs/python_common/multiple_run.sh index 74c3531..3e11abd 100755 --- a/programs/python_common/multiple_run.sh +++ b/programs/python_common/multiple_run.sh @@ -135,6 +135,19 @@ f_setup() f_getoptions $* + if [ -z ${DEVICE} ] ; then + ${ECHO} "ERROR: No device" + f_usage + elif [ ! -b ${DEVICE} ] ; then + ${ECHO} "ERROR: Invalid device ${DEVICE}" + exit 1 + fi + + # if a symbollink is given, work out the typical device name, like /dev/sda + if [ -L ${DEVICE} ];then + DEVICE=`readlink -f ${DEVICE}` + fi + if [ -z "${MOUNT_POINT}" ];then f_usage fi diff --git a/programs/python_common/single_run-WIP.sh b/programs/python_common/single_run-WIP.sh index 5c174f0..92d1216 100755 --- a/programs/python_common/single_run-WIP.sh +++ b/programs/python_common/single_run-WIP.sh @@ -1095,6 +1095,7 @@ do ?) usage;; esac done + if [ -z ${DEVICE} ] ; then ${ECHO} "ERROR: No device" usage @@ -1103,6 +1104,11 @@ elif [ ! -b ${DEVICE} ] ; then exit 1 fi +# if a symbollink is given, work out the typical device name, like /dev/sda +if [ -L ${DEVICE} ];then + DEVICE=`readlink -f ${DEVICE}` +fi + if [ -z ${MOUNTPOINT} ] ; then ${ECHO} "ERROR: No mountpoint" usage