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 e39f3a27012a6ca5f39418a363622c518ea896bc..c4288530a1ebc614f54b4759aa985aae743cf048 100644 (file)
--- 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 8a6d08b75aab0fdff88fe69d2dff42969fd082c7..4bc45185d0dd9b642b573adbf978a528d9869bde 100644 (file)
--- 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 89589b041ff1aa42a6dba6c7d8b0f3b9ebbcc0b7..24f0b04ee0a8a53471d8959a9869506158fbc64f 100644 (file)
--- 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 660060dc0515e63e871271c0ad975ed7e4bdf4ea..011acbb74e3838c7ff82f2b3402edd974b69f66d 100644 (file)
--- 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 9d6be9b1ee4b3185732fcff6bd460ee623dea570..521b97efb20cd2e3568c1b6cbf4f0871061e2189 100644 (file)
--- 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 fbe91c83034a0cba751cee0508f59cbef4143649..bdb6e4c35a503985b7a3e4c89bb1898f2a054f5a 100644 (file)
--- 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 8e4d318beebc2d50e95f749a36c39f44a0ac9719..63b699aac11583da61647b8d1d920745b053dd66 160000 (submodule)
--- a/tests/integration/deckard
+++ b/tests/integration/deckard
@@ -1 +1 @@
-Subproject commit 8e4d318beebc2d50e95f749a36c39f44a0ac9719
+Subproject commit 63b699aac11583da61647b8d1d920745b053dd66