server: Use the ctdb_ltdb_store_server() in the ctdb daemon for non-persistent dbs

This is realized by adding a ctdb_ltdb_store_fn function pointer to the db
context and filling it in the attach procedure for non-persistent dbs.

(This used to be ctdb commit df49ec44de80affa5ccc637dec12a20a26e8706e)

diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index 200cca41dc1c119fd866770607af463b8981f1a4..b5e586568cd379fc1735f2e3161f74dfb3ba3a02 100644 (file)
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -129,6 +129,10 @@ int ctdb_ltdb_store(struct ctdb_db_context *ctdb_db, TDB_DATA key,
        int ret;
        bool seqnum_suppressed = false;
 
+       if (ctdb_db->ctdb_ltdb_store_fn) {
+               return ctdb_db->ctdb_ltdb_store_fn(ctdb_db, key, header, data);
+       }
+
        if (ctdb->flags & CTDB_FLAG_TORTURE) {
                struct ctdb_ltdb_header *h2;
                rec = tdb_fetch(ctdb_db->ltdb->tdb, key);

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index e3f77e905eaede9a12cd36da9776127fcfd93556..396427bfa6c76eb21d692ecdece8d566b26d2df5 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -516,6 +516,11 @@ struct ctdb_db_context {
        struct lockwait_handle *lockwait_overflow;
        struct ctdb_persistent_state *persistent_state;
        struct trbt_tree *delete_queue;
+       int (*ctdb_ltdb_store_fn)(struct ctdb_db_context *ctdb_db,
+                                 TDB_DATA key,
+                                 struct ctdb_ltdb_header *header,
+                                 TDB_DATA data);
+
 };
 
 

diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index 8de6ad2f8ee83fe593072824a4ad8acc902168d9..c00a048246e02b5f991bf70add835984cc5ed0e3 100644 (file)
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -604,6 +604,8 @@ static int ctdb_local_attach(struct ctdb_context *ctdb, const char *db_name,
                if (ctdb_db->delete_queue == NULL) {
                        CTDB_NO_MEMORY(ctdb, ctdb_db->delete_queue);
                }
+
+               ctdb_db->ctdb_ltdb_store_fn = ctdb_ltdb_store_server;
        }
 
        /* check for hash collisions */