davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

bookkeeper: restore limit on asking for all channelmoves at once.

Browse Source 
Now we've found all the issues, the latency spike (4 seconds on my laptop)
for querying 2M elements remains.

Restore the limited sampling which we reverted, but make it 10,000 now.

This doesn't help our worst-case latency, because sql still asks for all 2M entries on
first access.  We address that next.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2025-11-20 12:07:15 +10:30
parent 98bd95cb2e
commit 873d4102c8
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/bkpr/bookkeeper.c
View File

@@ -55,6 +55,10 @@ static struct refresh_info *use_rinfo(struct refresh_info *rinfo)
return rinfo; return rinfo;
} }
/* Recursion */
static struct command_result *limited_listchannelmoves(struct command *cmd,
struct refresh_info *rinfo);
static struct command_result *rinfo_one_done(struct command *cmd, static struct command_result *rinfo_one_done(struct command *cmd,
struct refresh_info *rinfo) struct refresh_info *rinfo)
{ {
@@ -105,6 +109,7 @@ static struct fee_sum *find_sum_for_txid(struct fee_sum **sums,
return NULL; return NULL;
} }
#define LISTCHANNELMOVES_LIMIT 10000
static struct command_result *listchannelmoves_done(struct command *cmd, static struct command_result *listchannelmoves_done(struct command *cmd,
const char *method, const char *method,
const char *buf, const char *buf,
@@ -126,16 +131,36 @@ static struct command_result *listchannelmoves_done(struct command *cmd,
"create-or-replace", "create-or-replace",
datastore_done, NULL, use_rinfo(rinfo)); datastore_done, NULL, use_rinfo(rinfo));
/* If there might be more, try asking for more */
if (moves->size == LISTCHANNELMOVES_LIMIT)
limited_listchannelmoves(cmd, rinfo);
return rinfo_one_done(cmd, rinfo); return rinfo_one_done(cmd, rinfo);
} }
/* We do 1000 at a time to avoid overwhelming lightningd */
static struct command_result *limited_listchannelmoves(struct command *cmd,
struct refresh_info *rinfo)
{
struct bkpr *bkpr = bkpr_of(cmd->plugin);
struct out_req *req;
req = jsonrpc_request_start(cmd, "listchannelmoves",
listchannelmoves_done,
plugin_broken_cb,
use_rinfo(rinfo));
json_add_string(req->js, "index", "created");
json_add_u64(req->js, "start", bkpr->channelmoves_index + 1);
json_add_u64(req->js, "limit", LISTCHANNELMOVES_LIMIT);
return send_outreq(req);
}
static struct command_result *listchainmoves_done(struct command *cmd, static struct command_result *listchainmoves_done(struct command *cmd,
const char *method, const char *method,
const char *buf, const char *buf,
const jsmntok_t *result, const jsmntok_t *result,
struct refresh_info *rinfo) struct refresh_info *rinfo)
{ {
struct out_req *req;
const jsmntok_t *moves, *t; const jsmntok_t *moves, *t;
size_t i; size_t i;
struct bkpr *bkpr = bkpr_of(cmd->plugin); struct bkpr *bkpr = bkpr_of(cmd->plugin);
@@ -151,13 +176,7 @@ static struct command_result *listchainmoves_done(struct command *cmd,
"create-or-replace", "create-or-replace",
datastore_done, NULL, use_rinfo(rinfo)); datastore_done, NULL, use_rinfo(rinfo));
req = jsonrpc_request_start(cmd, "listchannelmoves", limited_listchannelmoves(cmd, rinfo);
listchannelmoves_done,
plugin_broken_cb,
use_rinfo(rinfo));
json_add_string(req->js, "index", "created");
json_add_u64(req->js, "start", bkpr->channelmoves_index + 1);
send_outreq(req);
return rinfo_one_done(cmd, rinfo); return rinfo_one_done(cmd, rinfo);
} }