aljaz/plugins
1
0
Fork 0
mirror of https://github.com/aljazceru/plugins.git synced 2025-12-24 16:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

rebalance: rebalanceall can be stopped quickly

Browse Source 
waitsendpay could stuck for minutes making rebalancestop unresponsive
This commit is contained in:
Gálli Zoltán
2022-12-03 19:01:58 +01:00
committed by Michael Schmoock
parent 6d1975e3ae
commit 29dfc0f3f8
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rebalance/rebalance.py
View File

@@ -209,6 +209,22 @@ def getroute_switch(method_name):
return switch.get(method_name, getroute_iterative)
def waitsendpay(payment_hash, start_ts, retry_for):
while True:
try:
timeout = min(max(retry_for + start_ts - int(time.time()), 0), 10)
result = plugin.rpc.waitsendpay(payment_hash, timeout)
return result
except RpcError as e:
if e.method == "waitsendpay" and e.error.get('code') == 200:
if plugin.rebalance_stop:
raise e
if int(time.time()) - start_ts >= retry_for:
raise e
else:
raise e
@plugin.method("rebalance")
def rebalance(plugin, outgoing_scid, incoming_scid, msatoshi: Millisatoshi = None,
retry_for: int = 60, maxfeepercent: float = 0.5,
@@ -338,8 +354,7 @@ def rebalance(plugin, outgoing_scid, incoming_scid, msatoshi: Millisatoshi = Non
count_sendpay += 1
try:
plugin.rpc.sendpay(route, payment_hash, payment_secret=payment_secret)
running_for = int(time.time()) - start_ts
result = plugin.rpc.waitsendpay(payment_hash, max(retry_for - running_for, 0))
result = waitsendpay(payment_hash, start_ts, retry_for)
time_sendpay += time.time() - time_start
if result.get('status') == "complete":
rpc_result["stats"] = f"running_for:{int(time.time()) - start_ts} count_getroute:{count} time_getroute:{time_getroute} time_getroute_avg:{time_getroute / count} count_sendpay:{count_sendpay} time_sendpay:{time_sendpay} time_sendpay_avg:{time_sendpay / count_sendpay}"