From bc4990e600c53433a924a0d70e3488a5a6bdc1ff Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 3 Feb 2011 17:47:36 +0100 Subject: [PATCH] vacuum: reduce indentation of the loop sending VACUUM_FETCH controls This slightly improves the code structure in that loop. --- server/ctdb_vacuum.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c index 2c643f72..aa7908fe 100644 --- a/server/ctdb_vacuum.c +++ b/server/ctdb_vacuum.c @@ -261,28 +261,33 @@ static int ctdb_vacuum_db(struct ctdb_db_context *ctdb_db, struct vacuum_data *v return -1; } + /* + * For records where we are not the lmaster, + * tell the lmaster to fetch the record. + */ for (i = 0; i < ctdb->num_nodes; i++) { - if (vdata->list[i]->count == 0) { + TDB_DATA data; + + if (ctdb->nodes[i]->pnn == ctdb->pnn) { continue; } - /* for records where we are not the lmaster, tell the lmaster to fetch the record */ - if (ctdb->nodes[i]->pnn != ctdb->pnn) { - TDB_DATA data; - DEBUG(DEBUG_INFO, - ("Found %u records for lmaster %u in '%s'\n", - vdata->list[i]->count, ctdb->nodes[i]->pnn, - name)); - - data.dsize = talloc_get_size(vdata->list[i]); - data.dptr = (void *)vdata->list[i]; - if (ctdb_client_send_message(ctdb, ctdb->nodes[i]->pnn, CTDB_SRVID_VACUUM_FETCH, data) != 0) { - DEBUG(DEBUG_ERR,(__location__ " Failed to send vacuum fetch message to %u\n", - ctdb->nodes[i]->pnn)); - return -1; - } + if (vdata->list[i]->count == 0) { continue; } + + DEBUG(DEBUG_INFO, ("Found %u records for lmaster %u in '%s'\n", + vdata->list[i]->count, ctdb->nodes[i]->pnn, + name)); + + data.dsize = talloc_get_size(vdata->list[i]); + data.dptr = (void *)vdata->list[i]; + if (ctdb_client_send_message(ctdb, ctdb->nodes[i]->pnn, CTDB_SRVID_VACUUM_FETCH, data) != 0) { + DEBUG(DEBUG_ERR, (__location__ " Failed to send vacuum " + "fetch message to %u\n", + ctdb->nodes[i]->pnn)); + return -1; + } } /* Process all records we can delete (if any) */ -- 2.34.1