From 35b429df320c899fec9bed9ddf8b3fc9777cd4a6 Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Fri, 25 Oct 2024 07:56:23 -0400 Subject: [PATCH 1/5] [irods/irods#7229,#235] iRODS 5: Add irodsAgent entry to rsyslog config. --- irods_testing_environment/irods_setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/irods_testing_environment/irods_setup.py b/irods_testing_environment/irods_setup.py index 4337912..8565577 100644 --- a/irods_testing_environment/irods_setup.py +++ b/irods_testing_environment/irods_setup.py @@ -384,6 +384,8 @@ def restart_rsyslog(container): \$template irods_format,\\"%msg%\\n\\" :programname,startswith,\\"irodsServer\\" /var/log/irods/irods.log;irods_format & stop + :programname,startswith,\\"irodsAgent\\" /var/log/irods/irods.log;irods_format + & stop :programname,startswith,\\"irodsDelayServer\\" /var/log/irods/irods.log;irods_format & stop''') From 12ec9409c1abe687cb7a9cfa243662a7c5a83e82 Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Fri, 1 Nov 2024 00:31:42 -0400 Subject: [PATCH 2/5] [irods/irods#7229,#235] iRODS 5: Reload configuration on completion of federation initialization. Changes to config files in iRODS 5 are not automatically loaded, therefore, the testing environment must instruct the iRODS 5 server to reload its config files before launching the tests. --- irods_testing_environment/irods_config.py | 32 ++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/irods_testing_environment/irods_config.py b/irods_testing_environment/irods_config.py index f3cbc3c..577a593 100644 --- a/irods_testing_environment/irods_config.py +++ b/irods_testing_environment/irods_config.py @@ -105,6 +105,16 @@ def get_irods_version_info(container, version_file_key): raise RuntimeError(f'[{container.name}]: No iRODS version file found') +def server_version_is_irods_5(container): + """Returns True if iRODS 5 is installed in the container. + + Arguments: + container -- the container to check + """ + irods5_binary_exists = "[ -f /usr/sbin/irodsAgent ]" + return execute.execute_command(container, irods5_binary_exists, user='irods') == 0 + + def configure_users_for_auth_tests(docker_client, compose_project): """Create Linux users and set passwords for authentication testing. @@ -436,11 +446,31 @@ def configure_irods_federation_testing(ctx, remote_zone, zone_where_tests_will_r # add specific query to the local zone bug_3466_query = 'select alias, sqlStr from R_SPECIFIC_QUERY' asq = 'iadmin asq \'{}\' {}'.format(bug_3466_query, 'bug_3466_query') - logging.info('creating specific query[{}] [{}]'.format(asq, container.name)) + logging.info('creating specific query [{}] [{}]'.format(asq, container.name)) if execute.execute_command(container, asq, user='irods') is not 0: raise RuntimeError('failed to create specific query [{}] [{}]' .format(bug_3466_query, container.name)) + # reload configuration for both zones if iRODS 5 is installed + if server_version_is_irods_5(container): + reload_config = "python3 -c 'from scripts.irods.controller import IrodsController; IrodsController().reload_configuration()'" + logging.info('reloading configuration for [{}] [{}]'.format(reload_config, container.name)) + if execute.execute_command(container, reload_config, user='irods', workdir=context.irods_home()) is not 0: + raise RuntimeError('failed to reload configuration [{}] [{}]' + .format(reload_config, container.name)) + + container = ctx.docker_client.containers.get( + context.irods_catalog_provider_container( + ctx.compose_project.name, + service_instance=zone_where_tests_will_run.provider_service_instance + ) + ) + + logging.info('reloading configuration for [{}] [{}]'.format(reload_config, container.name)) + if execute.execute_command(container, reload_config, user='irods', workdir=context.irods_home()) is not 0: + raise RuntimeError('failed to reload configuration [{}] [{}]' + .format(reload_config, container.name)) + def configure_pam_for_auth_plugin(docker_client, compose_project): """Add lines required for PAM legacy/pam_password auth plugin to work across all platforms. From 575b5fd45d19b7610a2011008409364702e88dfb Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Sat, 2 Nov 2024 11:05:34 -0400 Subject: [PATCH 3/5] [irods/irods#7229,#235] iRODS 5: Increase shared memory allocation for containers from 64mb to 100mb. The tests for iRODS 5 lean heavily on configuration reloading. This operation results in at least two agent factories appearing, increasing the amount of shared memory needed by the container. This commit makes it so that the tests don't terminate due to a server reload. --- .../almalinux-8-mariadb-10.11/docker-compose.yml | 10 ++++++++++ .../almalinux-8-mariadb-10.6/docker-compose.yml | 10 ++++++++++ .../almalinux-8-mariadb-11.4/docker-compose.yml | 10 ++++++++++ .../almalinux-8-mysql-8.0/docker-compose.yml | 10 ++++++++++ .../almalinux-8-mysql-8.4/docker-compose.yml | 10 ++++++++++ .../almalinux-8-postgres-14/docker-compose.yml | 10 ++++++++++ .../almalinux-8-postgres-16/docker-compose.yml | 10 ++++++++++ .../debian-11-mariadb-10.11/docker-compose.yml | 10 ++++++++++ .../debian-11-mariadb-10.6/docker-compose.yml | 10 ++++++++++ .../debian-11/debian-11-mysql-8.0/docker-compose.yml | 10 ++++++++++ .../debian-11/debian-11-postgres-14/docker-compose.yml | 10 ++++++++++ .../debian-11/debian-11-postgres-16/docker-compose.yml | 10 ++++++++++ .../debian-12-mariadb-10.11/docker-compose.yml | 10 ++++++++++ .../debian-12-mariadb-11.4/docker-compose.yml | 10 ++++++++++ .../debian-12/debian-12-mysql-8.0/docker-compose.yml | 10 ++++++++++ .../debian-12/debian-12-mysql-8.4/docker-compose.yml | 10 ++++++++++ .../debian-12/debian-12-postgres-14/docker-compose.yml | 10 ++++++++++ .../debian-12/debian-12-postgres-16/docker-compose.yml | 10 ++++++++++ .../rockylinux-8-mariadb-10.11/docker-compose.yml | 10 ++++++++++ .../rockylinux-8-mariadb-10.6/docker-compose.yml | 10 ++++++++++ .../rockylinux-8-mariadb-11.4/docker-compose.yml | 10 ++++++++++ .../rockylinux-8-mysql-8.0/docker-compose.yml | 10 ++++++++++ .../rockylinux-8-mysql-8.4/docker-compose.yml | 10 ++++++++++ .../rockylinux-8-postgres-14/docker-compose.yml | 10 ++++++++++ .../rockylinux-8-postgres-16/docker-compose.yml | 10 ++++++++++ .../rockylinux-9-mariadb-10.11/docker-compose.yml | 10 ++++++++++ .../rockylinux-9-mariadb-11.4/docker-compose.yml | 10 ++++++++++ .../rockylinux-9-mysql-8.0/docker-compose.yml | 10 ++++++++++ .../rockylinux-9-mysql-8.4/docker-compose.yml | 10 ++++++++++ .../rockylinux-9-postgres-14/docker-compose.yml | 10 ++++++++++ .../rockylinux-9-postgres-16/docker-compose.yml | 10 ++++++++++ .../ubuntu-20.04-mariadb-10.11/docker-compose.yml | 10 ++++++++++ .../ubuntu-20.04-mariadb-10.6/docker-compose.yml | 10 ++++++++++ .../ubuntu-20.04-mysql-8.0/docker-compose.yml | 10 ++++++++++ .../ubuntu-20.04-postgres-14/docker-compose.yml | 10 ++++++++++ .../ubuntu-20.04-postgres-16/docker-compose.yml | 10 ++++++++++ .../ubuntu-22.04-mariadb-10.11/docker-compose.yml | 10 ++++++++++ .../ubuntu-22.04-mariadb-10.6/docker-compose.yml | 10 ++++++++++ .../ubuntu-22.04-mariadb-11.4/docker-compose.yml | 10 ++++++++++ .../ubuntu-22.04-mysql-8.0/docker-compose.yml | 10 ++++++++++ .../ubuntu-22.04-mysql-8.4/docker-compose.yml | 10 ++++++++++ .../ubuntu-22.04-postgres-14/docker-compose.yml | 10 ++++++++++ .../ubuntu-22.04-postgres-16/docker-compose.yml | 10 ++++++++++ .../ubuntu-24.04-mariadb-10.11/docker-compose.yml | 10 ++++++++++ .../ubuntu-24.04-mariadb-11.4/docker-compose.yml | 10 ++++++++++ .../ubuntu-24.04-mysql-8.0/docker-compose.yml | 10 ++++++++++ .../ubuntu-24.04-mysql-8.4/docker-compose.yml | 10 ++++++++++ .../ubuntu-24.04-postgres-14/docker-compose.yml | 10 ++++++++++ .../ubuntu-24.04-postgres-16/docker-compose.yml | 10 ++++++++++ 49 files changed, 490 insertions(+) diff --git a/projects/almalinux-8/almalinux-8-mariadb-10.11/docker-compose.yml b/projects/almalinux-8/almalinux-8-mariadb-10.11/docker-compose.yml index 413d3c1..f6b99eb 100644 --- a/projects/almalinux-8/almalinux-8-mariadb-10.11/docker-compose.yml +++ b/projects/almalinux-8/almalinux-8-mariadb-10.11/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/almalinux-8/almalinux-8-mariadb-10.6/docker-compose.yml b/projects/almalinux-8/almalinux-8-mariadb-10.6/docker-compose.yml index 07f58e4..f657ca4 100644 --- a/projects/almalinux-8/almalinux-8-mariadb-10.6/docker-compose.yml +++ b/projects/almalinux-8/almalinux-8-mariadb-10.6/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/almalinux-8/almalinux-8-mariadb-11.4/docker-compose.yml b/projects/almalinux-8/almalinux-8-mariadb-11.4/docker-compose.yml index f8621a2..9273d79 100644 --- a/projects/almalinux-8/almalinux-8-mariadb-11.4/docker-compose.yml +++ b/projects/almalinux-8/almalinux-8-mariadb-11.4/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/almalinux-8/almalinux-8-mysql-8.0/docker-compose.yml b/projects/almalinux-8/almalinux-8-mysql-8.0/docker-compose.yml index 53e00e3..55e63b2 100644 --- a/projects/almalinux-8/almalinux-8-mysql-8.0/docker-compose.yml +++ b/projects/almalinux-8/almalinux-8-mysql-8.0/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/almalinux-8/almalinux-8-mysql-8.4/docker-compose.yml b/projects/almalinux-8/almalinux-8-mysql-8.4/docker-compose.yml index ca46056..63b3aff 100644 --- a/projects/almalinux-8/almalinux-8-mysql-8.4/docker-compose.yml +++ b/projects/almalinux-8/almalinux-8-mysql-8.4/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/almalinux-8/almalinux-8-postgres-14/docker-compose.yml b/projects/almalinux-8/almalinux-8-postgres-14/docker-compose.yml index 1823e1b..0221c9e 100644 --- a/projects/almalinux-8/almalinux-8-postgres-14/docker-compose.yml +++ b/projects/almalinux-8/almalinux-8-postgres-14/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/almalinux-8/almalinux-8-postgres-16/docker-compose.yml b/projects/almalinux-8/almalinux-8-postgres-16/docker-compose.yml index 084195e..e6d4e37 100644 --- a/projects/almalinux-8/almalinux-8-postgres-16/docker-compose.yml +++ b/projects/almalinux-8/almalinux-8-postgres-16/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-11/debian-11-mariadb-10.11/docker-compose.yml b/projects/debian-11/debian-11-mariadb-10.11/docker-compose.yml index 413d3c1..f6b99eb 100644 --- a/projects/debian-11/debian-11-mariadb-10.11/docker-compose.yml +++ b/projects/debian-11/debian-11-mariadb-10.11/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-11/debian-11-mariadb-10.6/docker-compose.yml b/projects/debian-11/debian-11-mariadb-10.6/docker-compose.yml index 07f58e4..f657ca4 100644 --- a/projects/debian-11/debian-11-mariadb-10.6/docker-compose.yml +++ b/projects/debian-11/debian-11-mariadb-10.6/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-11/debian-11-mysql-8.0/docker-compose.yml b/projects/debian-11/debian-11-mysql-8.0/docker-compose.yml index 53e00e3..55e63b2 100644 --- a/projects/debian-11/debian-11-mysql-8.0/docker-compose.yml +++ b/projects/debian-11/debian-11-mysql-8.0/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-11/debian-11-postgres-14/docker-compose.yml b/projects/debian-11/debian-11-postgres-14/docker-compose.yml index 1823e1b..0221c9e 100644 --- a/projects/debian-11/debian-11-postgres-14/docker-compose.yml +++ b/projects/debian-11/debian-11-postgres-14/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-11/debian-11-postgres-16/docker-compose.yml b/projects/debian-11/debian-11-postgres-16/docker-compose.yml index 084195e..e6d4e37 100644 --- a/projects/debian-11/debian-11-postgres-16/docker-compose.yml +++ b/projects/debian-11/debian-11-postgres-16/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-12/debian-12-mariadb-10.11/docker-compose.yml b/projects/debian-12/debian-12-mariadb-10.11/docker-compose.yml index 413d3c1..f6b99eb 100644 --- a/projects/debian-12/debian-12-mariadb-10.11/docker-compose.yml +++ b/projects/debian-12/debian-12-mariadb-10.11/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-12/debian-12-mariadb-11.4/docker-compose.yml b/projects/debian-12/debian-12-mariadb-11.4/docker-compose.yml index f8621a2..9273d79 100644 --- a/projects/debian-12/debian-12-mariadb-11.4/docker-compose.yml +++ b/projects/debian-12/debian-12-mariadb-11.4/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-12/debian-12-mysql-8.0/docker-compose.yml b/projects/debian-12/debian-12-mysql-8.0/docker-compose.yml index 53e00e3..e275b0d 100644 --- a/projects/debian-12/debian-12-mysql-8.0/docker-compose.yml +++ b/projects/debian-12/debian-12-mysql-8.0/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-12/debian-12-mysql-8.4/docker-compose.yml b/projects/debian-12/debian-12-mysql-8.4/docker-compose.yml index ca46056..63b3aff 100644 --- a/projects/debian-12/debian-12-mysql-8.4/docker-compose.yml +++ b/projects/debian-12/debian-12-mysql-8.4/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-12/debian-12-postgres-14/docker-compose.yml b/projects/debian-12/debian-12-postgres-14/docker-compose.yml index 1823e1b..0221c9e 100644 --- a/projects/debian-12/debian-12-postgres-14/docker-compose.yml +++ b/projects/debian-12/debian-12-postgres-14/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/debian-12/debian-12-postgres-16/docker-compose.yml b/projects/debian-12/debian-12-postgres-16/docker-compose.yml index 084195e..e6d4e37 100644 --- a/projects/debian-12/debian-12-postgres-16/docker-compose.yml +++ b/projects/debian-12/debian-12-postgres-16/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-8/rockylinux-8-mariadb-10.11/docker-compose.yml b/projects/rockylinux-8/rockylinux-8-mariadb-10.11/docker-compose.yml index 413d3c1..f6b99eb 100644 --- a/projects/rockylinux-8/rockylinux-8-mariadb-10.11/docker-compose.yml +++ b/projects/rockylinux-8/rockylinux-8-mariadb-10.11/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-8/rockylinux-8-mariadb-10.6/docker-compose.yml b/projects/rockylinux-8/rockylinux-8-mariadb-10.6/docker-compose.yml index 07f58e4..f657ca4 100644 --- a/projects/rockylinux-8/rockylinux-8-mariadb-10.6/docker-compose.yml +++ b/projects/rockylinux-8/rockylinux-8-mariadb-10.6/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-8/rockylinux-8-mariadb-11.4/docker-compose.yml b/projects/rockylinux-8/rockylinux-8-mariadb-11.4/docker-compose.yml index f8621a2..9273d79 100644 --- a/projects/rockylinux-8/rockylinux-8-mariadb-11.4/docker-compose.yml +++ b/projects/rockylinux-8/rockylinux-8-mariadb-11.4/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-8/rockylinux-8-mysql-8.0/docker-compose.yml b/projects/rockylinux-8/rockylinux-8-mysql-8.0/docker-compose.yml index fe365ca..09c1688 100644 --- a/projects/rockylinux-8/rockylinux-8-mysql-8.0/docker-compose.yml +++ b/projects/rockylinux-8/rockylinux-8-mysql-8.0/docker-compose.yml @@ -45,6 +45,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -53,6 +58,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-8/rockylinux-8-mysql-8.4/docker-compose.yml b/projects/rockylinux-8/rockylinux-8-mysql-8.4/docker-compose.yml index ca46056..63b3aff 100644 --- a/projects/rockylinux-8/rockylinux-8-mysql-8.4/docker-compose.yml +++ b/projects/rockylinux-8/rockylinux-8-mysql-8.4/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-8/rockylinux-8-postgres-14/docker-compose.yml b/projects/rockylinux-8/rockylinux-8-postgres-14/docker-compose.yml index 1823e1b..0221c9e 100644 --- a/projects/rockylinux-8/rockylinux-8-postgres-14/docker-compose.yml +++ b/projects/rockylinux-8/rockylinux-8-postgres-14/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-8/rockylinux-8-postgres-16/docker-compose.yml b/projects/rockylinux-8/rockylinux-8-postgres-16/docker-compose.yml index 084195e..e6d4e37 100644 --- a/projects/rockylinux-8/rockylinux-8-postgres-16/docker-compose.yml +++ b/projects/rockylinux-8/rockylinux-8-postgres-16/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-9/rockylinux-9-mariadb-10.11/docker-compose.yml b/projects/rockylinux-9/rockylinux-9-mariadb-10.11/docker-compose.yml index 413d3c1..f6b99eb 100644 --- a/projects/rockylinux-9/rockylinux-9-mariadb-10.11/docker-compose.yml +++ b/projects/rockylinux-9/rockylinux-9-mariadb-10.11/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-9/rockylinux-9-mariadb-11.4/docker-compose.yml b/projects/rockylinux-9/rockylinux-9-mariadb-11.4/docker-compose.yml index f8621a2..9273d79 100644 --- a/projects/rockylinux-9/rockylinux-9-mariadb-11.4/docker-compose.yml +++ b/projects/rockylinux-9/rockylinux-9-mariadb-11.4/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-9/rockylinux-9-mysql-8.0/docker-compose.yml b/projects/rockylinux-9/rockylinux-9-mysql-8.0/docker-compose.yml index fe365ca..09c1688 100644 --- a/projects/rockylinux-9/rockylinux-9-mysql-8.0/docker-compose.yml +++ b/projects/rockylinux-9/rockylinux-9-mysql-8.0/docker-compose.yml @@ -45,6 +45,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -53,6 +58,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-9/rockylinux-9-mysql-8.4/docker-compose.yml b/projects/rockylinux-9/rockylinux-9-mysql-8.4/docker-compose.yml index ca46056..63b3aff 100644 --- a/projects/rockylinux-9/rockylinux-9-mysql-8.4/docker-compose.yml +++ b/projects/rockylinux-9/rockylinux-9-mysql-8.4/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-9/rockylinux-9-postgres-14/docker-compose.yml b/projects/rockylinux-9/rockylinux-9-postgres-14/docker-compose.yml index 1823e1b..0221c9e 100644 --- a/projects/rockylinux-9/rockylinux-9-postgres-14/docker-compose.yml +++ b/projects/rockylinux-9/rockylinux-9-postgres-14/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/rockylinux-9/rockylinux-9-postgres-16/docker-compose.yml b/projects/rockylinux-9/rockylinux-9-postgres-16/docker-compose.yml index 084195e..e6d4e37 100644 --- a/projects/rockylinux-9/rockylinux-9-postgres-16/docker-compose.yml +++ b/projects/rockylinux-9/rockylinux-9-postgres-16/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-20.04/ubuntu-20.04-mariadb-10.11/docker-compose.yml b/projects/ubuntu-20.04/ubuntu-20.04-mariadb-10.11/docker-compose.yml index 413d3c1..f6b99eb 100644 --- a/projects/ubuntu-20.04/ubuntu-20.04-mariadb-10.11/docker-compose.yml +++ b/projects/ubuntu-20.04/ubuntu-20.04-mariadb-10.11/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-20.04/ubuntu-20.04-mariadb-10.6/docker-compose.yml b/projects/ubuntu-20.04/ubuntu-20.04-mariadb-10.6/docker-compose.yml index 07f58e4..f657ca4 100644 --- a/projects/ubuntu-20.04/ubuntu-20.04-mariadb-10.6/docker-compose.yml +++ b/projects/ubuntu-20.04/ubuntu-20.04-mariadb-10.6/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-20.04/ubuntu-20.04-mysql-8.0/docker-compose.yml b/projects/ubuntu-20.04/ubuntu-20.04-mysql-8.0/docker-compose.yml index 53e00e3..55e63b2 100644 --- a/projects/ubuntu-20.04/ubuntu-20.04-mysql-8.0/docker-compose.yml +++ b/projects/ubuntu-20.04/ubuntu-20.04-mysql-8.0/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-20.04/ubuntu-20.04-postgres-14/docker-compose.yml b/projects/ubuntu-20.04/ubuntu-20.04-postgres-14/docker-compose.yml index 1823e1b..0221c9e 100644 --- a/projects/ubuntu-20.04/ubuntu-20.04-postgres-14/docker-compose.yml +++ b/projects/ubuntu-20.04/ubuntu-20.04-postgres-14/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-20.04/ubuntu-20.04-postgres-16/docker-compose.yml b/projects/ubuntu-20.04/ubuntu-20.04-postgres-16/docker-compose.yml index 084195e..e6d4e37 100644 --- a/projects/ubuntu-20.04/ubuntu-20.04-postgres-16/docker-compose.yml +++ b/projects/ubuntu-20.04/ubuntu-20.04-postgres-16/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-22.04/ubuntu-22.04-mariadb-10.11/docker-compose.yml b/projects/ubuntu-22.04/ubuntu-22.04-mariadb-10.11/docker-compose.yml index 413d3c1..f6b99eb 100644 --- a/projects/ubuntu-22.04/ubuntu-22.04-mariadb-10.11/docker-compose.yml +++ b/projects/ubuntu-22.04/ubuntu-22.04-mariadb-10.11/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-22.04/ubuntu-22.04-mariadb-10.6/docker-compose.yml b/projects/ubuntu-22.04/ubuntu-22.04-mariadb-10.6/docker-compose.yml index 07f58e4..f657ca4 100644 --- a/projects/ubuntu-22.04/ubuntu-22.04-mariadb-10.6/docker-compose.yml +++ b/projects/ubuntu-22.04/ubuntu-22.04-mariadb-10.6/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-22.04/ubuntu-22.04-mariadb-11.4/docker-compose.yml b/projects/ubuntu-22.04/ubuntu-22.04-mariadb-11.4/docker-compose.yml index f8621a2..9273d79 100644 --- a/projects/ubuntu-22.04/ubuntu-22.04-mariadb-11.4/docker-compose.yml +++ b/projects/ubuntu-22.04/ubuntu-22.04-mariadb-11.4/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-22.04/ubuntu-22.04-mysql-8.0/docker-compose.yml b/projects/ubuntu-22.04/ubuntu-22.04-mysql-8.0/docker-compose.yml index fe365ca..09c1688 100644 --- a/projects/ubuntu-22.04/ubuntu-22.04-mysql-8.0/docker-compose.yml +++ b/projects/ubuntu-22.04/ubuntu-22.04-mysql-8.0/docker-compose.yml @@ -45,6 +45,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -53,6 +58,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-22.04/ubuntu-22.04-mysql-8.4/docker-compose.yml b/projects/ubuntu-22.04/ubuntu-22.04-mysql-8.4/docker-compose.yml index ca46056..63b3aff 100644 --- a/projects/ubuntu-22.04/ubuntu-22.04-mysql-8.4/docker-compose.yml +++ b/projects/ubuntu-22.04/ubuntu-22.04-mysql-8.4/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-22.04/ubuntu-22.04-postgres-14/docker-compose.yml b/projects/ubuntu-22.04/ubuntu-22.04-postgres-14/docker-compose.yml index 1823e1b..0221c9e 100644 --- a/projects/ubuntu-22.04/ubuntu-22.04-postgres-14/docker-compose.yml +++ b/projects/ubuntu-22.04/ubuntu-22.04-postgres-14/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-22.04/ubuntu-22.04-postgres-16/docker-compose.yml b/projects/ubuntu-22.04/ubuntu-22.04-postgres-16/docker-compose.yml index 084195e..e6d4e37 100644 --- a/projects/ubuntu-22.04/ubuntu-22.04-postgres-16/docker-compose.yml +++ b/projects/ubuntu-22.04/ubuntu-22.04-postgres-16/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-24.04/ubuntu-24.04-mariadb-10.11/docker-compose.yml b/projects/ubuntu-24.04/ubuntu-24.04-mariadb-10.11/docker-compose.yml index 413d3c1..f6b99eb 100644 --- a/projects/ubuntu-24.04/ubuntu-24.04-mariadb-10.11/docker-compose.yml +++ b/projects/ubuntu-24.04/ubuntu-24.04-mariadb-10.11/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-24.04/ubuntu-24.04-mariadb-11.4/docker-compose.yml b/projects/ubuntu-24.04/ubuntu-24.04-mariadb-11.4/docker-compose.yml index f8621a2..9273d79 100644 --- a/projects/ubuntu-24.04/ubuntu-24.04-mariadb-11.4/docker-compose.yml +++ b/projects/ubuntu-24.04/ubuntu-24.04-mariadb-11.4/docker-compose.yml @@ -18,6 +18,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-24.04/ubuntu-24.04-mysql-8.0/docker-compose.yml b/projects/ubuntu-24.04/ubuntu-24.04-mysql-8.0/docker-compose.yml index 53e00e3..55e63b2 100644 --- a/projects/ubuntu-24.04/ubuntu-24.04-mysql-8.0/docker-compose.yml +++ b/projects/ubuntu-24.04/ubuntu-24.04-mysql-8.0/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-24.04/ubuntu-24.04-mysql-8.4/docker-compose.yml b/projects/ubuntu-24.04/ubuntu-24.04-mysql-8.4/docker-compose.yml index ca46056..63b3aff 100644 --- a/projects/ubuntu-24.04/ubuntu-24.04-mysql-8.4/docker-compose.yml +++ b/projects/ubuntu-24.04/ubuntu-24.04-mysql-8.4/docker-compose.yml @@ -48,6 +48,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -59,6 +64,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-24.04/ubuntu-24.04-postgres-14/docker-compose.yml b/projects/ubuntu-24.04/ubuntu-24.04-postgres-14/docker-compose.yml index 1823e1b..0221c9e 100644 --- a/projects/ubuntu-24.04/ubuntu-24.04-postgres-14/docker-compose.yml +++ b/projects/ubuntu-24.04/ubuntu-24.04-postgres-14/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. diff --git a/projects/ubuntu-24.04/ubuntu-24.04-postgres-16/docker-compose.yml b/projects/ubuntu-24.04/ubuntu-24.04-postgres-16/docker-compose.yml index 084195e..e6d4e37 100644 --- a/projects/ubuntu-24.04/ubuntu-24.04-postgres-16/docker-compose.yml +++ b/projects/ubuntu-24.04/ubuntu-24.04-postgres-16/docker-compose.yml @@ -16,6 +16,11 @@ services: - catalog volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb irods-catalog-consumer: build: @@ -27,6 +32,11 @@ services: - irods-catalog-provider volumes: - shared_volume:/irods_testing_environment_mount_dir + # The core test suite for iRODS uses SIGHUP to reload the server's configuration often. + # To keep the iRODS Rule Language from failing and producing RE_UNABLE_TO_READ_SESSION_VAR, + # we bump the maximum amount of shared memory from 64mb to 100mb. This is required because + # iRODS 5 can have two Agent Factories running simultaneously (due to the SIGHUP). + shm_size: 100mb # This volume is mounted on all test servers for detached mode testing which # requires a common vault. From 8b08b86981c66e63c51f0de0eb0b0baee7242110 Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Thu, 7 Nov 2024 12:42:16 -0500 Subject: [PATCH 4/5] [irods/irods#7229,irods/irods#7996,#235] iRODS 5: Replace use of irodsctl. irodsctl was removed in iRODS 5. This commit replaces the testing environment's use of irodsctl with the python code invoked via irodsctl. --- irods_testing_environment/irods_setup.py | 8 ++++---- irods_testing_environment/ssl_setup.py | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/irods_testing_environment/irods_setup.py b/irods_testing_environment/irods_setup.py index 8565577..58c530c 100644 --- a/irods_testing_environment/irods_setup.py +++ b/irods_testing_environment/irods_setup.py @@ -415,13 +415,13 @@ def restart_rsyslog(container): def stop_irods(container): - irodsctl = os.path.join(context.irods_home(), 'irodsctl') - return execute.execute_command(container, f'{irodsctl} stop', user='irods') + cmd = "python3 -c 'from scripts.irods.controller import IrodsController; IrodsController().stop()'" + return execute.execute_command(container, cmd, user='irods', workdir=context.irods_home()) def restart_irods(container): - irodsctl = os.path.join(context.irods_home(), 'irodsctl') - return execute.execute_command(container, f'{irodsctl} restart', user='irods') + cmd = "python3 -c 'from scripts.irods.controller import IrodsController; IrodsController().restart()'" + return execute.execute_command(container, cmd, user='irods', workdir=context.irods_home()) def setup_irods_server(container, setup_input): diff --git a/irods_testing_environment/ssl_setup.py b/irods_testing_environment/ssl_setup.py index fb332c1..8a3a206 100644 --- a/irods_testing_environment/ssl_setup.py +++ b/irods_testing_environment/ssl_setup.py @@ -104,8 +104,8 @@ def configure_ssl_on_server(container, chain_file = os.path.join(context.irods_config(), 'chain.pem') cert_file = os.path.join(context.irods_config(), 'server.crt') - irodsctl = os.path.join(context.irods_home(), 'irodsctl') - if execute.execute_command(container, '{} stop'.format(irodsctl), user='irods') is not 0: + stop_cmd = "python3 -c 'from scripts.irods.controller import IrodsController; IrodsController().stop()'" + if execute.execute_command(container, stop_cmd, user='irods', workdir=context.irods_home()) is not 0: raise RuntimeError( 'failed to stop iRODS server before SSL configuration [{}]' .format(container.name)) @@ -142,7 +142,8 @@ def configure_ssl_on_server(container, negotiation_key.configure_ssl_in_server(container, 'CS_NEG_REQUIRE') # start the server again - if execute.execute_command(container, '{} start'.format(irodsctl), user='irods') is not 0: + start_cmd = "python3 -c 'from scripts.irods.controller import IrodsController; IrodsController().start()'" + if execute.execute_command(container, start_cmd, user='irods', workdir=context.irods_home()) is not 0: raise RuntimeError( 'failed to start iRODS server after SSL configuration [{}]' .format(container.name)) From 54e39f7dc7cfbd384565c746c6cbf4bdb42b58eb Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Thu, 7 Nov 2024 12:43:33 -0500 Subject: [PATCH 5/5] [irods/irods#7229,#235] iRODS 5: Update generation of input file for setup_irods.py. --- irods_testing_environment/irods_setup.py | 35 ++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/irods_testing_environment/irods_setup.py b/irods_testing_environment/irods_setup.py index 58c530c..23269fe 100644 --- a/irods_testing_environment/irods_setup.py +++ b/irods_testing_environment/irods_setup.py @@ -264,8 +264,23 @@ def build_input_for_catalog_consumer(self): '' # confirmation of inputs ] + # Handle the difference between 4.3 servers and 5.x servers. + if self.irods_version >= (4, 90, 0): + # Always remove the element at the highest index first to reduce + # complexity around indices. + del input_args[14] # Control plane key + del input_args[8] # Control plane port + del input_args[8] # Schema validation base URI + + # Insert entries for iRODS 5.x. + input_args.insert(0, '') # Hostname + + # Insert entries for iRODS 4.3. + input_args.insert(4, str(self.provides_local_storage)) + input_args.insert(5, str(self.resource_name)) + input_args.insert(6, str(self.vault_directory)) # Handle the difference between 4.2 servers and 4.3 servers. - if self.irods_version >= (4, 3, 0): + elif self.irods_version >= (4, 3, 0): input_args.insert(3, str(self.provides_local_storage)) input_args.insert(4, str(self.resource_name)) input_args.insert(5, str(self.vault_directory)) @@ -312,8 +327,24 @@ def build_input_for_catalog_provider(self): '' # confirmation of inputs ] + # Handle the difference between 4.3 servers and 5.x servers. + if self.irods_version >= (4, 90, 0): + # Remove entries that do not apply to iRODS 5. + # Always remove the element at the highest index first to reduce + # complexity around indices. + del input_args[21] # Control plane key + del input_args[15] # Control plane port + del input_args[15] # Schema validation base URI + + # Insert entries for iRODS 5.x. + input_args.insert(0, '') # Hostname + + # Insert entries for iRODS 4.3. + input_args.insert(12, str(self.provides_local_storage)) + input_args.insert(13, str(self.resource_name)) + input_args.insert(14, str(self.vault_directory)) # Handle the difference between 4.2 servers and 4.3 servers. - if self.irods_version >= (4, 3, 0): + elif self.irods_version >= (4, 3, 0): input_args.insert(11, str(self.provides_local_storage)) input_args.insert(12, str(self.resource_name)) input_args.insert(13, str(self.vault_directory))