From c266666b7eefa989d795aebc7170f6b6181adfe6 Mon Sep 17 00:00:00 2001
From: Jan Kadlec <jan.kadlec@nic.cz>
Date: Thu, 10 Oct 2013 17:17:01 +0200
Subject: [PATCH] Moved journal commit code.
---
src/knot/server/zones.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/knot/server/zones.c b/src/knot/server/zones.c
index 074811b9a..abb3ac953 100644
--- a/src/knot/server/zones.c
+++ b/src/knot/server/zones.c
@@ -2017,6 +2017,21 @@ static int zones_process_update_auth(knot_zone_t *zone,
dbg_zload_verb("%s: DNSSEC changes applied\n", msg);
+ // Commit transaction.
+ if (transaction) {
+ ret = zones_store_changesets_commit(transaction);
+ if (ret != KNOT_EOK) {
+ log_zone_error("%s: Failed to commit stored "
+ "changesets: %s."
+ "\n", msg, knot_strerror(ret));
+ xfrin_rollback_update(zone->contents, &new_contents,
+ chgsets->changes);
+ zones_free_merged_changesets(chgsets, sec_chs);
+ free(msg);
+ return ret;
+ }
+ }
+
// Switch zone contents.
knot_zone_retain(zone); /* Retain pointer for safe RCU unlock. */
rcu_read_unlock(); /* Unlock for switch. */
@@ -2037,21 +2052,6 @@ static int zones_process_update_auth(knot_zone_t *zone,
return KNOT_ERROR;
}
- // Commit transaction.
- if (transaction) {
- ret = zones_store_changesets_commit(transaction);
- if (ret != KNOT_EOK) {
- log_zone_error("%s: Failed to commit stored "
- "changesets: %s."
- "\n", msg, knot_strerror(ret));
- xfrin_rollback_update(zone->contents, &new_contents,
- chgsets->changes);
- zones_free_merged_changesets(chgsets, sec_chs);
- free(msg);
- return ret;
- }
- }
-
// Cleanup.
xfrin_cleanup_successful_update(chgsets->changes);
if (sec_chs) {
--
GitLab