From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13053 invoked by alias); 27 Aug 2008 19:49:40 -0000 Received: (qmail 13046 invoked by alias); 27 Aug 2008 19:49:40 -0000 X-Spam-Status: No, hits=-0.9 required=5.0 tests=BAYES_05,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: RHEL5 - clogd: Optimization - ACK 'clear region' request before sending to cluster To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 29b4608b93abf8517b735c9c7065c96f8be1c529 X-Git-Newrev: d437c7e1272941498e90d8ab939ca91b530f5d1f From: Jonathan Brassow Message-Id: <20080827194837.AA3B812036B@lists.fedorahosted.org> Date: Thu, 28 Aug 2008 07:34:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00340.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d437c7e1272941498e90d8ab939ca91b530f5d1f Commit: d437c7e1272941498e90d8ab939ca91b530f5d1f Parent: 29b4608b93abf8517b735c9c7065c96f8be1c529 Author: Jonathan Brassow AuthorDate: Wed Aug 27 14:48:04 2008 -0500 Committer: Jonathan Brassow CommitterDate: Wed Aug 27 14:48:04 2008 -0500 clogd: Optimization - ACK 'clear region' request before sending to cluster Make CLEAR_REGION requests (a often issued request) faster. --- cmirror/src/cluster.c | 3 ++- cmirror/src/local.c | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/cmirror/src/cluster.c b/cmirror/src/cluster.c index 68ffefb..be8a5b9 100644 --- a/cmirror/src/cluster.c +++ b/cmirror/src/cluster.c @@ -177,7 +177,8 @@ static int handle_cluster_request(struct clog_tfr *tfr, int server, int printz) (tfr->originator == my_cluster_id)) r = do_request(tfr, server); - if (server) { + if (server && + (tfr->request_type != DM_CLOG_CLEAR_REGION)) { tfr->request_type |= DM_CLOG_RESPONSE; /* diff --git a/cmirror/src/local.c b/cmirror/src/local.c index 0a65870..aa5b6e7 100644 --- a/cmirror/src/local.c +++ b/cmirror/src/local.c @@ -258,7 +258,6 @@ static int do_local_work(void *data) case DM_CLOG_IS_CLEAN: case DM_CLOG_FLUSH: case DM_CLOG_MARK_REGION: - case DM_CLOG_CLEAR_REGION: case DM_CLOG_GET_RESYNC_WORK: case DM_CLOG_SET_REGION_SYNC: case DM_CLOG_IS_REMOTE_RECOVERING: @@ -280,6 +279,23 @@ static int do_local_work(void *data) } break; + case DM_CLOG_CLEAR_REGION: + r = kernel_ack(tfr->seq, 0); + + r = cluster_send(tfr); + if (r) { + LOG_ERROR("[%s] Unable to send %s to cluster: %s", + SHORT_UUID(tfr->uuid), + RQ_TYPE(tfr->request_type), strerror(-r)); + /* + * FIXME: store error for delivery on flush + * This would allow us to optimize MARK_REGION + * too. + */ + } + queue_add_tail(tfr, free_queue); + + break; case DM_CLOG_GET_REGION_SIZE: default: LOG_ERROR("Invalid log request received, ignoring.");