update

Author: reliveyy

images/utils/launcher/__init__.py

@@ -5,8 +5,8 @@
 
 from launcher.close_other_utils import Action as CloseOtherUtilsAction
 from launcher.config import Config
-from launcher.errors import FatalError, ConfigError, ConfigErrorScope
-from launcher.node import NodeManager, ServiceNotFound, ContainerNotFound, NoWaiting
+from launcher.errors import FatalError, ConfigError, ConfigErrorScope, NoWaiting
+from launcher.node import NodeManager, ServiceNotFound, ContainerNotFound
 from launcher.utils import ArgumentError
 import docker.errors
 import os
@@ -190,11 +190,9 @@ def pre_shell(self):
         try:
             # FIXME pty signal only works in main thread
             xud.ensure_ready(stop)
-        except KeyboardInterrupt:
+        except (KeyboardInterrupt, NoWaiting):
             stop.set()
             raise
-        except NoWaiting:
-            pass
 
         self.close_other_utils()
 
@@ -255,3 +253,5 @@ def launch(self):
             env.start()
         except KeyboardInterrupt:
             print()
+        except NoWaiting:
+            pass

images/utils/launcher/config/config.py

@@ -463,7 +463,7 @@ def parse_command_line_arguments(self):
             help="Expose proxy service ports to your host machine"
         )
 
-        self.args = parser.parse_args()
+        self.args, unknown = parser.parse_known_args()
         self.logger.info("Parsed command-line arguments: %r", self.args)
 
     def update_volume(self, volumes, container_dir, host_dir):

images/utils/launcher/errors.py

@@ -17,3 +17,7 @@ def __init__(self, scope: ConfigErrorScope, conf_file: Optional[str] = None):
         super().__init__(scope)
         self.scope = scope
         self.conf_file = conf_file
+
+
+class NoWaiting(Exception):
+    pass

images/utils/launcher/node/__init__.py

@@ -16,7 +16,7 @@
 from launcher.utils import ArgumentParser, yes_or_no, parallel
 from .DockerTemplate import DockerTemplate
 from .arby import Arby
-from .base import Node, ContainerNotFound, NoWaiting
+from .base import Node, ContainerNotFound
 from .bitcoind import Bitcoind, Litecoind
 from .boltz import Boltz
 from .connext import Connext

images/utils/launcher/node/base.py

@@ -35,10 +35,6 @@ class ContainerNotFound(Exception):
     pass
 
 
-class NoWaiting(Exception):
-    pass
-
-
 class ContainerSpec:
     def __init__(self, name: str, image: Image, hostname: str, environment: List[str], command: List[str],
                  volumes: Dict, ports: Dict):
@@ -202,8 +198,13 @@ def _get_volumes(self, spec_volumes: Dict):
     def create(self):
         spec = self.container_spec
         api = self.client.api
+
+        image = spec.image.use_image
+
+        logger.debug("Creating container %s with image %s", self.container_name, image)
+
         resp = api.create_container(
-            image=spec.image.use_image,
+            image=image,
             command=spec.command,
             hostname=spec.hostname,
             detach=True,

images/utils/launcher/node/lnd.py

@@ -217,6 +217,7 @@ def update_cfheader(self, state: CFHeaderState, stop: Event):
             m = p0.match(line)
 
             if m:
+                #logger.debug("[%s] (match 1) %s", self.name, line)
                 state.current = int(m.group(1))
                 state.ready = True
                 h = max(state.current, state.total)
@@ -226,13 +227,17 @@ def update_cfheader(self, state: CFHeaderState, stop: Event):
 
             m = p1.match(line)
             if m:
+                #logger.debug("[%s] (match 2) %s", self.name, line)
                 state.current = int(m.group(1))
                 continue
 
             m = p2.match(line)
             if m:
+                #logger.debug("[%s] (match 3) %s", self.name, line)
                 state.total = int(m.group(1))
 
+        logger.debug("[%s] update_cfheader ends" % self.name)
+
 
 class Lndbtc(Lnd):
     def __init__(self, *args):

images/utils/launcher/node/xud.py

@@ -5,13 +5,14 @@
 import logging
 import os
 import re
-from concurrent.futures import wait
-from threading import Event
+from concurrent.futures import wait, TimeoutError
+import threading
 from typing import List, Optional
 import docker.errors
 
 from launcher.table import ServiceTable
 from launcher.utils import yes_or_no, normalize_path
+from launcher.errors import NoWaiting
 from .base import Node, CliBackend, CliError
 from .lnd import CFHeaderState
 
@@ -78,7 +79,6 @@ def _get_environment(self) -> List[str]:
         ]
 
         lndbtc = self.config.nodes["lndbtc"]
-        env.append("LNDBTC_MODE={}".format(lndbtc["mode"]))
         if lndbtc["mode"] == "external":
             env.extend([
                 "LNDBTC_RPC_HOST={}".format(lndbtc["rpc_host"]),
@@ -88,7 +88,6 @@ def _get_environment(self) -> List[str]:
             ])
 
         lndltc = self.config.nodes["lndltc"]
-        env.append("LNDLTC_MODE={}".format(lndltc["mode"]))
         if lndltc["mode"] == "external":
             env.extend([
                 "LNDLTC_RPC_HOST={}".format(lndbtc["rpc_host"]),
@@ -178,7 +177,7 @@ def extract_exception(self, cmd: str, output: str):
                 print("^C")
                 raise KeyboardInterrupt()
 
-    def _ensure_dependencies_ready(self, stop: Event):
+    def _ensure_dependencies_ready(self, stop: threading.Event):
         deps = [
             self.get_service("lndbtc"),
             self.get_service("lndltc"),
@@ -428,9 +427,13 @@ def _ensure_lnds_synced(self, stop):
 
         if len(lnds) > 0:
             def all_ready():
+                nonlocal lnds
+
                 return functools.reduce(lambda r, item: r and item.ready, lnds.values(), True)
 
-            def print_syncing(stop):
+            def print_syncing(stop: threading.Event):
+                nonlocal lnds
+
                 print("Syncing light clients:")
 
                 rows = {}
@@ -443,6 +446,7 @@ def print_syncing(stop):
 
                 while not stop.is_set():
                     i = 0
+                    logger.debug("lnds %r", lnds)
                     for lnd, state in lnds.items():
                         old_msg = rows[lnd.name]
                         msg = state.message
@@ -461,44 +465,72 @@ def print_syncing(stop):
 
                     stop.wait(1)
 
-            futs = []
+                logger.debug("Light clients syncing ends")
 
             executor = self.config.executor
 
+            f = executor.submit(print_syncing, stop)
+
             for lnd in lnds:
-                futs.append(executor.submit(lnd.update_cfheader, lnds[lnd], stop))
+                executor.submit(lnd.update_cfheader, lnds[lnd], stop)
 
-            # Thread(target=print_syncing, args=(stop,)).start()
-            futs.append(executor.submit(print_syncing, stop))
+            f.result()
+            logger.debug("print_syncing ends")
 
-            wait(futs)
+    def _wait_tls_cert(self, stop: threading.Event):
+        tls_file = os.path.join(self.data_dir, "tls.cert")
+        while not stop.is_set():
+            if os.path.exists(tls_file):
+                break
+            stop.wait(1)
 
-    def ensure_ready(self, stop: Event):
-        logger.info("Ensuring ready")
+    def ensure_ready(self, stop: threading.Event):
+        logger.info("Ensuring XUD is ready")
 
         if self.node_manager.newly_installed:
+            logger.info("Ensuring LNDs are synced (light)")
             self._ensure_lnds_synced(stop)
 
+        logger.info("Ensuring XUD dependencies are ready (lndbtc, lndltc and connext)")
         self._ensure_dependencies_ready(stop)
 
+        logger.info("Waiting for XUD to be ready")
+        executor = self.config.executor
+        f = executor.submit(self._wait_tls_cert, stop)
+
+        while not stop.is_set():
+            logger.info("Waiting for XUD tls.cert to be created")
+            try:
+                f.result(30)
+            except TimeoutError:
+                print("XUD should not take so much time to create \"tls.cert\" file. please check container \"%s\" logs for more details." % self.container_name)
+                reply = yes_or_no("Would you like to keep waiting?")
+                if reply == "no":
+                    raise NoWaiting
+
         # Error: ENOENT: no such file or directory, open '/root/.xud/tls.cert'
         # xud is starting... try again in a few seconds
         # xud is locked, run 'xucli unlock', 'xucli create', or 'xucli restore' then try again
+        cmd = self._cli + " getinfo -j"
         while not stop.is_set():
             try:
-                exit_code, output = self.exec(self._cli + " getinfo -j")
+                exit_code, output = self.exec(cmd)
                 if exit_code == 0:
                     break
                 if "xud is locked" in output:
                     break
+                logger.debug("[Execute] %s (exit_code=%s)\n%s", cmd, exit_code, output.rstrip())
             except docker.errors.APIError:
                 logger.exception("Failed to getinfo")
-            stop.wait(3)
+            stop.wait(1)
 
         if not self.has_wallets():
+            logger.info("Setting up XUD wallets")
             self._setup_wallets()
 
+        logger.info("Setting up XUD backup")
         self._setup_backup()
 
         if self._is_locked():
+            logger.info("Unlock XUD")
             self._unlock()

images/utils/launcher/utils.py

@@ -69,7 +69,7 @@ def yes_or_no(prompt, default="yes"):
             return default
         if reply in ["y", "yes"]:
             return "yes"
-        if reply == ["n", "no"]:
+        if reply in ["n", "no"]:
             return "no"
 
 

images/xud/entrypoint.sh

@@ -66,16 +66,6 @@ CONNEXT_IP=$(getent hosts connext || echo '' | awk '{ print $1 }')
 echo "$CONNEXT_IP connext" >> /etc/hosts
 
 
-while [[ $LNDBTC_MODE == "native" && ! -e /root/.lndbtc/tls.cert ]]; do
-    echo "[entrypoint] Waiting for /root/.lndbtc/tls.cert to be created..."
-    sleep 1
-done
-
-while [[ $LNDLTC_MODE == "native" && ! -e /root/.lndltc/tls.cert ]]; do
-    echo "[entrypoint] Waiting for /root/.lndltc/tls.cert to be created..."
-    sleep 1
-done
-
 if [[ -z ${LNDBTC_RPC_HOST:-} ]]; then
     LNDBTC_RPC_HOST="lndbtc"
 fi