init script bug with multiple clusters

init script bug with multiple clusters

[Amon Ott]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

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
-- 
Dr. Amon Ott
m-privacy GmbH           Tel: +49 30 24342334
Werner-Voß-Damm 62       Fax: +49 30 99296856
12101 Berlin             http://www.m-privacy.de

Amtsgericht Charlottenburg, HRB 84946

Geschäftsführer:
 Dipl.-Kfm. Holger Maczkowsky,
 Roman Maczkowsky

GnuPG-Key-ID: 0x2DD3A649


[-- Attachment #2: mprivacy-ceph-init.diff --]
[-- Type: text/x-patch, Size: 407 bytes --]

--- 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

Re: init script bug with multiple clusters

[Gregory Farnum]

This looks good to me, but we need an explicit sign-off from you for
it. If you can submit it as a PR on Github that's easiest for us, but
if not can you send it in git email patch form? :)
-Greg

On Wed, Apr 8, 2015 at 2:58 AM, Amon Ott <a.ott@m-privacy.de> wrote:
> 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
> --
> Dr. Amon Ott
> m-privacy GmbH           Tel: +49 30 24342334
> Werner-Voß-Damm 62       Fax: +49 30 99296856
> 12101 Berlin             http://www.m-privacy.de
>
> Amtsgericht Charlottenburg, HRB 84946
>
> Geschäftsführer:
>  Dipl.-Kfm. Holger Maczkowsky,
>  Roman Maczkowsky
>
> GnuPG-Key-ID: 0x2DD3A649
>
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: init script bug with multiple clusters

[Amon Ott]

[-- Attachment #1.1: Type: text/plain, Size: 696 bytes --]

Am 17.04.2015 um 03:01 schrieb Gregory Farnum:
> This looks good to me, but we need an explicit sign-off from you for
> it. If you can submit it as a PR on Github that's easiest for us, but
> if not can you send it in git email patch form? :)

Attached patch against next branch in git email form - hope this is as
expected. Our devel system cannot send mail directly.

Amon Ott
-- 
Dr. Amon Ott
m-privacy GmbH           Tel: +49 30 24342334
Werner-Voß-Damm 62       Fax: +49 30 99296856
12101 Berlin             http://www.m-privacy.de

Amtsgericht Charlottenburg, HRB 84946

Geschäftsführer:
 Dipl.-Kfm. Holger Maczkowsky,
 Roman Maczkowsky

GnuPG-Key-ID: 0x2DD3A649


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-init-script-bug-with-multiple-clusters.patch --]
[-- Type: text/x-patch; name="0001-init-script-bug-with-multiple-clusters.patch", Size: 995 bytes --]

From 1e4d9f4fcd688fcbe275f2cff55b272dfeec2e45 Mon Sep 17 00:00:00 2001
From: Amon Ott <a.ott@m-privacy.de>
Date: Fri, 17 Apr 2015 08:42:58 +0200
Subject: [PATCH] init script bug with multiple clusters 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: add "$cluster-" as
 usual.

Signed-off-by: Amon Ott <a.ott@m-privacy.de>
---
 src/init-ceph.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 2ff98c7..d88ca58 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -227,7 +227,7 @@ for name in $what; do
 
     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
-- 
1.7.10.4


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: init script bug with multiple clusters

[Gregory Farnum]

On Thu, Apr 16, 2015 at 11:58 PM, Amon Ott <a.ott@m-privacy.de> wrote:
> Am 17.04.2015 um 03:01 schrieb Gregory Farnum:
>> This looks good to me, but we need an explicit sign-off from you for
>> it. If you can submit it as a PR on Github that's easiest for us, but
>> if not can you send it in git email patch form? :)
>
> Attached patch against next branch in git email form - hope this is as
> expected. Our devel system cannot send mail directly.

Yep, thanks! And sorry about the delay. I've set up a PR at
https://github.com/ceph/ceph/pull/4437 to make sure it gets reviewed
by somebody else with a little more of an eye on the init scripts;
should go in soon. :)
-Greg