Skip to content
Snippets Groups Projects
Commit 27029b2f authored by Libor Peltan's avatar Libor Peltan Committed by Daniel Salzman
Browse files

zone-diff: bugfix: don't store to journal if configured not to

parent 2cf201cd
Branches
Tags
1 merge request!1412journal: compute serialized changeset directly from bi-nodes...
Pipeline #93015 passed with stages
in 5 minutes and 37 seconds
...@@ -693,7 +693,9 @@ static int commit_journal(conf_t *conf, zone_update_t *update) ...@@ -693,7 +693,9 @@ static int commit_journal(conf_t *conf, zone_update_t *update)
if (update->flags & UPDATE_NO_CHSET) { if (update->flags & UPDATE_NO_CHSET) {
zone_diff_t diff; zone_diff_t diff;
get_zone_diff(&diff, update); get_zone_diff(&diff, update);
return zone_diff_store(conf, update->zone, &diff); if (content != JOURNAL_CONTENT_NONE && !zone_update_no_change(update)) {
ret = zone_diff_store(conf, update->zone, &diff);
}
} else if ((update->flags & UPDATE_INCREMENTAL) || } else if ((update->flags & UPDATE_INCREMENTAL) ||
(update->flags & UPDATE_HYBRID)) { (update->flags & UPDATE_HYBRID)) {
changeset_t *extra = (update->flags & UPDATE_EXTRA_CHSET) ? &update->extra_ch : NULL; changeset_t *extra = (update->flags & UPDATE_EXTRA_CHSET) ? &update->extra_ch : NULL;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment