From patchwork Thu Oct 6 20:51:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 9365315 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 29F65600C8 for ; Thu, 6 Oct 2016 21:02:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1950C29245 for ; Thu, 6 Oct 2016 21:02:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DF6A29247; Thu, 6 Oct 2016 21:02:26 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 735AC29245 for ; Thu, 6 Oct 2016 21:02:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935158AbcJFVCY (ORCPT ); Thu, 6 Oct 2016 17:02:24 -0400 Received: from quartz.orcorp.ca ([184.70.90.242]:54129 "EHLO quartz.orcorp.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933376AbcJFVCX (ORCPT ); Thu, 6 Oct 2016 17:02:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=obsidianresearch.com; s=rsa1; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=V6dUTJQ7yYCHhi3p4Eoozeta3daVCOM5USk7hRNv+no=; b=PcNAIVC3K+Vtg67t4dUeTefAXE6zuRWUbFTRnLnkzFhPX/iw5zOnlVOOjPeCStT66CvcBy7F8torbJ25ZJLUUW5k23QXlqZwxE/9l29cZ/Wg0dq2eyQRxARgRAWMKWo/+ZibbtDf+81cauk6R7FW+ZNLvWLdK/YEMHMnyE3PRFE=; Received: from [10.0.0.151] (helo=jggl.edm.orcorp.ca) by quartz.orcorp.ca with esmtps (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1bsFdq-000839-9j; Thu, 06 Oct 2016 14:51:46 -0600 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Bart Van Assche Subject: [PATCH rdma-core 16/17] srp_daemon: Add the debian initscripts as an option Date: Thu, 6 Oct 2016 14:51:42 -0600 Message-Id: <1475787103-13283-17-git-send-email-jgunthorpe@obsidianresearch.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1475787103-13283-1-git-send-email-jgunthorpe@obsidianresearch.com> References: <1475787103-13283-1-git-send-email-jgunthorpe@obsidianresearch.com> X-Broken-Reverse-DNS: no host name found for IP address 10.0.0.151 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Necessary to reproduce the Debian packaging. Signed-off-by: Jason Gunthorpe --- CMakeLists.txt | 3 ++ debian/srptools.default | 14 ++++++++ debian/srptools.init | 89 +++++++++++++++++++++++++++++++++++++++++++++++ srp_daemon/CMakeLists.txt | 29 ++++++++++----- 4 files changed, 126 insertions(+), 9 deletions(-) create mode 100644 debian/srptools.default create mode 100644 debian/srptools.init diff --git a/CMakeLists.txt b/CMakeLists.txt index 64f9797c980c..b0864da660fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,9 @@ else() set(CMAKE_INSTALL_FULL_RUNDIR "${CMAKE_INSTALL_RUNDIR}") endif() +set(DISTRO_FLAVOUR "None" CACHE + STRING "Flavour of distribution to install for. This primarily impacts the init.d scripts installed.") + #------------------------- # Load CMake components set(BUILDLIB "${CMAKE_SOURCE_DIR}/buildlib") diff --git a/debian/srptools.default b/debian/srptools.default new file mode 100644 index 000000000000..81e84f4a5cba --- /dev/null +++ b/debian/srptools.default @@ -0,0 +1,14 @@ +#How often should srpdeamon rescan the fabric (seconds) +RETRIES=60 + +#Where should srp-deamon log to +LOG=/var/log/srp_daemon.log + +# What ports should srp-deamon be started on. +# Format is CA:port +# ALL or NONE will run on all ports on none +# respectively + +PORTS=NONE +#PORTS=ALL +#PORTS="mthca0:1 mlx4_0:2" diff --git a/debian/srptools.init b/debian/srptools.init new file mode 100644 index 000000000000..2c1a140ccbc3 --- /dev/null +++ b/debian/srptools.init @@ -0,0 +1,89 @@ +#!/bin/bash +### BEGIN INIT INFO +# Provides: srptools +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Discovers SRP scsi targets. +# Description: Discovers SRP scsi over infiniband targets. +### END INIT INFO + +[ -x /usr/sbin/srp_daemon ] || exit 0 + +IBDIR=/sys/class/infiniband + +PORTS="" +RETRIES="" +LOG="" + +[ -f /etc/default/srptools ] && . /etc/default/srptools + +start_daemon () { + +if [ "$PORTS" = "NONE" ] ; then +echo "srptools disabled." +exit 0 +fi + + +if [ "$PORTS" = "ALL" ] ; then + for HCA_ID in `/bin/ls -1 ${IBDIR}` + do + for PORT in `/bin/ls -1 ${IBDIR}/${HCA_ID}/ports/` + do + run_daemon + done + done +fi + + +for ADAPTER in $PORTS ; do + HCA_ID=`echo $ADAPTER | awk -F: '{print $1}'` + PORT=`echo $ADAPTER | awk -F: '{print $2}'` + run_daemon +done +} + + +run_daemon() { +# SRP deamon wedges if we start it on a port which is not up + + STATUS=`/usr/sbin/ibstat $HCA_ID $PORT | grep "State:"` + + if [ "$STATUS" = "State: Active" ] ; then + echo "Starting srp on $HCA_ID $PORT" + +# srp does not background itself; using the start-stop-daemon background function +# causes us to lose stdout, which is where it logs to + nohup start-stop-daemon --start --quiet -m --pidfile /var/run/srp_daemon.${HCA_ID}.${PORT} \ + --exec /usr/sbin/srp_daemon -- -e -c -n -i ${HCA_ID} -p ${PORT} -R ${RETRIES} >> $LOG 2>&1 & + RETVAL=$? + fi +} + +stop_daemon () { + for HCA_ID in `/bin/ls -1 ${IBDIR}` + do + for PORT in `/bin/ls -1 ${IBDIR}/${HCA_ID}/ports/` + do + start-stop-daemon --stop --quiet --oknodo -m --pidfile /var/run/srp_daemon.${HCA_ID}.${PORT} + RETVAL=$? + done + done +} + + +case "$1" in + +start) +start_daemon +;; +stop) +stop_daemon +;; +restart | reload | force-reload ) +stop_daemon +start_daemon +;; +esac diff --git a/srp_daemon/CMakeLists.txt b/srp_daemon/CMakeLists.txt index 48497bcd6009..f2752a8e6e15 100644 --- a/srp_daemon/CMakeLists.txt +++ b/srp_daemon/CMakeLists.txt @@ -28,12 +28,23 @@ install(FILES logrotate-srp_daemon DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/logr install(FILES rsyslog-srp_daemon.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/rsyslog.d" RENAME "srp_daemon.conf") install(FILES srp_daemon.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}") -# FIXME: The ib init.d file should really be included in rdma-core as well. -set(RDMA_SERVICE "openibd" CACHE STRING "init.d file service name to order srpd after") -# NOTE: These defaults are for CentOS, packagers should override. -set(SRP_DEFAULT_START "2 3 4 5" CACHE STRING "Default-Start service data for srpd") -set(SRP_DEFAULT_STOP "0 1 6" CACHE STRING "Default-Stop service data for srpd") -configure_file(srpd.in "${CMAKE_CURRENT_BINARY_DIR}/srpd") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/srpd" - DESTINATION "${CMAKE_INSTALL_INITDDIR}" - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) +if ("${DISTRO_FLAVOUR}" STREQUAL "Debian") + # Debian version of the initscript system + install(FILES "../debian/srptools.init" + DESTINATION "${CMAKE_INSTALL_INITDDIR}" + RENAME "srptools" + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) + install(FILES "../debian/srptools.default" + DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/default/" + RENAME "srptools") +else() + # FIXME: The ib init.d file should really be included in rdma-core as well. + set(RDMA_SERVICE "openibd" CACHE STRING "init.d file service name to order srpd after") + # NOTE: These defaults are for CentOS, packagers should override. + set(SRP_DEFAULT_START "2 3 4 5" CACHE STRING "Default-Start service data for srpd") + set(SRP_DEFAULT_STOP "0 1 6" CACHE STRING "Default-Stop service data for srpd") + configure_file(srpd.in "${CMAKE_CURRENT_BINARY_DIR}/srpd") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/srpd" + DESTINATION "${CMAKE_INSTALL_INITDDIR}" + PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) +endif()