sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

dsdb: Provide a clearer error when we fail to store the sequence number in metadata.tdb

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett
2013-09-25 17:09:58 -07:00
committed by Stefan Metzmacher
parent d2ff474766
commit 6da2dcd17e
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source4/dsdb/samdb/ldb_modules/partition_metadata.c
View File

@ -129,9 +129,13 @@ static int partition_metadata_set_uint64(struct ldb_module *module,
} }
if (tdb_store(tdb, tdb_key, tdb_data, tdb_flag) != 0) { if (tdb_store(tdb, tdb_key, tdb_data, tdb_flag) != 0) {
int ret;
char *error_string = talloc_asprintf(tmp_ctx, "%s: tdb_store of key %s failed: %s",
tdb_name(tdb), key, tdb_errorstr(tdb));
ret = ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
error_string);
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR, return ret;
tdb_errorstr(tdb));
} }
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
@ -242,9 +246,11 @@ static int partition_metadata_open(struct ldb_module *module, bool create)
if (data->metadata->db == NULL) { if (data->metadata->db == NULL) {
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
if (create) { if (create) {
ldb_debug(ldb, LDB_DEBUG_ERROR, ldb_asprintf_errstring(ldb, "partition_metadata: Unable to create %s",
"partition_metadata: Unable to create %s", filename);
filename); } else {
ldb_asprintf_errstring(ldb, "partition_metadata: Unable to open %s",
filename);
} }
return LDB_ERR_OPERATIONS_ERROR; return LDB_ERR_OPERATIONS_ERROR;
} }
@ -295,9 +301,16 @@ int partition_metadata_init(struct ldb_module *module)
} }
/* metadata.tdb does not exist, create it */ /* metadata.tdb does not exist, create it */
DEBUG(2, ("partition_metadata: Migrating partition metadata\n")); DEBUG(2, ("partition_metadata: Migrating partition metadata: "
"open of metadata.tdb gave: %s\n",
ldb_errstring(ldb_module_get_ctx(module))));
ret = partition_metadata_open(module, true); ret = partition_metadata_open(module, true);
if (ret != LDB_SUCCESS) { if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb_module_get_ctx(module),
"partition_metadata: "
"Migrating partition metadata: "
"create of metadata.tdb gave: %s\n",
ldb_errstring(ldb_module_get_ctx(module)));
talloc_free(data->metadata); talloc_free(data->metadata);
data->metadata = NULL; data->metadata = NULL;
goto end; goto end;