mirror of
https://github.com/ceph/ceph
synced 2025-03-25 11:48:05 +00:00
Merge PR #34842 into master
* refs/pull/34842/head: qa/tasks/vstart_runner.py: disable the ns unsharing if using localhost Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> Reviewed-by: Rishabh Dave <ridave@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
commit
07cba31a03
@ -592,6 +592,16 @@ def safe_kill(pid):
|
|||||||
else:
|
else:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
def mon_in_localhost(config_path="./ceph.conf"):
|
||||||
|
"""
|
||||||
|
If the ceph cluster is using the localhost IP as mon host, will must disable ns unsharing
|
||||||
|
"""
|
||||||
|
with open(config_path) as f:
|
||||||
|
for line in f:
|
||||||
|
local = re.match(r'^\s*mon host\s*=\s*\[((v1|v2):127\.0\.0\.1:\d+,?)+\]', line)
|
||||||
|
if local:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
class LocalKernelMount(KernelMount):
|
class LocalKernelMount(KernelMount):
|
||||||
def __init__(self, ctx, test_dir, client_id=None,
|
def __init__(self, ctx, test_dir, client_id=None,
|
||||||
@ -1613,6 +1623,9 @@ def exec_test():
|
|||||||
if opt_create_cluster_only:
|
if opt_create_cluster_only:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if opt_use_ns and mon_in_localhost() and not opt_create_cluster:
|
||||||
|
raise RuntimeError("cluster is on localhost; '--usens' option is incompatible. Or you can pass an extra '--create' option to create a new cluster without localhost!")
|
||||||
|
|
||||||
# List of client mounts, sufficient to run the selected tests
|
# List of client mounts, sufficient to run the selected tests
|
||||||
clients = [i.__str__() for i in range(0, max_required_clients)]
|
clients = [i.__str__() for i in range(0, max_required_clients)]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user