Changes for StoRM release v1.12.0

data/backend-defaults.yaml

@@ -5,6 +5,15 @@ storm::backend::install_native_libs_gpfs: false
 # Db connection
 storm::backend::db_username: 'storm'
 storm::backend::db_password: 'storm'
+storm::backend::db_port: 3306
+storm::backend::db_properties: 'useLegacyDatetimeCode=false&serverTimezone=UTC'
+storm::backend::db_pool_max_wait_millis: -1
+storm::backend::db_pool_test_on_borrow: true
+storm::backend::db_pool_test_while_idle: true
+storm::backend::db_pool_stormdb_max_total: 500
+storm::backend::db_pool_stormdb_min_idle: 50
+storm::backend::db_pool_stormbeisam_max_total: 200
+storm::backend::db_pool_stormbeisam_min_idle: 10
 
 ### Default values for Storage Areas
 # 1. xroot
@@ -73,7 +82,8 @@ storm::backend::gc_purge_enabled: true
 storm::backend::gc_purge_interval: 600
 storm::backend::gc_purge_size: 800
 storm::backend::gc_expired_request_time: 21600
-storm::backend::gc_expired_inprogress_time: 2592000
+storm::backend::gc_expired_inprogress_bol_time: 2592000
+storm::backend::gc_expired_inprogress_ptp_time: 2592000
 # Expired-Put-Requests-Agent parameters
 storm::backend::gc_ptp_transit_interval: 300
 storm::backend::gc_ptp_transit_start_delay: 10

data/frontend-defaults.yaml

@@ -1,5 +1,6 @@
 ---
 storm::frontend::storm_frontend_server_conf_file: ''
+storm::frontend::cgsi_trace: false
 storm::frontend::db_user: 'storm'
 storm::frontend::db_passwd: 'storm'
 storm::frontend::port: 8444

manifests/backend.pp

@@ -46,6 +46,41 @@
 # @param db_password
 #   Password for the user in `db_storm_username`. Default: bluemoon
 #
+# @param db_port
+#   Port used to connect StoRM Backend to the database. Default: 3306
+#
+# @param db_properties
+#   String of properties appended to the database connection URL. Default: 'useLegacyDatetimeCode=false'
+#
+# @param db_pool_max_wait_millis
+#   The maximum number of milliseconds that the pool will wait (when there are no available connections)
+#   for a connection to be returned before throwing an exception, or -1 to wait indefinitely. Default: -1
+#
+# @param db_pool_test_on_borrow
+#   The indication of whether objects will be validated before being borrowed from the pool. 
+#   If the object fails to validate, it will be dropped from the pool, and we will attempt to borrow another.
+#   Default: true
+#
+# @param db_pool_test_while_idle
+#   The indication of whether objects will be validated by the idle object evictor (if any).
+#   If an object fails to validate, it will be dropped from the pool. Default: true
+#
+# @param db_pool_stormdb_max_total
+#   The maximum number of active connections that can be allocated from this pool at the same time,
+#   or negative for no limit. Default: 500
+#
+# @param db_pool_stormdb_min_idle
+#   The minimum number of connections that can remain idle in the pool, without extra ones being created,
+#   or zero to create none. Default: 50
+#
+# @param db_pool_stormbeisam_max_total
+#   The maximum number of active connections that can be allocated from this pool at the same time,
+#   or negative for no limit. Default: 200
+#
+# @param db_pool_stormbeisam_min_idle
+#   The minimum number of connections that can remain idle in the pool, without extra ones being created,
+#   or zero to create none. Default: 10
+#
 # @param xroot_hostname
 #   Root server (default value for all Storage Areas).
 #   Note: you may change the settings for each SA acting on its configuration.
@@ -180,7 +215,10 @@
 #   Time in seconds to consider a request expired after its submission. Default: 604800 seconds (1 week).
 #   From StoRM 1.11.13 it is used also to identify how much time is needed to consider a completed recall task as cleanable.
 #
-# @param gc_expired_inprogress_time
+# @param gc_expired_inprogress_bol_time
+#   Time in seconds to consider an in-progress bol request as expired. Default: 2592000 seconds (1 month).
+#
+# @param gc_expired_inprogress_ptp_time
 #   Time in seconds to consider an in-progress ptp request as expired. Default: 2592000 seconds (1 month).
 #
 # @param gc_ptp_transit_interval
@@ -312,6 +350,15 @@
   # Db connection
   String $db_username,
   String $db_password,
+  Integer $db_port,
+  String $db_properties,
+  Integer $db_pool_max_wait_millis,
+  Boolean $db_pool_test_on_borrow,
+  Boolean $db_pool_test_while_idle,
+  Integer $db_pool_stormdb_max_total,
+  Integer $db_pool_stormdb_min_idle,
+  Integer $db_pool_stormbeisam_max_total,
+  Integer $db_pool_stormbeisam_min_idle,
 
   ### Default values for Storage Areas
   # 1. xroot
@@ -378,7 +425,8 @@
   Integer $gc_purge_interval,
   Integer $gc_purge_size,
   Integer $gc_expired_request_time,
-  Integer $gc_expired_inprogress_time,
+  Integer $gc_expired_inprogress_bol_time,
+  Integer $gc_expired_inprogress_ptp_time,
   Integer $gc_ptp_transit_interval,
   Integer $gc_ptp_transit_start_delay,
 

manifests/backend/config.pp

@@ -46,6 +46,7 @@
 
   $properties_file='/etc/storm/backend-server/storm.properties'
   if $storm::backend::manage_storm_properties {
+    notice("File ${properties_file} is initialized from ${storm::backend::path_storm_properties} ...")
     file { $properties_file:
       ensure => file,
       source => $storm::backend::path_storm_properties,
@@ -54,6 +55,7 @@
       notify => [Service['storm-backend-server']],
     }
   } else {
+    notice("File ${properties_file} is initialized from a template using class parameters ...")
     $properties_template_file='storm/etc/storm/backend-server/storm.properties.erb'
     file { $properties_file:
       ensure  => file,

manifests/backend/install.pp

@@ -5,21 +5,21 @@
 ) {
   ## StoRM Backend
   package { 'storm-backend-server':
-    ensure  => '>=1.11.22',
+    ensure  => '>=1.12.0',
   }
 
   if $storm::backend::fs_type == 'gpfs' {
     ## Native libs GPFS
     package { 'storm-native-libs-gpfs' :
-      ensure  => '>1.0.7',
+      ensure  => '>=2.0.0',
       require => [Package['storm-backend-server']],
     }
   } else {
     $storm::backend::storage_areas.each | $sa | {
       if $sa['fs_type'] == 'gpfs' {
         ## Native libs GPFS
         package { 'storm-native-libs-gpfs' :
-          ensure  => '>1.0.7',
+          ensure  => '>=2.0.0',
           require => [Package['storm-backend-server']],
         }
         break()
@@ -29,7 +29,7 @@
 
   ## StoRM Info Provider
   package { 'storm-dynamic-info-provider':
-    ensure  => '>=1.8.3',
+    ensure  => '>=2.0.0',
     require => [Package['storm-backend-server']],
   }
 }

manifests/frontend.pp

@@ -53,16 +53,6 @@
 # @param gsoap_maxpending [Integer]
 #  Size of the GSOAP queue used to maintain pending SRM requests. Default value: 1000.
 #
-# @param check_user_blacklisting [Boolean]
-#  Enable/disable user blacklisting. Default value: false.
-#
-# @param argus_pepd_endpoint [String]
-#  The complete service endpoint of Argus PEP server. Mandatory if `check_user_blacklisting` is true.
-#
-# @param argus_resource_id
-#  The resource id is used to target a resource (or set of resources, if wildcards are used) under the control of Argus authorization.
-#  Mandatory if `check_user_blacklisting` is true.
-#
 # @param monitoring_enabled [Boolean]
 #  Enable/disable monitoring. Default value: true.
 #
@@ -78,6 +68,9 @@
 # @param log_debuglevel [String]
 #  Logging level. Possible values are: ERROR, WARN, INFO, DEBUG, DEBUG2. Default value: INFO.
 #
+# @param cgsi_trace [Boolean]
+#  Enable CGSI trace on '/tmp/tracefile'. Default: false
+#
 class storm::frontend (
 
   String $storm_frontend_server_conf_file,
@@ -95,10 +88,6 @@
   Integer $threadpool_maxpending,
   Integer $gsoap_maxpending,
 
-  Boolean $check_user_blacklisting,
-  String $argus_pepd_endpoint,
-  String $argus_resource_id,
-
   Boolean $monitoring_enabled,
   Integer $monitoring_time_interval,
   Boolean $monitoring_detailed,
@@ -107,9 +96,10 @@
 
   String $log_debuglevel,
 
+  Boolean $cgsi_trace,
+
   String $be_xmlrpc_host = $fqdn,
   String $db_host = $be_xmlrpc_host,
-
 ) {
   contain storm::frontend::install
   contain storm::frontend::config

manifests/frontend/config.pp

@@ -34,12 +34,11 @@
   $conf_file='/etc/storm/frontend-server/storm-frontend-server.conf'
   if (!empty($storm::frontend::storm_frontend_server_conf_file)) {
     file { $conf_file:
-      ensure  => file,
-      owner   => 'root',
-      group   => 'storm',
-      source  => $storm::frontend::storm_frontend_server_conf_file,
-      notify  => Service['storm-frontend-server'],
-      require => Package['storm-frontend-mp'],
+      ensure => file,
+      owner  => 'root',
+      group  => 'storm',
+      source => $storm::frontend::storm_frontend_server_conf_file,
+      notify => Service['storm-frontend-server'],
     }
   } else {
     $conf_template_file='storm/etc/storm/frontend-server/storm-frontend-server.conf.erb'
@@ -49,7 +48,6 @@
       group   => 'storm',
       content => template($conf_template_file),
       notify  => Service['storm-frontend-server'],
-      require => Package['storm-frontend-mp'],
     }
   }
 
@@ -64,6 +62,5 @@
     ensure  => file,
     content => template($sysconfig_template_file),
     notify  => Service['storm-frontend-server'],
-    require => Package['storm-frontend-mp'],
   }
 }

manifests/frontend/install.pp

@@ -3,7 +3,8 @@
 class storm::frontend::install (
 
 ) {
-  package { 'storm-frontend-mp':
-    ensure  => installed,
+  ## StoRM Frontend
+  package { 'storm-frontend-server':
+    ensure  => '>=1.8.16',
   }
 }

manifests/frontend/service.pp

@@ -4,6 +4,6 @@
   service { 'storm-frontend-server':
     ensure  => running,
     enable  => true,
-    require => Package['storm-frontend-mp'],
+    require => Package['storm-frontend-server'],
   }
 }

manifests/webdav/install.pp

@@ -4,6 +4,6 @@
 
 ) {
   package { 'storm-webdav':
-    ensure  => '>=1.4.2',
+    ensure  => '>=1.4.3',
   }
 }

spec/classes/storm/storm_backend_spec.rb

@@ -124,9 +124,6 @@
           is_expected.to contain_file(title).with(content: %r{storm.service.port=8444})
           is_expected.to contain_file(title).with(content: %r{storm.service.SURL.endpoint=srm:\/\/frontend-0.example.org:8445\/srm\/managerv2,srm:\/\/frontend-1.example.org:8444\/srm\/managerv2})
           is_expected.to contain_file(title).with(content: %r{storm.service.SURL.default-ports=8445,8444})
-          is_expected.to contain_file(title).with(content: %r{storm.service.request-db.host=storm.example.org})
-          is_expected.to contain_file(title).with(content: %r{storm.service.request-db.username=test})
-          is_expected.to contain_file(title).with(content: %r{storm.service.request-db.passwd=secret})
           is_expected.to contain_file(title).with(content: %r{directory.automatic-creation=false})
           is_expected.to contain_file(title).with(content: %r{directory.writeperm=false})
           is_expected.to contain_file(title).with(content: %r{ptg.skip-acl-setup=false})
@@ -148,11 +145,20 @@
           is_expected.to contain_file(title).with(content: %r{extraslashes.file=})
           is_expected.to contain_file(title).with(content: %r{extraslashes.root=\/})
           is_expected.to contain_file(title).with(content: %r{extraslashes.gsiftp=\/})
-          is_expected.to contain_file(title).with(content: %r{persistence.internal-db.connection-pool=true})
-          is_expected.to contain_file(title).with(content: %r{persistence.internal-db.connection-pool.maxActive=200})
-          is_expected.to contain_file(title).with(content: %r{persistence.internal-db.connection-pool.maxWait=50})
-          is_expected.to contain_file(title).with(content: %r{asynch.db.ReconnectPeriod=18000})
-          is_expected.to contain_file(title).with(content: %r{asynch.db.DelayPeriod=30})
+
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.host=storm.example.org})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.username=test})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.password=secret})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.port=3306})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.properties=useLegacyDatetimeCode=false&serverTimezone=UTC})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.pool.maxWaitMillis=-1})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.pool.testOnBorrow=true})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.pool.testWhileIdle=true})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.pool.stormdb.maxTotal=500})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.pool.stormdb.minIdle=50})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.pool.stormbeisam.maxTotal=200})
+          is_expected.to contain_file(title).with(content: %r{storm.service.db.pool.stormbeisam.minIdle=10})
+
           is_expected.to contain_file(title).with(content: %r{asynch.PickingInitialDelay=1})
           is_expected.to contain_file(title).with(content: %r{asynch.PickingTimeInterval=2})
           is_expected.to contain_file(title).with(content: %r{asynch.PickingMaxBatchSize=100})
@@ -172,7 +178,8 @@
           is_expected.to contain_file(title).with(content: %r{purge.interval=600})
           is_expected.to contain_file(title).with(content: %r{purge.size=800})
           is_expected.to contain_file(title).with(content: %r{expired.request.time=21600})
-          is_expected.to contain_file(title).with(content: %r{expired.inprogress.time=2592000})
+          is_expected.to contain_file(title).with(content: %r{expired.inprogress.bol.time=2592000})
+          is_expected.to contain_file(title).with(content: %r{expired.inprogress.ptp.time=2592000})
           is_expected.to contain_file(title).with(content: %r{transit.interval=300})
           is_expected.to contain_file(title).with(content: %r{transit.delay=10})
           is_expected.to contain_file(title).with(content: %r{ptg.skip-acl-setup=false})

spec/classes/storm/storm_frontend_install_spec.rb

@@ -8,7 +8,7 @@
       end
 
       it 'check storm frontend metapackage is installed' do
-        is_expected.to contain_package('storm-frontend-mp').with(ensure: 'installed')
+        is_expected.to contain_package('storm-frontend-server').with(ensure: '>=1.8.16')
       end
     end
   end

spec/classes/storm/storm_frontend_spec.rb

@@ -76,9 +76,6 @@
             'db_host'                   => 'storm.example.org',
             'db_user'                   => 'test',
             'db_passwd'                 => 'password',
-            'check_user_blacklisting'   => true,
-            'argus_pepd_endpoint'       => 'storm.example.org',
-            'argus_resource_id'         => 'storm',
             'monitoring_enabled'        => false,
             'monitoring_time_interval'  => 50,
             'monitoring_detailed'       => true,
@@ -105,9 +102,6 @@
           is_expected.to contain_file(title).with(content: %r{db.host=storm.example.org})
           is_expected.to contain_file(title).with(content: %r{db.user=test})
           is_expected.to contain_file(title).with(content: %r{db.passwd=password})
-          is_expected.to contain_file(title).with(content: %r{check.user.blacklisting=true})
-          is_expected.to contain_file(title).with(content: %r{argus-pepd-endpoint=storm.example.org})
-          is_expected.to contain_file(title).with(content: %r{argus.resource-id=storm})
           is_expected.to contain_file(title).with(content: %r{monitoring.enabled=false})
           is_expected.to contain_file(title).with(content: %r{#monitoring.timeInterval=60})
           is_expected.to contain_file(title).with(content: %r{#monitoring.detailed=false})
@@ -144,9 +138,6 @@
           is_expected.to contain_file(title).with(content: %r{db.host=storm.example.org})
           is_expected.to contain_file(title).with(content: %r{db.user=storm})
           is_expected.to contain_file(title).with(content: %r{db.passwd=storm})
-          is_expected.to contain_file(title).with(content: %r{check.user.blacklisting=false})
-          is_expected.to contain_file(title).with(content: %r{#argus-pepd-endpoint=})
-          is_expected.to contain_file(title).with(content: %r{#argus.resource-id=})
           is_expected.to contain_file(title).with(content: %r{monitoring.enabled=true})
           is_expected.to contain_file(title).with(content: %r{monitoring.timeInterval=60})
           is_expected.to contain_file(title).with(content: %r{monitoring.detailed=false})