From: Amitay Isaacs <amitay@gmail.com>
Date: Fri, 25 Nov 2016 03:50:01 +0000 (+1100)
Subject: ctdb-daemon: Remove setting of debug_extra
X-Git-Tag: samba-4.6.0rc1~380
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=aaeef14ae5bba159f5527b96306f4d818ff91714;p=samba.git

ctdb-daemon: Remove setting of debug_extra

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c
index fed52ccb6c7..a05ec1a9c7d 100644
--- a/ctdb/server/ctdb_call.c
+++ b/ctdb/server/ctdb_call.c
@@ -1853,7 +1853,6 @@ int ctdb_start_revoke_ro_record(struct ctdb_context *ctdb, struct ctdb_db_contex
 	if (rc->child == 0) {
 		char c = 0;
 		close(rc->fd[0]);
-		debug_extra = talloc_asprintf(NULL, "revokechild-%s:", ctdb_db->db_name);
 
 		prctl_set_comment("ctdb_revokechild");
 		if (switch_from_server_to_client(ctdb) != 0) {
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c
index f0a427b30ed..738acb1167b 100644
--- a/ctdb/server/ctdb_monitor.c
+++ b/ctdb/server/ctdb_monitor.c
@@ -106,7 +106,6 @@ void ctdb_run_notification_script(struct ctdb_context *ctdb, const char *event)
 		int ret;
 
 		prctl_set_comment("ctdb_notification");
-		debug_extra = talloc_asprintf(NULL, "notification-%s:", event);
 		ret = ctdb_run_notification_script_child(ctdb, event);
 		if (ret != 0) {
 			DEBUG(DEBUG_ERR,(__location__ " Notification script failed\n"));
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 4251aef0bd4..40c2b5d1baa 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -3111,7 +3111,6 @@ int32_t ctdb_control_reload_public_ips(struct ctdb_context *ctdb, struct ctdb_re
 		signed char res = 0;
 
 		close(h->fd[0]);
-		debug_extra = talloc_asprintf(NULL, "reloadips:");
 
 		prctl_set_comment("ctdb_reloadips");
 		if (switch_from_server_to_client(ctdb) != 0) {
diff --git a/ctdb/server/ctdb_update_record.c b/ctdb/server/ctdb_update_record.c
index 63d1b5c1212..046e42f38a9 100644
--- a/ctdb/server/ctdb_update_record.c
+++ b/ctdb/server/ctdb_update_record.c
@@ -268,7 +268,6 @@ static struct childwrite_handle *ctdb_childwrite(
 
 		close(result->fd[0]);
 		prctl_set_comment("ctdb_write_persistent");
-		debug_extra = talloc_asprintf(NULL, "childwrite-%s:", ctdb_db->db_name);
 		ret = ctdb_persistent_store(state);
 		if (ret != 0) {
 			DEBUG(DEBUG_ERR, (__location__ " Failed to write persistent data\n"));