Choose an IP from the subnet list provided by the ServiceSpec.
A few caveats:
- we ignore hosts that don't have IPs in the given subnet
- the subnet matching is STRICT. That is, the CIDR name has to exactly
match what is configured on the host. That means you can't just say 10/8
to match any 10.whatever addres--you need the exactly network on the host
(e.g, 10.1.2.0/24).
- If you modify a servicespec and change the networks when there are
already deployed daemons, we will try to deploy the new instances on
the same ports but bound to a specific IP instead of *. Which will fail.
You need to remove the service first, or remove the old daemons manually
so that creating new ones will succeed.
Signed-off-by: Sage Weil <sage@newdream.net>
ha = HostAssignment(
spec=spec,
hosts=self._hosts_with_daemon_inventory(),
+ networks=self.cache.networks,
daemons=self.cache.get_daemons_by_service(spec.service_name()),
allow_colo=self.cephadm_services[spec.service_type].allow_colo(),
)
HostAssignment(
spec=spec,
hosts=self.inventory.all_specs(), # All hosts, even those without daemon refresh
+ networks=self.cache.networks,
daemons=self.cache.get_daemons_by_service(spec.service_name()),
allow_colo=self.cephadm_services[spec.service_type].allow_colo(),
).validate()
import logging
import random
-from typing import List, Optional, Callable, TypeVar, Tuple, NamedTuple
+from typing import List, Optional, Callable, TypeVar, Tuple, NamedTuple, Dict
import orchestrator
from ceph.deployment.service_spec import ServiceSpec
spec, # type: ServiceSpec
hosts: List[orchestrator.HostSpec],
daemons: List[orchestrator.DaemonDescription],
+ networks: Dict[str, Dict[str, List[str]]] = {},
filter_new_host=None, # type: Optional[Callable[[str],bool]]
allow_colo: bool = False,
):
self.filter_new_host = filter_new_host
self.service_name = spec.service_name()
self.daemons = daemons
+ self.networks = networks
self.allow_colo = allow_colo
self.port_start = spec.get_port_start()
existing, to_add))
return existing_slots + to_add, to_add, to_remove
+ def find_ip_on_host(self, hostname: str, subnets: List[str]) -> Optional[str]:
+ for subnet in subnets:
+ ips = self.networks.get(hostname, {}).get(subnet, [])
+ if ips:
+ return sorted(ips)[0]
+ return None
+
def get_candidates(self) -> List[DaemonPlacement]:
if self.spec.placement.hosts:
ls = [
raise OrchestratorValidationError(
"placement spec is empty: no hosts, no label, no pattern, no count")
+ # allocate an IP?
+ if self.spec.networks:
+ orig = ls.copy()
+ ls = []
+ for p in orig:
+ ip = self.find_ip_on_host(p.hostname, self.spec.networks)
+ if ip:
+ ls.append(DaemonPlacement(hostname=p.hostname, network=p.network,
+ name=p.name, port=p.port, ip=ip))
+ else:
+ logger.debug(
+ f'Skipping {p.hostname} with no IP in network(s) {self.spec.networks}'
+ )
+
if self.filter_new_host:
old = ls.copy()
ls = [h for h in ls if self.filter_new_host(h.hostname)]
spec=spec,
hosts=self.mgr._hosts_with_daemon_inventory(),
daemons=daemons,
+ networks=self.mgr.cache.networks,
filter_new_host=matches_network if service_type == 'mon'
else virtual_ip_allowed if service_type == 'ha-rgw' else None,
allow_colo=svc.allow_colo(),
daemon_spec = svc.make_daemon_spec(
slot.hostname, daemon_id, slot.network, spec, daemon_type=daemon_type,
- ports=[slot.port] if slot.port else None
+ ports=[slot.port] if slot.port else None,
+ ip=slot.ip,
)
self.log.debug('Placing %s.%s on host %s' % (
daemon_type, daemon_id, slot.hostname))
network: str,
spec: ServiceSpecs,
daemon_type: Optional[str] = None,
- ports: Optional[List[int]] = None
+ ports: Optional[List[int]] = None,
+ ip: Optional[str] = None,
) -> CephadmDaemonDeploySpec:
return CephadmDaemonDeploySpec(
host=host,
network=network,
daemon_type=daemon_type,
ports=ports,
+ ip=ip,
)
def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonDeploySpec:
# fmt: off
-from typing import NamedTuple, List
+from typing import NamedTuple, List, Dict
import pytest
from ceph.deployment.hostspec import HostSpec
assert h in [h.hostname for h in hosts]
+class NodeAssignmentTest4(NamedTuple):
+ spec: ServiceSpec
+ networks: Dict[str, Dict[str, List[str]]]
+ daemons: List[DaemonDescription]
+ expected: List[str]
+ expected_add: List[str]
+ expected_remove: List[DaemonDescription]
+
+
+@pytest.mark.parametrize("spec,networks,daemons,expected,expected_add,expected_remove",
+ [ # noqa: E128
+ NodeAssignmentTest4(
+ ServiceSpec(
+ service_type='rgw',
+ service_id='foo',
+ placement=PlacementSpec(count=6, label='foo'),
+ networks=['10.0.0.0/8'],
+ ),
+ {
+ 'host1': {'10.0.0.0/8': ['10.0.0.1']},
+ 'host2': {'10.0.0.0/8': ['10.0.0.2']},
+ 'host3': {'192.168.0.0/16': ['192.168.0.1']},
+ },
+ [],
+ ['host1(ip=10.0.0.1 port=80)', 'host2(ip=10.0.0.2 port=80)',
+ 'host1(ip=10.0.0.1 port=81)', 'host2(ip=10.0.0.2 port=81)',
+ 'host1(ip=10.0.0.1 port=82)', 'host2(ip=10.0.0.2 port=82)'],
+ ['host1(ip=10.0.0.1 port=80)', 'host2(ip=10.0.0.2 port=80)',
+ 'host1(ip=10.0.0.1 port=81)', 'host2(ip=10.0.0.2 port=81)',
+ 'host1(ip=10.0.0.1 port=82)', 'host2(ip=10.0.0.2 port=82)'],
+ []
+ ),
+ ])
+def test_node_assignment4(spec, networks, daemons,
+ expected, expected_add, expected_remove):
+ all_slots, to_add, to_remove = HostAssignment(
+ spec=spec,
+ hosts=[HostSpec(h, labels=['foo']) for h in networks.keys()],
+ daemons=daemons,
+ allow_colo=True,
+ networks=networks,
+ ).place()
+
+ got = [str(p) for p in all_slots]
+ num_wildcard = 0
+ for i in expected:
+ if i == '*':
+ num_wildcard += 1
+ else:
+ assert i in got
+ got.remove(i)
+ assert num_wildcard == len(got)
+
+ got = [str(p) for p in to_add]
+ num_wildcard = 0
+ for i in expected_add:
+ if i == '*':
+ num_wildcard += 1
+ else:
+ assert i in got
+ got.remove(i)
+ assert num_wildcard == len(got)
+
+ assert sorted([d.name() for d in to_remove]) == sorted(expected_remove)
+
+
@pytest.mark.parametrize("placement",
[ # noqa: E128
('1 *'),
projects / ceph.git / commitdiff