From: Štěpán Balážik <stepan.balazik@nic.cz>
Date: Wed, 20 Jan 2021 11:48:45 +0000 (+0100)
Subject: remove NO_THROTTLE option
X-Git-Tag: v5.3.0~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c678c1dac03a7c9b3053d3086df45cfc1b51c1b9;p=thirdparty%2Fknot-resolver.git

remove NO_THROTTLE option

It wasn't really used for a long time and became completely obsolete after
!1030.
---

diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua
index e39f3a270..c4288530a 100644
--- a/daemon/lua/kres-gen.lua
+++ b/daemon/lua/kres-gen.lua
@@ -84,7 +84,6 @@ typedef struct {
 typedef struct trie trie_t;
 struct kr_qflags {
 	_Bool NO_MINIMIZE : 1;
-	_Bool NO_THROTTLE : 1;
 	_Bool NO_IPV6 : 1;
 	_Bool NO_IPV4 : 1;
 	_Bool TCP : 1;
diff --git a/daemon/worker.c b/daemon/worker.c
index 8a6d08b75..4bc45185d 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -432,10 +432,6 @@ static int request_start(struct request_ctx *ctx, knot_pkt_t *query)
 	struct engine *engine = worker->engine;
 	kr_resolve_begin(req, &engine->resolver);
 	worker->stats.queries += 1;
-	/* Throttle outbound queries only when high pressure */
-	if (worker->stats.concurrent < QUERY_RATE_THRESHOLD) {
-		req->options.NO_THROTTLE = true;
-	}
 	return kr_ok();
 }
 
diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index 89589b041..24f0b04ee 100644
--- a/lib/layer/iterate.c
+++ b/lib/layer/iterate.c
@@ -779,7 +779,6 @@ static int process_answer(knot_pkt_t *pkt, struct kr_request *req)
 		/* Copy transitive flags from original query to CNAME followup. */
 		next->flags.TRACE = query->flags.TRACE;
 		next->flags.ALWAYS_CUT = query->flags.ALWAYS_CUT;
-		next->flags.NO_THROTTLE = query->flags.NO_THROTTLE;
 
 		/* Original query might have turned minimization off, revert. */
 		next->flags.NO_MINIMIZE = req->options.NO_MINIMIZE;
diff --git a/lib/module.h b/lib/module.h
index 660060dc0..011acbb74 100644
--- a/lib/module.h
+++ b/lib/module.h
@@ -23,7 +23,7 @@ struct kr_prop;
  */
 #define KR_MODULE_EXPORT(module) \
     KR_EXPORT uint32_t module ## _api() { return KR_MODULE_API; }
-#define KR_MODULE_API ((uint32_t) 0x20200427)
+#define KR_MODULE_API ((uint32_t) 0x20210125)
 
 typedef uint32_t (module_api_cb)(void);
 
diff --git a/lib/resolve.c b/lib/resolve.c
index 9d6be9b1e..521b97efb 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -1236,7 +1236,6 @@ static int ns_resolve_addr(struct kr_query *qry, struct kr_request *param, struc
 		if (!next_type && qry->zone_cut.name[0] == '\0') {
 			VERBOSE_MSG(qry, "=> fallback to root hints\n");
 			kr_zonecut_set_sbelt(ctx, &qry->zone_cut);
-			qry->flags.NO_THROTTLE = true; /* Pick even bad SBELT servers */
 			return kr_error(EAGAIN);
 		}
 		/* No IPv4 nor IPv6, flag server as unusable. */
@@ -1259,7 +1258,6 @@ static int ns_resolve_addr(struct kr_query *qry, struct kr_request *param, struc
 		if (ret == 0) { /* Copy TA and key since it's the same cut to avoid lookup. */
 			kr_zonecut_copy_trust(&next->zone_cut, &qry->zone_cut);
 			kr_zonecut_set_sbelt(ctx, &qry->zone_cut); /* Add SBELT to parent in case query fails. */
-			qry->flags.NO_THROTTLE = true; /* Pick even bad SBELT servers */
 		}
 	} else {
 		next->flags.AWAIT_CUT = true;
@@ -1377,7 +1375,6 @@ int kr_resolve_produce(struct kr_request *request, struct kr_transport **transpo
 		/* Root DNSKEY must be fetched from the hints to avoid chicken and egg problem. */
 		if (qry->sname[0] == '\0' && qry->stype == KNOT_RRTYPE_DNSKEY) {
 			kr_zonecut_set_sbelt(request->ctx, &qry->zone_cut);
-			qry->flags.NO_THROTTLE = true; /* Pick even bad SBELT servers */
 		}
 	}
 
diff --git a/lib/rplan.h b/lib/rplan.h
index fbe91c830..bdb6e4c35 100644
--- a/lib/rplan.h
+++ b/lib/rplan.h
@@ -15,7 +15,6 @@
 /** Query flags */
 struct kr_qflags {
 	bool NO_MINIMIZE : 1;    /**< Don't minimize QNAME. */
-	bool NO_THROTTLE : 1;    /**< No query/slow NS throttling. */
 	bool NO_IPV6 : 1;        /**< Disable IPv6 */
 	bool NO_IPV4 : 1;        /**< Disable IPv4 */
 	bool TCP : 1;            /**< Use TCP for this query. */
diff --git a/tests/integration/deckard b/tests/integration/deckard
index 8e4d318be..63b699aac 160000
--- a/tests/integration/deckard
+++ b/tests/integration/deckard
@@ -1 +1 @@
-Subproject commit 8e4d318beebc2d50e95f749a36c39f44a0ac9719
+Subproject commit 63b699aac11583da61647b8d1d920745b053dd66