Commit 4ccff3bb authored by Mark Andrews's avatar Mark Andrews
Browse files

Merge branch 'michal-zone_sign-error-logging' into 'master'

Log CHECK() errors in zone_sign()

See merge request !1206
parents 8b17f364 b108376a
Pipeline #7800 failed with stages
in 16 minutes and 33 seconds
......@@ -8495,11 +8495,11 @@ zone_sign(dns_zone_t *zone) {
ISC_LIST_INIT(cleanup);
/*
* Updates are disabled. Pause for 5 minutes.
* Updates are disabled. Pause for 1 minute.
*/
if (zone->update_disabled) {
result = ISC_R_FAILURE;
goto failure;
goto cleanup;
}
ZONEDB_LOCK(&zone->dblock, isc_rwlocktype_read);
......@@ -8508,7 +8508,7 @@ zone_sign(dns_zone_t *zone) {
ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read);
if (db == NULL) {
result = ISC_R_FAILURE;
goto failure;
goto cleanup;
}
result = dns_db_newversion(db, &version);
......@@ -8516,7 +8516,7 @@ zone_sign(dns_zone_t *zone) {
dns_zone_log(zone, ISC_LOG_ERROR,
"zone_sign:dns_db_newversion -> %s",
dns_result_totext(result));
goto failure;
goto cleanup;
}
isc_stdtime_get(&now);
......@@ -8527,7 +8527,7 @@ zone_sign(dns_zone_t *zone) {
dns_zone_log(zone, ISC_LOG_ERROR,
"zone_sign:dns__zone_findkeys -> %s",
dns_result_totext(result));
goto failure;
goto cleanup;
}
sigvalidityinterval = dns_zone_getsigvalidityinterval(zone);
......@@ -8803,7 +8803,7 @@ zone_sign(dns_zone_t *zone) {
ISC_LOG_ERROR,
"updatesecure -> %s",
dns_result_totext(result));
goto failure;
goto cleanup;
}
}
result = updatesignwithkey(zone, signing,
......@@ -8815,7 +8815,7 @@ zone_sign(dns_zone_t *zone) {
dns_zone_log(zone, ISC_LOG_ERROR,
"updatesignwithkey -> %s",
dns_result_totext(result));
goto failure;
goto cleanup;
}
build_nsec = false;
goto next_signing;
......@@ -8823,7 +8823,7 @@ zone_sign(dns_zone_t *zone) {
dns_zone_log(zone, ISC_LOG_ERROR,
"zone_sign:dns_dbiterator_next -> %s",
dns_result_totext(result));
goto failure;
goto cleanup;
} else if (is_bottom_of_zone) {
dns_dbiterator_current(signing->dbiterator,
&node, nextname);
......@@ -8851,7 +8851,7 @@ zone_sign(dns_zone_t *zone) {
dns_zone_log(zone, ISC_LOG_ERROR, "zone_sign:"
"dns__zone_updatesigs -> %s",
dns_result_totext(result));
goto failure;
goto cleanup;
}
}
......@@ -8873,7 +8873,7 @@ zone_sign(dns_zone_t *zone) {
dns_zone_log(zone, ISC_LOG_ERROR,
"zone_sign:del_sigs -> %s",
dns_result_totext(result));
goto failure;
goto cleanup;
}
result = update_soa_serial(db, version, zonediff.diff, zone->mctx,
......@@ -8882,7 +8882,7 @@ zone_sign(dns_zone_t *zone) {
dns_zone_log(zone, ISC_LOG_ERROR,
"zone_sign:update_soa_serial -> %s",
dns_result_totext(result));
goto failure;
goto cleanup;
}
/*
......@@ -8896,7 +8896,7 @@ zone_sign(dns_zone_t *zone) {
dns_zone_log(zone, ISC_LOG_ERROR,
"zone_sign:add_sigs -> %s",
dns_result_totext(result));
goto failure;
goto cleanup;
}
/*
......@@ -8945,6 +8945,12 @@ zone_sign(dns_zone_t *zone) {
}
failure:
if (result != ISC_R_SUCCESS) {
dns_zone_log(zone, ISC_LOG_ERROR, "zone_sign: failed: %s",
dns_result_totext(result));
}
cleanup:
/*
* Pause all dbiterators.
*/
......
Markdown is supported
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