refactoring is on the way
diff --git a/wally/discover/ceph.py b/wally/discover/ceph.py
index ae06cbc..4a72bfb 100644
--- a/wally/discover/ceph.py
+++ b/wally/discover/ceph.py
@@ -1,64 +1,91 @@
""" Collect data about ceph nodes"""
import json
import logging
-from typing import Iterable
+from typing import List, Set, Dict
-from ..node import NodeInfo, Node
-
+from ..node_interfaces import NodeInfo, IRPCNode
+from ..ssh_utils import ConnCreds
+from ..common_types import IP
logger = logging.getLogger("wally.discover")
-def discover_ceph_nodes(node: Node) -> Iterable[NodeInfo]:
+def discover_ceph_nodes(node: IRPCNode,
+ cluster: str = "ceph",
+ conf: str = None,
+ key: str = None) -> List[NodeInfo]:
"""Return list of ceph's nodes NodeInfo"""
- ips = {}
- osd_ips = get_osds_ips(node, get_osds_list(node))
- mon_ips = get_mons_or_mds_ips(node, "mon")
- mds_ips = get_mons_or_mds_ips(node, "mds")
+ if conf is None:
+ conf = "/etc/ceph/{}.conf".format(cluster)
+ if key is None:
+ key = "/etc/ceph/{}.client.admin.keyring".format(cluster)
+
+ try:
+ osd_ips = get_osds_ips(node, conf, key)
+ except Exception as exc:
+ logger.error("OSD discovery failed: %s", exc)
+ osd_ips = set()
+
+ try:
+ mon_ips = get_mons_ips(node, conf, key)
+ except Exception as exc:
+ logger.error("MON discovery failed: %s", exc)
+ mon_ips = set()
+
+ ips = {} # type: Dict[str, List[str]]
for ip in osd_ips:
- url = "ssh://%s" % ip
- ips.setdefault(url, []).append("ceph-osd")
+ ips.setdefault(ip, []).append("ceph-osd")
for ip in mon_ips:
- url = "ssh://%s" % ip
- ips.setdefault(url, []).append("ceph-mon")
+ ips.setdefault(ip, []).append("ceph-mon")
- for ip in mds_ips:
- url = "ssh://%s" % ip
- ips.setdefault(url, []).append("ceph-mds")
-
- return [NodeInfo(url, set(roles)) for url, roles in ips.items()]
+ ssh_key = node.get_file_content("~/.ssh/id_rsa")
+ return [NodeInfo(ConnCreds(host=ip, user="root", key=ssh_key), set(roles)) for ip, roles in ips.items()]
-def get_osds_list(node: Node) -> Iterable[str]:
- """Get list of osd's id"""
- return filter(None, node.run("ceph osd ls").split("\n"))
+def get_osds_ips(node: IRPCNode, conf: str, key: str) -> Set[IP]:
+ """Get set of osd's ip"""
-
-def get_mons_or_mds_ips(node: Node, who: str) -> Iterable[str]:
- """Return mon ip list. who - mon/mds"""
- assert who in ("mon", "mds"), \
- "{!r} in get_mons_or_mds_ips instead of mon/mds".format(who)
-
- line_res = node.run("ceph {0} dump".format(who)).split("\n")
-
- ips = set()
- for line in line_res:
- fields = line.split()
- if len(fields) > 2 and who in fields[2]:
- ips.add(fields[1].split(":")[0])
-
+ data = node.run("ceph -c {} -k {} --format json osd dump".format(conf, key))
+ jdata = json.loads(data)
+ ips = set() # type: Set[IP]
+ first_error = True
+ for osd_data in jdata["osds"]:
+ if "public_addr" not in osd_data:
+ if first_error:
+ osd_id = osd_data.get("osd", "<OSD_ID_MISSED>")
+ logger.warning("No 'public_addr' field in 'ceph osd dump' output for osd %s" +
+ "(all subsequent errors omitted)", osd_id)
+ first_error = False
+ else:
+ ip_port = osd_data["public_addr"]
+ if '/' in ip_port:
+ ip_port = ip_port.split("/", 1)[0]
+ ips.add(IP(ip_port.split(":")[0]))
return ips
-def get_osds_ips(node: Node, osd_list: Iterable[str]) -> Iterable[str]:
- """Get osd's ips. osd_list - list of osd names from osd ls command"""
- ips = set()
- for osd_id in osd_list:
- out = node.run("ceph osd find {0}".format(osd_id))
- ip = json.loads(out)["ip"]
- ips.add(str(ip.split(":")[0]))
+def get_mons_ips(node: IRPCNode, conf: str, key: str) -> Set[IP]:
+ """Return mon ip set"""
+
+ data = node.run("ceph -c {} -k {} --format json mon_status".format(conf, key))
+ jdata = json.loads(data)
+ ips = set() # type: Set[IP]
+ first_error = True
+ for mon_data in jdata["monmap"]["mons"]:
+ if "addr" not in mon_data:
+ if first_error:
+ mon_name = mon_data.get("name", "<MON_NAME_MISSED>")
+ logger.warning("No 'addr' field in 'ceph mon_status' output for mon %s" +
+ "(all subsequent errors omitted)", mon_name)
+ first_error = False
+ else:
+ ip_port = mon_data["addr"]
+ if '/' in ip_port:
+ ip_port = ip_port.split("/", 1)[0]
+ ips.add(IP(ip_port.split(":")[0]))
+
return ips