From patchwork Wed Apr 8 09:58:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amon Ott X-Patchwork-Id: 6178051 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 666379F1C4 for ; Wed, 8 Apr 2015 10:04:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8121120357 for ; Wed, 8 Apr 2015 10:04:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A44F8200D9 for ; Wed, 8 Apr 2015 10:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751770AbbDHKEQ (ORCPT ); Wed, 8 Apr 2015 06:04:16 -0400 Received: from www.m-privacy.de ([85.214.155.129]:60627 "EHLO www.m-privacy.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751164AbbDHKEP (ORCPT ); Wed, 8 Apr 2015 06:04:15 -0400 X-Greylist: delayed 348 seconds by postgrey-1.27 at vger.kernel.org; Wed, 08 Apr 2015 06:04:15 EDT Received: from localhost (localhost [127.0.0.1]) by www.m-privacy.de (Postfix) with ESMTP id 81BD52400E1 for ; Wed, 8 Apr 2015 11:58:25 +0200 (CEST) Received: from www.m-privacy.de ([127.0.0.1]) by localhost (www.m-privacy.de [127.0.0.1]) (maiad, port 10024) with ESMTP id 15273-04 for ; Wed, 8 Apr 2015 11:58:19 +0200 (CEST) Received: from gw.compuniverse.de (f052212217.adsl.alicedsl.de [78.52.212.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by www.m-privacy.de (Postfix) with ESMTPSA id 615172400E0 for ; Wed, 8 Apr 2015 11:58:19 +0200 (CEST) Received: from [192.168.201.30] (tgham.compuniverse.de [192.168.201.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by gw.compuniverse.de (Postfix) with ESMTPS id 434198251C for ; Wed, 8 Apr 2015 11:58:18 +0200 (CEST) Message-ID: <5524FBB9.9070300@m-privacy.de> Date: Wed, 08 Apr 2015 11:58:17 +0200 From: Amon Ott User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:31.0) Gecko/20100101 Icedove/31.6.0 MIME-Version: 1.0 To: Ceph Development Subject: init script bug with multiple clusters X-Virus-Scanned: by Maia Mailguard 1.0.3.1524 (m-privacy) at m-privacy.de Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hello Ceph! The Ceph init script (src/init-ceph.in) creates pid files without cluster names. This means that only one cluster can run at a time. The solution is simple and works fine here, patch against 0.94 is attached. Amon Ott --- ceph-0.93/src/init-ceph.in 2015-02-27 19:47:15.000000000 +0100 +++ ceph-0.93/src/init-ceph.in.mp 2015-04-07 13:29:47.127067864 +0200 @@ -227,7 +237,7 @@ get_conf run_dir "/var/run/ceph" "run dir" - get_conf pid_file "$run_dir/$type.$id.pid" "pid file" + get_conf pid_file "$run_dir/$cluster-$type.$id.pid" "pid file" if [ "$command" = "start" ]; then if [ -n "$pid_file" ]; then