* removed zero padding in _sub

* using only 5 digits in SUBCOUNTER_SUBID_SEQ
JammelBrooks · Aug 22, 2019 · d925d9f · d925d9f
1 parent 5882de8
commit d925d9f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,5 +1,12 @@
 Release Notes
 
+* 8/22/2019
+  * removed zero padding in _sub
+  * using only 5 digits in SUBCOUNTER_SUBID_SEQ
+
+* 8/21/2019
+  * taking ddm blacklist into account for site inputs
+
 * 4/23/2019
   * supplemental error for lost-heartbeat jobs
 

diff --git a/pandaserver/dataservice/SetupperAtlasPlugin.py b/pandaserver/dataservice/SetupperAtlasPlugin.py
@@ -502,7 +502,7 @@ def _setupDestination(self,startIdx=-1,nJobsInLoop=50):
                         if not file.destinationDBlock in snGottenDS:
                             snGottenDS.append(file.destinationDBlock)
                         # new dataset name
-                        newnameList[dest] = "%s_sub0%s" % (file.destinationDBlock,sn)
+                        newnameList[dest] = "%s_sub%s" % (file.destinationDBlock,sn)
                         if freshFlag or self.resetLocation:
                             # register original dataset and new dataset
                             nameList = [file.destinationDBlock,newnameList[dest]]

diff --git a/pandaserver/taskbuffer/OraDBProxy.py b/pandaserver/taskbuffer/OraDBProxy.py
@@ -6862,7 +6862,7 @@ def getSerialNumber(self,datasetname,definedFreshFlag=None):
             # commit
             if not self._commit():
                 raise RuntimeError, 'Commit error'
-            # release file lock
+            sn %= 100000
             _logger.debug("getSerialNumber : %s %s" % (sn,freshFlag))
             return (sn,freshFlag)
         except:
@@ -10108,7 +10108,8 @@ def getDdmEndpoints(self):
         # get relationship between panda sites and ddm endpoints
         sql_panda_ddm = """
                SELECT pdr.panda_site_name, pdr.ddm_endpoint_name, pdr.is_local, de.ddm_spacetoken_name, 
-                      de.is_tape, pdr.default_read, pdr.default_write, pdr.roles, pdr.order_read, pdr.order_write 
+                      de.is_tape, pdr.default_read, pdr.default_write, pdr.roles, pdr.order_read, pdr.order_write,
+                      de.blacklisted 
                FROM ATLAS_PANDA.panda_ddm_relation pdr, ATLAS_PANDA.ddm_endpoint de
                WHERE pdr.ddm_endpoint_name = de.ddm_endpoint_name
                """
@@ -10130,7 +10131,7 @@ def getDdmEndpoints(self):
             panda_site_name = tmp_relation['panda_site_name']
             if panda_site_name not in panda_endpoint_map:
                 panda_endpoint_map[panda_site_name] = {'input': DdmSpec(), 'output': DdmSpec()}
-            if 'read_lan' in tmp_relation['roles']:
+            if 'read_lan' in tmp_relation['roles'] and tmp_relation['blacklisted'] != 'Y':
                 panda_endpoint_map[panda_site_name]['input'].add(tmp_relation, endpoint_dict)
             if 'write_lan' in tmp_relation['roles']:
                 panda_endpoint_map[panda_site_name]['output'].add(tmp_relation, endpoint_dict)