Add back la-count based migration

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 5e0660457e48ac730e359496d30fa7608c863c2b..7103ef6d94ce4ff4f98de31362d4d8976e47e882 100644 (file)
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -72,7 +72,7 @@ struct ctdb_req_header *_ctdbd_allocate_pkt(struct ctdb_context *ctdb,
 */
 int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *call,
                    struct ctdb_ltdb_header *header, TALLOC_CTX *mem_ctx,
-                   TDB_DATA *data)
+                   TDB_DATA *data, uint32_t caller)
 {
        struct ctdb_call_info *c;
        struct ctdb_registered_call *fn;
@@ -106,7 +106,15 @@ int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *call,
        }
 
        /* we need to force the record to be written out if this was a remote access */
-       if (c->new_data == NULL) {
+       if (header->laccessor != caller) {
+               header->lacount = 0;
+       }
+       header->laccessor = caller;
+       header->lacount++;
+
+       /* we need to force the record to be written out if this was a remote access,
+          so that the lacount is updated */
+       if (c->new_data == NULL && header->laccessor != ctdb->pnn) {
                c->new_data = &c->record_data;
        }
 
@@ -361,7 +369,7 @@ static struct ctdb_client_call_state *ctdb_client_call_local_send(struct ctdb_db
        *(state->call) = *call;
        state->ctdb_db = ctdb_db;
 
-       ret = ctdb_call_local(ctdb_db, state->call, header, state, data);
+       ret = ctdb_call_local(ctdb_db, state->call, header, state, data, ctdb->pnn);
 
        return state;
 }

diff --git a/common/ctdb_ltdb.c b/common/ctdb_ltdb.c
index 3ee7fe83143e406b220ae7374cbbbdab2ad9dfb9..b0ab3e6b758d6c96fec5b4e0b842121072845702 100644 (file)
--- a/common/ctdb_ltdb.c
+++ b/common/ctdb_ltdb.c
@@ -66,6 +66,7 @@ static void ltdb_initial_header(struct ctdb_db_context *ctdb_db,
        /* initial dmaster is the lmaster */
        header->dmaster = ctdb_lmaster(ctdb_db->ctdb, &key);
        header->flags = CTDB_REC_FLAG_AUTOMATIC;
+       header->laccessor = header->dmaster;
 }
 
 

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 624aa7f95ac4528e4b9914cd625f32dc7c14b5f8..0eb3b6e462c77f1fd19619e648c480c7fabc0d97 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -123,6 +123,7 @@ struct ctdb_tunable {
        uint32_t lcp2_public_ip_assignment;
        uint32_t allow_client_db_attach;
        uint32_t fetch_lock_collapse;
+       uint32_t max_lacount;
 };
 
 /*
@@ -795,7 +796,7 @@ struct ctdb_call_state *ctdb_daemon_call_send_remote(struct ctdb_db_context *ctd
 
 int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *call,
                    struct ctdb_ltdb_header *header, TALLOC_CTX *mem_ctx,
-                   TDB_DATA *data);
+                   TDB_DATA *data, uint32_t caller);
 
 #define ctdb_reqid_find(ctdb, reqid, type)     (type *)_ctdb_reqid_find(ctdb, reqid, #type, __location__)
 

diff --git a/include/ctdb_protocol.h b/include/ctdb_protocol.h
index d0a9537783381d1216fdf059789d8ae77b4a97b9..be449c3687cc2be6b9b9b2d1e23f0513a13e0775 100644 (file)
--- a/include/ctdb_protocol.h
+++ b/include/ctdb_protocol.h
@@ -482,7 +482,8 @@ enum ctdb_trans2_commit_error {
 struct ctdb_ltdb_header {
        uint64_t rsn;
        uint32_t dmaster;
-       uint32_t reserved1;
+       uint16_t laccessor;
+       uint16_t lacount;
 #define CTDB_REC_FLAG_DEFAULT                  0x00000000
 #define CTDB_REC_FLAG_MIGRATED_WITH_DATA       0x00010000
 #define CTDB_REC_FLAG_VACUUM_MIGRATED          0x00020000

diff --git a/server/ctdb_call.c b/server/ctdb_call.c
index 0ea76bf44fdaac0f380a13b67a24ca7797f08b26..c6065710bec24552a68190dc085540992ee353ae 100644 (file)
--- a/server/ctdb_call.c
+++ b/server/ctdb_call.c
@@ -339,7 +339,7 @@ static void ctdb_become_dmaster(struct ctdb_db_context *ctdb_db,
                return;
        }
 
-       ctdb_call_local(ctdb_db, state->call, &header, state, &data);
+       ctdb_call_local(ctdb_db, state->call, &header, state, &data, ctdb->pnn);
 
        ret = ctdb_ltdb_unlock(ctdb_db, state->call->key);
        if (ret != 0) {
@@ -520,11 +520,15 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 
        CTDB_UPDATE_STAT(ctdb, max_hop_count, c->hopcount);
 
-       /* Try if possible to migrate the record off to the caller node.
-        * From the clients perspective a fetch of the data is just as 
-        * expensive as a migration.
-        */
-       if (c->hdr.srcnode != ctdb->pnn) {
+       /* if this nodes has done enough consecutive calls on the same record
+          then give them the record
+          or if the node requested an immediate migration
+       */
+       if ( c->hdr.srcnode != ctdb->pnn &&
+            ((header.laccessor == c->hdr.srcnode
+              && header.lacount >= ctdb->tunable.max_lacount
+              && ctdb->tunable.max_lacount != 0)
+             || (c->flags & CTDB_IMMEDIATE_MIGRATION)) ) {
                if (ctdb_db->transaction_active) {
                        DEBUG(DEBUG_INFO, (__location__ " refusing migration"
                              " of key %s while transaction is active\n",
@@ -543,7 +547,7 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
                }
        }
 
-       ctdb_call_local(ctdb_db, call, &header, hdr, &data);
+       ctdb_call_local(ctdb_db, call, &header, hdr, &data, c->hdr.srcnode);
 
        ret = ctdb_ltdb_unlock(ctdb_db, call->key);
        if (ret != 0) {
@@ -766,7 +770,7 @@ struct ctdb_call_state *ctdb_call_local_send(struct ctdb_db_context *ctdb_db,
        *(state->call) = *call;
        state->ctdb_db = ctdb_db;
 
-       ret = ctdb_call_local(ctdb_db, state->call, header, state, data);
+       ret = ctdb_call_local(ctdb_db, state->call, header, state, data, ctdb->pnn);
 
        event_add_timed(ctdb->ev, state, timeval_zero(), call_local_trigger, state);
 

diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index 56eadc5e20ef8e60e071135675435d2c0ef620dc..dfdb0a0f14c72c23e598e71813f992b65e422c38 100644 (file)
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -70,7 +70,8 @@ static const struct {
        { "StatHistoryInterval",  1,  offsetof(struct ctdb_tunable, stat_history_interval) },
        { "DeferredAttachTO",  120,  offsetof(struct ctdb_tunable, deferred_attach_timeout) },
        { "AllowClientDBAttach", 1, offsetof(struct ctdb_tunable, allow_client_db_attach) },
-       { "FetchLockCollapse", 1, offsetof(struct ctdb_tunable, fetch_lock_collapse) }
+       { "FetchLockCollapse", 1, offsetof(struct ctdb_tunable, fetch_lock_collapse) },
+       { "MaxLACount",           0,  offsetof(struct ctdb_tunable, max_lacount) },
 };
 
 /*