partition: Leave metadata.tdb unlocking until last

With the lmdb patches, I have cleanly observed the database being read
in between the commit of the metadata.tdb and the eventual commits of
the individual partitions.

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 2cb05f9ef3a7e2b11832dd1dc51ce81038e83e34..422ed369ff55ab7d2fea78d424534925f18c33bf 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -976,10 +976,6 @@ int partition_end_trans(struct ldb_module *module)
                data->in_transaction--;
        }
 
-       ret2 = partition_metadata_end_trans(module);
-       if (ret2 != LDB_SUCCESS) {
-               ret = ret2;
-       }
 
        for (i=0; data && data->partitions && data->partitions[i]; i++) {
                if ((module && ldb_module_flags(ldb_module_get_ctx(module)) & LDB_FLG_ENABLE_TRACING)) {
@@ -1002,6 +998,12 @@ int partition_end_trans(struct ldb_module *module)
        if (ret2 != LDB_SUCCESS) {
                ret = ret2;
        }
+
+       ret2 = partition_metadata_end_trans(module);
+       if (ret2 != LDB_SUCCESS) {
+               ret = ret2;
+       }
+
        return ret;
 }
 
@@ -1012,10 +1014,6 @@ int partition_del_trans(struct ldb_module *module)
        unsigned int i;
        struct partition_private_data *data = talloc_get_type(ldb_module_get_private(module),
                                                              struct partition_private_data);
-       ret = partition_metadata_del_trans(module);
-       if (ret != LDB_SUCCESS) {
-               final_ret = ret;
-       }
 
        for (i=0; data && data->partitions && data->partitions[i]; i++) {
                if ((module && ldb_module_flags(ldb_module_get_ctx(module)) & LDB_FLG_ENABLE_TRACING)) {
@@ -1044,6 +1042,12 @@ int partition_del_trans(struct ldb_module *module)
        if (ret != LDB_SUCCESS) {
                final_ret = ret;
        }
+
+       ret = partition_metadata_del_trans(module);
+       if (ret != LDB_SUCCESS) {
+               final_ret = ret;
+       }
+
        return final_ret;
 }