diff mbox

init script bug with multiple clusters

Message ID 5524FBB9.9070300@m-privacy.de (mailing list archive)
State New, archived
Headers show

Commit Message

Amon Ott April 8, 2015, 9:58 a.m. UTC
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

Comments

Gregory Farnum April 17, 2015, 1:01 a.m. UTC | #1
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
diff mbox

Patch

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