Skip to content

Commit

Permalink
put logic to common function
Browse files Browse the repository at this point in the history
  • Loading branch information
tomasfratrik committed Jul 2, 2024
1 parent 9208cfa commit 87f52e4
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 32 deletions.
25 changes: 25 additions & 0 deletions commands/command_utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import json
import os
import resource
import re

from leapp.exceptions import CommandError
Expand Down Expand Up @@ -140,3 +141,27 @@ def vet_upgrade_path(args):
flavor=flavor,
choices=','.join(supported_target_versions)))
return (target_release, flavor)


def set_resource_limits():
"""
Set resource limits for the maximum number of open file descriptors and the maximum writable file size.
:raises: `CommandError` if the resource limits cannot be set
"""

soft_nofile, _ = resource.getrlimit(resource.RLIMIT_NOFILE)
soft_fsize, _ = resource.getrlimit(resource.RLIMIT_FSIZE)
nofile_limit = 1024*16

if soft_nofile < nofile_limit:
try:
resource.setrlimit(resource.RLIMIT_NOFILE, (nofile_limit, nofile_limit))
except OSError as err:
raise CommandError('Failed to set limit for maximum number of open file descriptors: {}'.format(err))

if soft_fsize != resource.RLIM_INFINITY:
try:
resource.setrlimit(resource.RLIMIT_FSIZE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY))
except OSError as err:
raise CommandError('Failed to set limit for maximum writeable file size: {}'.format(err))
17 changes: 1 addition & 16 deletions commands/preupgrade/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import os
import resource
import sys
import uuid

Expand Down Expand Up @@ -60,21 +59,7 @@ def preupgrade(args, breadcrumbs):
except LeappError as exc:
raise CommandError(exc.message)

soft_nofile, _ = resource.getrlimit(resource.RLIMIT_NOFILE)
soft_fsize, _ = resource.getrlimit(resource.RLIMIT_FSIZE)
nofile_limit = 1024*16

if soft_nofile < nofile_limit:
try:
resource.setrlimit(resource.RLIMIT_NOFILE, (nofile_limit, nofile_limit))
except OSError as err:
raise CommandError('Failed to set limit for maximum number of open file descriptors: {}'.format(err))

if soft_fsize != resource.RLIM_INFINITY:
try:
resource.setrlimit(resource.RLIMIT_FSIZE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY))
except OSError as err:
raise CommandError('Failed to set limit for maximum writeable file size: {}'.format(err))
command_utils.set_resource_limits()

workflow = repositories.lookup_workflow('IPUWorkflow')()
util.warn_if_unsupported(configuration)
Expand Down
17 changes: 1 addition & 16 deletions commands/upgrade/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import os
import resource
import sys
import uuid

Expand Down Expand Up @@ -91,21 +90,7 @@ def upgrade(args, breadcrumbs):
except LeappError as exc:
raise CommandError(exc.message)

soft_nofile, _ = resource.getrlimit(resource.RLIMIT_NOFILE)
soft_fsize, _ = resource.getrlimit(resource.RLIMIT_FSIZE)
nofile_limit = 1024*16

if soft_nofile < nofile_limit:
try:
resource.setrlimit(resource.RLIMIT_NOFILE, (nofile_limit, nofile_limit))
except OSError as err:
raise CommandError('Failed to set limit for maximum number of open file descriptors: {}'.format(err))

if soft_fsize != resource.RLIM_INFINITY:
try:
resource.setrlimit(resource.RLIMIT_FSIZE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY))
except OSError as err:
raise CommandError('Failed to set limit for maximum writeable file size: {}'.format(err))
command_utils.set_resource_limits()

workflow = repositories.lookup_workflow('IPUWorkflow')(auto_reboot=args.reboot)
util.process_whitelist_experimental(repositories, workflow, configuration, logger)
Expand Down

0 comments on commit 87f52e4

Please sign in to comment.