mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

[master] Fix LMDB support on OpenBSD; clean up and refactor LMDB-related code

Browse Source 
4835.	[cleanup]	Clean up and refactor LMDB-related code. [RT #46718]

4834.	[port]		Fix LMDB support on OpenBSD. [RT #46718]
This commit is contained in:
Michał Kępień 2017-11-30 13:43:46 +01:00
parent dc66c4a49c
commit 2c20fc0d13
5 changed files with 245 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,3 +1,7 @@
4835. [cleanup] Clean up and refactor LMDB-related code. [RT #46718]
4834. [port] Fix LMDB support on OpenBSD. [RT #46718]
4833. [bug] isc_event_free should check that the event is not 4833. [bug] isc_event_free should check that the event is not
linked when called. [RT #46725] linked when called. [RT #46725]

317
bin/named/server.c
View File

@ -7333,18 +7333,128 @@ data_to_cfg(dns_view_t *view, MDB_val *key, MDB_val *data,
return (result); return (result);
} }
/*%
* Prototype for a callback which can be used with for_all_newzone_cfgs().
*/
typedef isc_result_t (*newzone_cfg_cb_t)(const cfg_obj_t *zconfig,
cfg_obj_t *config, cfg_obj_t *vconfig,
isc_mem_t *mctx, dns_view_t *view,
cfg_aclconfctx_t *actx);
/*%
* For each zone found in a NZD opened by the caller, create an object
* representing its configuration and invoke "callback" with the created
* object, "config", "vconfig", "mctx", "view" and "actx" as arguments (all
* these are non-global variables required to invoke configure_zone()).
* Immediately interrupt processing if an error is encountered while
* transforming NZD data into a zone configuration object or if "callback"
* returns an error.
*/
static isc_result_t
for_all_newzone_cfgs(newzone_cfg_cb_t callback, cfg_obj_t *config,
cfg_obj_t *vconfig, isc_mem_t *mctx, dns_view_t *view,
cfg_aclconfctx_t *actx, MDB_txn *txn, MDB_dbi dbi)
{
const cfg_obj_t *zconfig, *zlist = NULL;
isc_result_t result = ISC_R_SUCCESS;
cfg_obj_t *zconfigobj = NULL;
isc_buffer_t *text = NULL;
MDB_cursor *cursor = NULL;
MDB_val data, key;
int status;
status = mdb_cursor_open(txn, dbi, &cursor);
if (status != MDB_SUCCESS) {
return (ISC_R_FAILURE);
}
for (status = mdb_cursor_get(cursor, &key, &data, MDB_FIRST);
status == MDB_SUCCESS;
status = mdb_cursor_get(cursor, &key, &data, MDB_NEXT))
{
/*
* Create a configuration object from data fetched from NZD.
*/
result = data_to_cfg(view, &key, &data, &text, &zconfigobj);
if (result != ISC_R_SUCCESS) {
break;
}
/*
* Extract zone configuration from configuration object.
*/
result = cfg_map_get(zconfigobj, "zone", &zlist);
if (result != ISC_R_SUCCESS) {
break;
} else if (!cfg_obj_islist(zlist)) {
result = ISC_R_FAILURE;
break;
}
zconfig = cfg_listelt_value(cfg_list_first(zlist));
/*
* Invoke callback.
*/
result = callback(zconfig, config, vconfig, mctx, view, actx);
if (result != ISC_R_SUCCESS) {
break;
}
/*
* Destroy the configuration object created in this iteration.
*/
cfg_obj_destroy(named_g_addparser, &zconfigobj);
}
if (text != NULL) {
isc_buffer_free(&text);
}
if (zconfigobj != NULL) {
cfg_obj_destroy(named_g_addparser, &zconfigobj);
}
mdb_cursor_close(cursor);
return (result);
}
/*%
* Attempt to configure a zone found in NZD and return the result.
*/
static isc_result_t
configure_newzone(const cfg_obj_t *zconfig, cfg_obj_t *config,
cfg_obj_t *vconfig, isc_mem_t *mctx, dns_view_t *view,
cfg_aclconfctx_t *actx)
{
return (configure_zone(config, zconfig, vconfig, mctx, view,
&named_g_server->viewlist, actx, ISC_TRUE,
ISC_FALSE, ISC_FALSE));
}
/*%
* Revert new view assignment for a zone found in NZD.
*/
static isc_result_t
configure_newzone_revert(const cfg_obj_t *zconfig, cfg_obj_t *config,
cfg_obj_t *vconfig, isc_mem_t *mctx, dns_view_t *view,
cfg_aclconfctx_t *actx)
{
UNUSED(config);
UNUSED(vconfig);
UNUSED(mctx);
UNUSED(actx);
configure_zone_setviewcommit(ISC_R_FAILURE, zconfig, view);
return (ISC_R_SUCCESS);
}
static isc_result_t static isc_result_t
configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
isc_mem_t *mctx, cfg_aclconfctx_t *actx) isc_mem_t *mctx, cfg_aclconfctx_t *actx)
{ {
isc_result_t result = ISC_R_SUCCESS; isc_result_t result;
int status;
isc_buffer_t *text = NULL;
cfg_obj_t *zoneconf = NULL;
MDB_cursor *cursor = NULL;
MDB_txn *txn = NULL; MDB_txn *txn = NULL;
MDB_dbi dbi; MDB_dbi dbi;
MDB_val key, data;
if (view->new_zone_config == NULL) { if (view->new_zone_config == NULL) {
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
@ -7361,82 +7471,22 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
"for view '%s'", "for view '%s'",
view->new_zone_db, view->name); view->new_zone_db, view->name);
status = mdb_cursor_open(txn, dbi, &cursor); result = for_all_newzone_cfgs(configure_newzone, config, vconfig, mctx,
if (status != 0) { view, actx, txn, dbi);
result = ISC_R_FAILURE;
goto cleanup;
}
while (mdb_cursor_get(cursor, &key, &data, MDB_NEXT) == 0) {
const cfg_obj_t *zlist = NULL;
const cfg_obj_t *zoneobj = NULL;
result = data_to_cfg(view, &key, &data, &text, &zoneconf);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
goto cleanup; /*
* An error was encountered while attempting to configure zones
* found in NZD. As this error may have been caused by a
* configure_zone() failure, try restoring a sane configuration
* by reattaching all zones found in NZD to the old view. If
* this also fails, too bad, there is nothing more we can do in
* terms of trying to make things right.
*/
(void) for_all_newzone_cfgs(configure_newzone_revert, config,
vconfig, mctx, view, actx, txn,
dbi);
} }
CHECK(cfg_map_get(zoneconf, "zone", &zlist));
if (!cfg_obj_islist(zlist)) {
CHECK(ISC_R_FAILURE);
}
zoneobj = cfg_listelt_value(cfg_list_first(zlist));
CHECK(configure_zone(config, zoneobj, vconfig, mctx,
view, &named_g_server->viewlist, actx,
ISC_TRUE, ISC_FALSE, ISC_FALSE));
cfg_obj_destroy(named_g_addparser, &zoneconf);
}
result = ISC_R_SUCCESS;
cleanup:
if (zoneconf != NULL) {
cfg_obj_destroy(named_g_addparser, &zoneconf);
}
if (cursor != NULL) {
mdb_cursor_close(cursor);
cursor = NULL;
}
if (result != ISC_R_SUCCESS) {
status = mdb_cursor_open(txn, dbi, &cursor);
if (status != 0) {
goto cleanup2;
}
while (mdb_cursor_get(cursor, &key, &data, MDB_NEXT) == 0) {
const cfg_obj_t *zlist = NULL;
const cfg_obj_t *zconfig = NULL;
isc_result_t result2;
result2 = data_to_cfg(view, &key, &data, &text,
&zoneconf);
if (result2 != ISC_R_SUCCESS) {
goto cleanup2;
}
result2 = cfg_map_get(zoneconf, "zone", &zlist);
if (result2 != ISC_R_SUCCESS) {
goto cleanup2;
}
zconfig = cfg_listelt_value(cfg_list_first(zlist));
configure_zone_setviewcommit(result, zconfig, view);
cfg_obj_destroy(named_g_addparser, &zoneconf);
}
}
cleanup2:
if (text != NULL) {
isc_buffer_free(&text);
}
if (zoneconf != NULL) {
cfg_obj_destroy(named_g_addparser, &zoneconf);
}
if (cursor != NULL) {
mdb_cursor_close(cursor);
}
(void) nzd_close(&txn, ISC_FALSE); (void) nzd_close(&txn, ISC_FALSE);
return (result); return (result);
} }
@ -7480,8 +7530,9 @@ get_newzone_config(dns_view_t *view, const char *zonename,
key.mv_size = strlen(zname); key.mv_size = strlen(zname);
status = mdb_get(txn, dbi, &key, &data); status = mdb_get(txn, dbi, &key, &data);
if (status != 0) if (status != MDB_SUCCESS) {
CHECK(ISC_R_FAILURE); CHECK(ISC_R_FAILURE);
}
CHECK(data_to_cfg(view, &key, &data, &text, &zoneconf)); CHECK(data_to_cfg(view, &key, &data, &text, &zoneconf));
@ -7492,10 +7543,12 @@ get_newzone_config(dns_view_t *view, const char *zonename,
cleanup: cleanup:
(void) nzd_close(&txn, ISC_FALSE); (void) nzd_close(&txn, ISC_FALSE);
if (zoneconf != NULL) if (zoneconf != NULL) {
cfg_obj_destroy(named_g_addparser, &zoneconf); cfg_obj_destroy(named_g_addparser, &zoneconf);
if (text != NULL) }
if (text != NULL) {
isc_buffer_free(&text); isc_buffer_free(&text);
}
return (result); return (result);
} }
@ -11853,7 +11906,7 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone,
if (zconfig == NULL) { if (zconfig == NULL) {
/* We're deleting the zone from the database */ /* We're deleting the zone from the database */
status = mdb_del(*txnp, dbi, &key, NULL); status = mdb_del(*txnp, dbi, &key, NULL);
if (status != 0 && status != MDB_NOTFOUND) { if (status != MDB_SUCCESS && status != MDB_NOTFOUND) {
isc_log_write(named_g_lctx, isc_log_write(named_g_lctx,
NAMED_LOGCATEGORY_GENERAL, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, NAMED_LOGMODULE_SERVER,
@ -11863,8 +11916,9 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone,
namebuf, mdb_strerror(status)); namebuf, mdb_strerror(status));
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
goto cleanup; goto cleanup;
} else if (status != MDB_NOTFOUND) } else if (status != MDB_NOTFOUND) {
commit = ISC_TRUE; commit = ISC_TRUE;
}
} else { } else {
/* We're creating or overwriting the zone */ /* We're creating or overwriting the zone */
const cfg_obj_t *zoptions; const cfg_obj_t *zoptions;
@ -11899,7 +11953,7 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone,
data.mv_size = isc_buffer_usedlength(text); data.mv_size = isc_buffer_usedlength(text);
status = mdb_put(*txnp, dbi, &key, &data, 0); status = mdb_put(*txnp, dbi, &key, &data, 0);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(named_g_lctx, isc_log_write(named_g_lctx,
NAMED_LOGCATEGORY_GENERAL, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, NAMED_LOGMODULE_SERVER,
@ -11917,11 +11971,11 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone,
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;
cleanup: cleanup:
if (!commit || result != ISC_R_SUCCESS) if (!commit || result != ISC_R_SUCCESS) {
(void) mdb_txn_abort(*txnp); (void) mdb_txn_abort(*txnp);
else { } else {
status = mdb_txn_commit(*txnp); status = mdb_txn_commit(*txnp);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(named_g_lctx, isc_log_write(named_g_lctx,
NAMED_LOGCATEGORY_GENERAL, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, NAMED_LOGMODULE_SERVER,
@ -11936,8 +11990,10 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone,
UNLOCK(&view->new_zone_lock); UNLOCK(&view->new_zone_lock);
if (text != NULL) if (text != NULL) {
isc_buffer_free(&text); isc_buffer_free(&text);
}
return (result); return (result);
} }
@ -11951,7 +12007,7 @@ nzd_writable(dns_view_t *view) {
REQUIRE(view != NULL); REQUIRE(view != NULL);
status = mdb_txn_begin((MDB_env *) view->new_zone_dbenv, 0, 0, &txn); status = mdb_txn_begin((MDB_env *) view->new_zone_dbenv, 0, 0, &txn);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
"mdb_txn_begin: %s", "mdb_txn_begin: %s",
@ -11960,7 +12016,7 @@ nzd_writable(dns_view_t *view) {
} }
status = mdb_dbi_open(txn, NULL, 0, &dbi); status = mdb_dbi_open(txn, NULL, 0, &dbi);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
"mdb_dbi_open: %s", "mdb_dbi_open: %s",
@ -11983,7 +12039,7 @@ nzd_open(dns_view_t *view, unsigned int flags, MDB_txn **txnp, MDB_dbi *dbi) {
status = mdb_txn_begin((MDB_env *) view->new_zone_dbenv, 0, status = mdb_txn_begin((MDB_env *) view->new_zone_dbenv, 0,
flags, &txn); flags, &txn);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(named_g_lctx, isc_log_write(named_g_lctx,
NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER,
ISC_LOG_WARNING, "mdb_txn_begin: %s", ISC_LOG_WARNING, "mdb_txn_begin: %s",
@ -11992,7 +12048,7 @@ nzd_open(dns_view_t *view, unsigned int flags, MDB_txn **txnp, MDB_dbi *dbi) {
} }
status = mdb_dbi_open(txn, NULL, 0, dbi); status = mdb_dbi_open(txn, NULL, 0, dbi);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(named_g_lctx, isc_log_write(named_g_lctx,
NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER,
ISC_LOG_WARNING, "mdb_dbi_open: %s", ISC_LOG_WARNING, "mdb_dbi_open: %s",
@ -12003,9 +12059,10 @@ nzd_open(dns_view_t *view, unsigned int flags, MDB_txn **txnp, MDB_dbi *dbi) {
*txnp = txn; *txnp = txn;
cleanup: cleanup:
if (status != 0) { if (status != MDB_SUCCESS) {
if (txn != NULL) if (txn != NULL) {
mdb_txn_abort(txn); mdb_txn_abort(txn);
}
return (ISC_R_FAILURE); return (ISC_R_FAILURE);
} }
@ -12019,38 +12076,34 @@ nzd_open(dns_view_t *view, unsigned int flags, MDB_txn **txnp, MDB_dbi *dbi) {
*/ */
static void static void
nzd_env_close(dns_view_t *view) { nzd_env_close(dns_view_t *view) {
if (view->new_zone_dbenv != NULL) {
const char *dbpath = NULL; const char *dbpath = NULL;
isc_boolean_t have_dbpath = ISC_FALSE;
char dbpath_copy[PATH_MAX]; char dbpath_copy[PATH_MAX];
char lockpath[PATH_MAX]; char lockpath[PATH_MAX];
int ret; int status, ret;
if (mdb_env_get_path(view->new_zone_dbenv, &dbpath) == 0) { if (view->new_zone_dbenv == NULL) {
have_dbpath = ISC_TRUE; return;
snprintf(lockpath, sizeof(lockpath), "%s-lock",
dbpath);
strlcpy(dbpath_copy, dbpath, sizeof(dbpath_copy));
} }
status = mdb_env_get_path(view->new_zone_dbenv, &dbpath);
INSIST(status == MDB_SUCCESS);
snprintf(lockpath, sizeof(lockpath), "%s-lock", dbpath);
strlcpy(dbpath_copy, dbpath, sizeof(dbpath_copy));
mdb_env_close((MDB_env *) view->new_zone_dbenv); mdb_env_close((MDB_env *) view->new_zone_dbenv);
view->new_zone_dbenv = NULL;
if (have_dbpath) {
/* /*
* Database files must be owned by the eventual user, not * Database files must be owned by the eventual user, not by root.
* by root.
*/ */
ret = chown(dbpath_copy, ns_os_uid(), -1); ret = chown(dbpath_copy, ns_os_uid(), -1);
UNUSED(ret); UNUSED(ret);
/* /*
* Some platforms need the lockfile not to exist when we * Some platforms need the lockfile not to exist when we reopen the
* reopen the environment. * environment.
*/ */
(void) isc_file_remove(lockpath); (void) isc_file_remove(lockpath);
}
} view->new_zone_dbenv = NULL;
} }
static isc_result_t static isc_result_t
@ -12066,7 +12119,7 @@ nzd_env_reopen(dns_view_t *view) {
nzd_env_close(view); nzd_env_close(view);
status = mdb_env_create(&env); status = mdb_env_create(&env);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_ERROR, ISC_LOGMODULE_OTHER, ISC_LOG_ERROR,
"mdb_env_create failed: %s", "mdb_env_create failed: %s",
@ -12076,7 +12129,7 @@ nzd_env_reopen(dns_view_t *view) {
if (view->new_zone_mapsize != 0ULL) { if (view->new_zone_mapsize != 0ULL) {
status = mdb_env_set_mapsize(env, view->new_zone_mapsize); status = mdb_env_set_mapsize(env, view->new_zone_mapsize);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_ERROR, ISC_LOGMODULE_OTHER, ISC_LOG_ERROR,
"mdb_env_set_mapsize failed: %s", "mdb_env_set_mapsize failed: %s",
@ -12085,14 +12138,8 @@ nzd_env_reopen(dns_view_t *view) {
} }
} }
/* status = mdb_env_open(env, view->new_zone_db, DNS_LMDB_FLAGS, 0600);
* MDB_NOTLS is used to prevent problems after configuration is if (status != MDB_SUCCESS) {
* reloaded, due to the way LMDB's use of thread-local storage (TLS)
* interacts with the BIND9 thread model.
*/
status = mdb_env_open(env, view->new_zone_db,
MDB_NOSUBDIR|MDB_NOTLS|MDB_CREATE, 0600);
if (status != 0) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_ERROR, ISC_LOGMODULE_OTHER, ISC_LOG_ERROR,
"mdb_env_open of '%s' failed: %s", "mdb_env_open of '%s' failed: %s",
@ -12121,10 +12168,12 @@ nzd_close(MDB_txn **txnp, isc_boolean_t commit) {
if (*txnp != NULL) { if (*txnp != NULL) {
if (commit) { if (commit) {
status = mdb_txn_commit(*txnp); status = mdb_txn_commit(*txnp);
if (status != 0) if (status != MDB_SUCCESS) {
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
} else }
} else {
mdb_txn_abort(*txnp); mdb_txn_abort(*txnp);
}
*txnp = NULL; *txnp = NULL;
} }
@ -12142,11 +12191,12 @@ nzd_count(dns_view_t *view, int *countp) {
REQUIRE(countp != NULL); REQUIRE(countp != NULL);
result = nzd_open(view, MDB_RDONLY, &txn, &dbi); result = nzd_open(view, MDB_RDONLY, &txn, &dbi);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS) {
goto cleanup; goto cleanup;
}
status = mdb_stat(txn, dbi, &statbuf); status = mdb_stat(txn, dbi, &statbuf);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(named_g_lctx, isc_log_write(named_g_lctx,
NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER,
ISC_LOG_WARNING, "mdb_stat: %s", ISC_LOG_WARNING, "mdb_stat: %s",
@ -12219,8 +12269,9 @@ migrate_nzf(dns_view_t *view) {
zonelist = NULL; zonelist = NULL;
CHECK(cfg_map_get(nzf_config, "zone", &zonelist)); CHECK(cfg_map_get(nzf_config, "zone", &zonelist));
if (!cfg_obj_islist(zonelist)) if (!cfg_obj_islist(zonelist)) {
CHECK(ISC_R_FAILURE); CHECK(ISC_R_FAILURE);
}
CHECK(nzd_open(view, 0, &txn, &dbi)); CHECK(nzd_open(view, 0, &txn, &dbi));
@ -12271,7 +12322,7 @@ migrate_nzf(dns_view_t *view) {
data.mv_size = isc_buffer_usedlength(text); data.mv_size = isc_buffer_usedlength(text);
status = mdb_put(txn, dbi, &key, &data, MDB_NOOVERWRITE); status = mdb_put(txn, dbi, &key, &data, MDB_NOOVERWRITE);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(named_g_lctx, isc_log_write(named_g_lctx,
NAMED_LOGCATEGORY_GENERAL, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, NAMED_LOGMODULE_SERVER,
@ -12300,15 +12351,19 @@ migrate_nzf(dns_view_t *view) {
} }
cleanup: cleanup:
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS) {
(void) nzd_close(&txn, ISC_FALSE); (void) nzd_close(&txn, ISC_FALSE);
else } else {
result = nzd_close(&txn, commit); result = nzd_close(&txn, commit);
}
if (text != NULL) if (text != NULL) {
isc_buffer_free(&text); isc_buffer_free(&text);
if (nzf_config != NULL) }
if (nzf_config != NULL) {
cfg_obj_destroy(named_g_addparser, &nzf_config); cfg_obj_destroy(named_g_addparser, &nzf_config);
}
return (result); return (result);
} }

20
bin/tools/named-nzd2nzf.c
View File

@ -16,6 +16,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <lmdb.h> #include <lmdb.h>
#include <dns/view.h>
#include <isc/print.h> #include <isc/print.h>
int int
@ -36,42 +38,44 @@ main (int argc, char *argv[]) {
path = argv[1]; path = argv[1];
status = mdb_env_create(&env); status = mdb_env_create(&env);
if (status != 0) { if (status != MDB_SUCCESS) {
fprintf(stderr, "named-nzd2nzf: mdb_env_create: %s", fprintf(stderr, "named-nzd2nzf: mdb_env_create: %s",
mdb_strerror(status)); mdb_strerror(status));
exit(1); exit(1);
} }
status = mdb_env_open(env, path, status = mdb_env_open(env, path, DNS_LMDB_FLAGS, 0600);
MDB_RDONLY|MDB_NOTLS|MDB_NOSUBDIR, 0600); if (status != MDB_SUCCESS) {
if (status != 0) {
fprintf(stderr, "named-nzd2nzf: mdb_env_open: %s", fprintf(stderr, "named-nzd2nzf: mdb_env_open: %s",
mdb_strerror(status)); mdb_strerror(status));
exit(1); exit(1);
} }
status = mdb_txn_begin(env, 0, MDB_RDONLY, &txn); status = mdb_txn_begin(env, 0, MDB_RDONLY, &txn);
if (status != 0) { if (status != MDB_SUCCESS) {
fprintf(stderr, "named-nzd2nzf: mdb_txn_begin: %s", fprintf(stderr, "named-nzd2nzf: mdb_txn_begin: %s",
mdb_strerror(status)); mdb_strerror(status));
exit(1); exit(1);
} }
status = mdb_dbi_open(txn, NULL, 0, &dbi); status = mdb_dbi_open(txn, NULL, 0, &dbi);
if (status != 0) { if (status != MDB_SUCCESS) {
fprintf(stderr, "named-nzd2nzf: mdb_dbi_open: %s", fprintf(stderr, "named-nzd2nzf: mdb_dbi_open: %s",
mdb_strerror(status)); mdb_strerror(status));
exit(1); exit(1);
} }
status = mdb_cursor_open(txn, dbi, &cursor); status = mdb_cursor_open(txn, dbi, &cursor);
if (status != 0) { if (status != MDB_SUCCESS) {
fprintf(stderr, "named-nzd2nzf: mdb_cursor_open: %s", fprintf(stderr, "named-nzd2nzf: mdb_cursor_open: %s",
mdb_strerror(status)); mdb_strerror(status));
exit(1); exit(1);
} }
while (mdb_cursor_get(cursor, &key, &data, MDB_NEXT) == 0) { for (status = mdb_cursor_get(cursor, &key, &data, MDB_FIRST);
status == MDB_SUCCESS;
status = mdb_cursor_get(cursor, &key, &data, MDB_NEXT))
{
if (key.mv_data == NULL || key.mv_size == 0 || if (key.mv_data == NULL || key.mv_size == 0 ||
data.mv_data == NULL || data.mv_size == 0) data.mv_data == NULL || data.mv_size == 0)
{ {

19
lib/dns/include/dns/view.h
View File

@ -237,6 +237,25 @@ struct dns_view {
#define DNS_VIEWATTR_ADBSHUTDOWN 0x02 #define DNS_VIEWATTR_ADBSHUTDOWN 0x02
#define DNS_VIEWATTR_REQSHUTDOWN 0x04 #define DNS_VIEWATTR_REQSHUTDOWN 0x04
#ifdef HAVE_LMDB
#include <lmdb.h>
/*
* MDB_NOTLS is used to prevent problems after configuration is reloaded, due
* to the way LMDB's use of thread-local storage (TLS) interacts with the BIND9
* thread model.
*/
#define DNS_LMDB_COMMON_FLAGS (MDB_CREATE | MDB_NOSUBDIR | MDB_NOTLS)
#ifndef __OpenBSD__
#define DNS_LMDB_FLAGS (DNS_LMDB_COMMON_FLAGS)
#else /* __OpenBSD__ */
/*
* OpenBSD does not have a unified buffer cache, which requires both reads and
* writes to be performed using mmap().
*/
#define DNS_LMDB_FLAGS (DNS_LMDB_COMMON_FLAGS | MDB_WRITEMAP)
#endif /* __OpenBSD__ */
#endif /* HAVE_LMDB */
isc_result_t isc_result_t
dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
const char *name, dns_view_t **viewp); const char *name, dns_view_t **viewp);

23
lib/dns/view.c
View File

@ -519,8 +519,10 @@ destroy(dns_view_t *view) {
view->new_zone_dir = NULL; view->new_zone_dir = NULL;
} }
#ifdef HAVE_LMDB #ifdef HAVE_LMDB
if (view->new_zone_dbenv != NULL) if (view->new_zone_dbenv != NULL) {
mdb_env_close((MDB_env *) view->new_zone_dbenv); mdb_env_close((MDB_env *) view->new_zone_dbenv);
view->new_zone_dbenv = NULL;
}
if (view->new_zone_db != NULL) { if (view->new_zone_db != NULL) {
isc_mem_free(view->mctx, view->new_zone_db); isc_mem_free(view->mctx, view->new_zone_db);
view->new_zone_db = NULL; view->new_zone_db = NULL;
@ -2102,7 +2104,7 @@ dns_view_setnewzones(dns_view_t *view, isc_boolean_t allow, void *cfgctx,
} }
status = mdb_env_create(&env); status = mdb_env_create(&env);
if (status != 0) { if (status != MDB_SUCCESS) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_ERROR, ISC_LOGMODULE_OTHER, ISC_LOG_ERROR,
"mdb_env_create failed: %s", "mdb_env_create failed: %s",
@ -2112,24 +2114,18 @@ dns_view_setnewzones(dns_view_t *view, isc_boolean_t allow, void *cfgctx,
if (mapsize != 0ULL) { if (mapsize != 0ULL) {
status = mdb_env_set_mapsize(env, mapsize); status = mdb_env_set_mapsize(env, mapsize);
view->new_zone_mapsize = mapsize; if (status != MDB_SUCCESS) {
if (status != 0) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_ERROR, ISC_LOGMODULE_OTHER, ISC_LOG_ERROR,
"mdb_env_set_mapsize failed: %s", "mdb_env_set_mapsize failed: %s",
mdb_strerror(status)); mdb_strerror(status));
CHECK(ISC_R_FAILURE); CHECK(ISC_R_FAILURE);
} }
view->new_zone_mapsize = mapsize;
} }
/* status = mdb_env_open(env, view->new_zone_db, DNS_LMDB_FLAGS, 0600);
* MDB_NOTLS is used to prevent problems after configuration is if (status != MDB_SUCCESS) {
* reloaded, due to the way LMDB's use of thread-local storage (TLS)
* interacts with the BIND9 thread model.
*/
status = mdb_env_open(env, view->new_zone_db,
MDB_NOSUBDIR|MDB_NOTLS|MDB_CREATE, 0600);
if (status != 0) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_ERROR, ISC_LOGMODULE_OTHER, ISC_LOG_ERROR,
"mdb_env_open of '%s' failed: %s", "mdb_env_open of '%s' failed: %s",
@ -2156,8 +2152,9 @@ dns_view_setnewzones(dns_view_t *view, isc_boolean_t allow, void *cfgctx,
isc_mem_free(view->mctx, view->new_zone_db); isc_mem_free(view->mctx, view->new_zone_db);
view->new_zone_db = NULL; view->new_zone_db = NULL;
} }
if (env != NULL) if (env != NULL) {
mdb_env_close(env); mdb_env_close(env);
}
#endif /* HAVE_LMDB */ #endif /* HAVE_LMDB */
view->new_zone_config = NULL; view->new_zone_config = NULL;
view->cfg_destroy = NULL; view->cfg_destroy = NULL;