Attachment 12840 Details for Bug 12513 – Patches for v4-6

[patch] Patches for v4-6

BZ12513-v4-6.patch (text/plain), 1.13 KB, created by Amitay Isaacs on 2017-01-17 23:26:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2017-01-17 23:26:30 UTC

Size: 1.13 KB

patch

obsolete

>From 49fb663d6e48e9c8a4759cc4c68bc877c798c6c2 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Fri, 13 Jan 2017 16:00:45 +1100
>Subject: [PATCH] ctdb-daemon: Remove stale eventd socket
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12513
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>
>Autobuild-User(master): Martin Schwenke <martins@samba.org>
>Autobuild-Date(master): Tue Jan 17 15:00:15 CET 2017 on sn-devel-144
>---
> ctdb/server/eventscript.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
>diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
>index decbaa8..22cd873 100644
>--- a/ctdb/server/eventscript.c
>+++ b/ctdb/server/eventscript.c
>@@ -171,6 +171,15 @@ int ctdb_start_eventd(struct ctdb_context *ctdb)
> 
> 	ectx = ctdb->ectx;
> 
>+	ret = unlink(ectx->socket);
>+	if (ret == 0) {
>+		D_WARNING("Removed stale eventd socket %s\n", ectx->socket);
>+	} else if (errno != ENOENT) {
>+		D_ERR("Failed to remove stale eventd socket %s\n",
>+		      ectx->socket);
>+		return -1;
>+	}
>+
> 	argv = talloc_array(ectx, const char *, 14);
> 	if (argv == NULL) {
> 		return -1;
>-- 
>2.9.3
>

Flags:

martins: review+

Actions: View

Attachments on bug 12513: 12840