Ghost User · 98d12117 · 98d12117 · 98d12117
--- a/src/knot/server/zones.c
+++ b/src/knot/server/zones.c
 	return knot_changeset_is_empty(HEAD(chs->sets));
 }

-static int zones_store_changesets_begin_and_store(knot_zone_t *zone,
-                                                 knot_changesets_t *chgsets,
-                                                 journal_t **transaction)
+static int zones_store_chgsets_try_store(knot_zone_t *zone,
+                                        knot_changesets_t *chgsets,
+                                        journal_t **transaction)
 {
-	assert(zone != NULL);
--- a/src/knot/server/zones.c
+++ b/src/knot/server/zones.c
+                                                 journal_t **transaction)
+{
+	assert(zone != NULL);
+	assert(chgsets != NULL);
+
+	if (zones_changesets_empty(chgsets)) {
+		return KNOT_EINVAL;
+	}
+
+	int ret = zones_store_chgsets_try_store(zone, chgsets, transaction);
+
+	/* If the journal was full (KNOT_EBUSY), we must flush it by hand and
+	 * try to save the changesets once again. If this fails, the changesets
+	 * are larger than max journal size, so return error.
+	 */
+	if (ret == KNOT_EBUSY) {
--- a/src/knot/server/zones.c
+++ b/src/knot/server/zones.c
 		log_server_notice("Journal for '%s' is full, flushing.\n",
 		                  zd->conf->name);
 		evsched_cancel(tmr->parent, tmr);
-		evsched_schedule(tmr->parent, tmr, 0);