RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 14:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45798 from adk3798/iscsi-only-pid-limit

Browse Source 
cephadm: only apply unlimited pids-limit to iscsi and rgw

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2022-04-11 16:02:50 +02:00 committed by GitHub
commit 88db8db1b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/workunits/cephadm/test_iscsi_pids_limit.sh
View File

@ -12,7 +12,7 @@ test ${CONT_COUNT} -eq 2
for i in ${ISCSI_CONT_IDS}
do
sudo podman exec ${i} /bin/sh -c 'for j in {0..20000}; do sleep 30 & done'
sudo podman exec ${i} /bin/sh -c 'for j in {0..20000}; do sleep 300 & done'
done
for i in ${ISCSI_CONT_IDS}

25
src/cephadm/cephadm
View File

@ -813,10 +813,7 @@ class CephIscsi(object):
# remove extra container args for tcmu container.
# extra args could cause issue with forking service type
tcmu_container.container_args = []
# set container limits to unlimited as defaults (Docker 4096 / Podman 2048)
# prevents the creation of max lun (default 255)
pids_unlimited = '-1' if isinstance(self.ctx.container_engine, Podman) else '0'
tcmu_container.container_args.extend(['--pids-limit=%s' % pids_unlimited])
set_pids_limit_unlimited(self.ctx, tcmu_container.container_args)
return tcmu_container
##################################
@ -2753,6 +2750,17 @@ def get_ceph_volume_container(ctx: CephadmContext,
)
def set_pids_limit_unlimited(ctx: CephadmContext, container_args: List[str]) -> None:
# set container's pids-limit to unlimited rather than default (Docker 4096 / Podman 2048)
# Useful for daemons like iscsi where the default pids-limit limits the number of luns
# per iscsi target or rgw where increasing the rgw_thread_pool_size to a value near
# the default pids-limit may cause the container to crash.
if isinstance(ctx.container_engine, Podman):
container_args.append('--pids-limit=-1')
else:
container_args.append('--pids-limit=0')
def get_container(ctx: CephadmContext,
fsid: str, daemon_type: str, daemon_id: Union[int, str],
privileged: bool = False,
@ -2774,6 +2782,7 @@ def get_container(ctx: CephadmContext,
if daemon_type == 'rgw':
entrypoint = '/usr/bin/radosgw'
name = 'client.rgw.%s' % daemon_id
set_pids_limit_unlimited(ctx, container_args)
elif daemon_type == 'rbd-mirror':
entrypoint = '/usr/bin/rbd-mirror'
name = 'client.rbd-mirror.%s' % daemon_id
@ -2807,6 +2816,7 @@ def get_container(ctx: CephadmContext,
# So the container can modprobe iscsi_target_mod and have write perms
# to configfs we need to make this a privileged container.
privileged = True
set_pids_limit_unlimited(ctx, container_args)
elif daemon_type == CustomContainer.daemon_type:
cc = CustomContainer.init(ctx, fsid, daemon_id)
entrypoint = cc.entrypoint
@ -2840,8 +2850,6 @@ def get_container(ctx: CephadmContext,
# if using podman, set -d, --conmon-pidfile & --cidfile flags
# so service can have Type=Forking
# set containers limits to unlimited as defaults (Docker 4096 / Podman 2048)
# prevents some app customizations from running
if isinstance(ctx.container_engine, Podman):
runtime_dir = '/run'
container_args.extend([
@ -2850,14 +2858,9 @@ def get_container(ctx: CephadmContext,
runtime_dir + '/ceph-%s@%s.%s.service-pid' % (fsid, daemon_type, daemon_id),
'--cidfile',
runtime_dir + '/ceph-%s@%s.%s.service-cid' % (fsid, daemon_type, daemon_id),
'--pids-limit=-1',
])
if ctx.container_engine.version >= CGROUPS_SPLIT_PODMAN_VERSION:
container_args.append('--cgroups=split')
else:
container_args.extend([
'--pids-limit=0',
])
return CephContainer.for_daemon(
ctx,