Merge pull request #23 from yiiyama/production

Configuration change

Author: dr-stringfellow

bin/dynamo

@@ -12,7 +12,7 @@ from argparse import ArgumentParser
 parser = ArgumentParser(description = 'Dynamo')
 parser.add_argument('module', metavar = 'MODULE', nargs = '+', help = 'detox and/or dealer.')
 parser.add_argument('--force-inventory-update', '-I', action = 'store_true', dest = 'force_inventory_update', help = 'Force inventory to update.')
-parser.add_argument('--detox-partition', '-p', metavar = 'PARTITION', dest = 'detox_partitions', nargs = '+', default = ['Physics', 'RelVal', 'Express'], help = 'Name of the detox partitions. Syntax is <partition>[:<definition name>]. Definition name is translated to path DYNAMO_BASE/policies/detox/<partition>.txt. If none is given, partition name is used.')
+parser.add_argument('--detox-partition', '-p', metavar = 'PARTITION', dest = 'detox_partitions', nargs = '+', default = ['Physics', 'RelVal'], help = 'Name of the detox partitions. Syntax is <partition>[:<definition name>]. Definition name is translated to path DYNAMO_BASE/policies/detox/<partition>.txt. If none is given, partition name is used.')
 parser.add_argument('--dealer-plugins', '-g', metavar = 'PLUGIN:PRIORITY', dest = 'dealer_plugins', nargs = '+', default = ['Popularity:3', 'Balancer:2', 'Undertaker:1'], help = 'Name:Priority of the dealer plugins to run.')
 parser.add_argument('--comment', '-m', metavar = 'COMMENT', dest = 'comment', help = 'Comment to be sent to deletion interface as well as the local deletion record.')
 parser.add_argument('--no-auto-approval', '-P', action = 'store_true', dest = 'no_auto_approval', help = 'Do not approve deletion and transfer requests automatically.')

bin/dynamod

@@ -86,7 +86,7 @@ do
       APPLICATIONS="$APPLICATIONS dealer"
     fi
 
-    if [ $(($IHOUR%$INVENTORY_FULL_UPDATE_INTERVAL)) -eq 0 ]
+    if [ $(($IHOUR%$INVENTORY_FULL_UPDATE_INTERVAL)) -eq 0 ] && ! [ "$TEST" ]
     then
       echo "Performing the full update of inventory"
       $DYNAMO_BASE/bin/execlib common/inventory.py updatefull --site @disk

etc/policies.tag

@@ -1 +1 @@
-v52
+v53

lib/common/configuration.py

@@ -132,7 +132,6 @@
     included_sites = disk_sites,
     excluded_sites = [
         'T1_US_FNAL_New_Disk', # not a valid site
-        'T1_UK_RAL_ECHO_Disk', # not an actual site
         'T2_CH_CERNBOX', # not a valid site
         'T2_MY_UPM_BIRUNI', # site not in popDB
     ],

lib/dealer/configuration.py

@@ -1,7 +1,7 @@
 from common.dataformat import Configuration
 
 main = Configuration(
-    target_sites = ['T2_*', 'T1_*_Disk', '!T2_GR_Ioannina', '!T2_TR_METU'],
+    target_sites = ['T2_*', '!T1_*_Disk', 'T1_UK_RAL_ECHO_Disk', '!T2_GR_Ioannina', '!T2_RU_INR', '!T2_IT_Pisa', '!T2_RU_ITEP'],
     max_dataset_size = 50., # Maximum dataset size to consider for copy in TB
     max_copy_per_site = 50., # Maximum volume to be copied per site in TB
     max_copy_total = 200.,