Rev 290: the retry client code is no longer needed now that we use a freeze on recovery in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 290
revision-id: tridge at samba.org-20070512095555-59wxjjrspw50l8s9
parent: tridge at samba.org-20070512095518-py0kxx2oypiqunse
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Sat 2007-05-12 19:55:55 +1000
message:
  the retry client code is no longer needed now that we use a freeze on recovery
modified:
  common/ctdb_daemon.c           ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c	2007-05-12 08:08:50 +0000
+++ b/common/ctdb_daemon.c	2007-05-12 09:55:55 +0000
@@ -334,31 +334,10 @@
 }
 
 
-struct ctdb_client_retry {
-	struct ctdb_client *client;
-	struct ctdb_req_call *call;
-};
-
 static void daemon_request_call_from_client(struct ctdb_client *client, 
 					    struct ctdb_req_call *c);
 
 /*
-  triggered after a one second delay, retrying a client packet
-  that was deferred because of the daemon being in recovery mode
- */
-static void retry_client_packet(struct event_context *ev, struct timed_event *te, 
-				struct timeval t, void *private_data)
-{
-	struct ctdb_client_retry *retry = talloc_get_type(private_data, struct ctdb_client_retry);
-
-	daemon_request_call_from_client(retry->client, retry->call);
-
-	talloc_free(retry);
-}
-
-
-
-/*
   this is called when the ctdb daemon received a ctdb request call
   from a local client over the unix domain socket
  */
@@ -374,29 +353,6 @@
 	int ret;
 	struct ctdb_context *ctdb = client->ctdb;
 
-	if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL) {
-		struct ctdb_client_retry *retry;
-		
-		DEBUG(0,(__location__ " ctdb call %u from client"
-			 " while we are in recovery mode. Deferring it\n", 
-			 c->hdr.reqid)); 
-
-		/* hang the event and the structure off client */
-		retry = talloc(client, struct ctdb_client_retry);
-		CTDB_NO_MEMORY_VOID(ctdb, retry);
-		retry->client = client;
-		retry->call   = c;
-		
-		/* this ensures that after the retry happens we
-		   eventually free this request */
-		talloc_steal(retry, c);
-		
-		event_add_timed(ctdb->ev, retry, timeval_current_ofs(1,0), retry_client_packet, retry);
-		return;
-	}
-
-
-
 	ctdb->status.total_calls++;
 	ctdb->status.pending_calls++;