Task #9893: RA DB sql: more clean cherry pick merges on .sql files and .py...

Task #9893: RA DB sql: more clean cherry pick merges on .sql files and .py generators from SAS-RA_DRAGNET-Task9939 branch. This concerns commits r36604,r36605,r36657

SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/add_resource_allocation_statics.sql

@@ -9,7 +9,7 @@ INSERT INTO resource_allocation.task_type VALUES (0, 'observation'),(1, 'pipelin
 INSERT INTO resource_allocation.resource_claim_status VALUES (0, 'claimed'), (1, 'allocated'), (2, 'conflict');
 INSERT INTO resource_allocation.resource_claim_property_type VALUES (0, 'nr_of_is_files'),(1, 'nr_of_cs_files'),(2, 'nr_of_uv_files'),(3, 'nr_of_im_files'),(4, 'nr_of_img_files'),(5, 'nr_of_pulp_files'),(6, 'nr_of_cs_stokes'),(7, 'nr_of_is_stokes'),(8, 'is_file_size'),(9, 'cs_file_size'),(10, 'uv_file_size'),(11, 'im_file_size'),(12, 'img_file_size'),(13, 'nr_of_pulp_files'),(14, 'nr_of_tabs'),(15, 'start_sb_nr'),(16,'uv_otdb_id'),(17,'cs_otdb_id'),(18,'is_otdb_id'),(19,'im_otdb_id'),(20,'img_otdb_id'),(21,'pulp_otdb_id'),(22, 'is_tab_nr'),(23, 'start_sbg_nr'),(24, 'pulp_file_size');
 INSERT INTO resource_allocation.resource_claim_property_io_type VALUES (0, 'output'),(1, 'input');
-INSERT INTO resource_allocation.config VALUES (0, 'max_fill_ratio_CEP4_storage', '0.85'), (1, 'claim_timeout', '172800'), (2, 'min_inter_task_delay', '60'); -- Just some values 172800 is two days in seconds
+INSERT INTO resource_allocation.config VALUES (0, 'max_fill_ratio_CEP4_storage', '0.85'), (1, 'claim_timeout', '172800'), (2, 'min_inter_task_delay', '60'), (3, 'max_fill_ratio_CEP4_bandwidth', '0.75'); -- Just some values 172800 is two days in seconds
 INSERT INTO resource_allocation.conflict_reason
 VALUES
 (1, 'Not enough total free storage space'),

SAS/ResourceAssignment/ResourceAssignmentDatabase/sql/create_add_virtual_instrument.sql.py

@@ -254,8 +254,8 @@ with open("add_virtual_instrument.sql", 'w+') as output:
   #----- resource_capacity -----
   resource_capacities = {
     # resource id                            : (DEFAULT, available cap, total cap)
-    # CEP4 total I/O bandwidth spec-ed and bench-ed at 80 GBytes/s. Safety guess: 75% achievable
-    resources['CEP4_bandwidth:/data'][0]     : (SqlKeyword('DEFAULT'), int(0.75 * 80*1024*1024*1024 * 8), int(0.75 * 80*1024*1024*1024 * 8)),  # see prev line; bits/second
+    # CEP4 total I/O bandwidth spec-ed and bench-ed at 80 GBytes/s. Achievable: see static conf max fill ratios.
+    resources['CEP4_bandwidth:/data'][0]     : (SqlKeyword('DEFAULT'), 80*1024*1024*1024 * 8, 80*1024*1024*1024 * 8),  # see prev line; bits/second
     resources['CEP4_storage:/data'][0]       : (SqlKeyword('DEFAULT'), 3369564904320*1024, 3369564904320*1024),  # from df(1) on /cep4-fs (~3.1 PiB)
     resources['dragproc_bandwidth:/data'][0] : (SqlKeyword('DEFAULT'), 450*1024*1024 * 8, 450*1024*1024 * 8),  # 450 MiB/s (dd(1): 490-530) disk write to /data
     resources['dragproc_storage:/data'][0]   : (SqlKeyword('DEFAULT'), 23669957984256, 23669957984256),  # ~22 TiB
@@ -274,8 +274,8 @@ with open("add_virtual_instrument.sql", 'w+') as output:
 
   ## DRAGNET nodes (except dragproc, listed above)
   for i in xrange(num_drg_nodes):
-    resource_capacities[ resources['drg%02d_bandwidth:/data1' % (i + 1)][0] ] = (SqlKeyword('DEFAULT'), 225*1024*1024 * 8, 225*1024*1024 * 8)  # 225 MiB/s (dd(1): 288, cp(1): 225-279)
-    resource_capacities[ resources['drg%02d_bandwidth:/data2' % (i + 1)][0] ] = (SqlKeyword('DEFAULT'), 225*1024*1024 * 8, 225*1024*1024 * 8)  # idem
+    resource_capacities[ resources['drg%02d_bandwidth:/data1' % (i + 1)][0] ] = (SqlKeyword('DEFAULT'), 242*1024*1024 * 8, 242*1024*1024 * 8)  # 242 MiB/s (dd(1): 288, cp(1): 225-279, another cp(1): 242)
+    resource_capacities[ resources['drg%02d_bandwidth:/data2' % (i + 1)][0] ] = (SqlKeyword('DEFAULT'), 242*1024*1024 * 8, 242*1024*1024 * 8)  # idem
     resource_capacities[ resources['drg%02d_storage:/data1'   % (i + 1)][0] ] = (SqlKeyword('DEFAULT'), 7913168961536, 7913168961536)  # ~7.2 TiB
     resource_capacities[ resources['drg%02d_storage:/data2'   % (i + 1)][0] ] = (SqlKeyword('DEFAULT'), 7913168961536, 7913168961536)  # ~7.2 TiB