Merge pull request #2203 from andresailer/SomeFixes

[v6r11] Some fixes
DIRACGrid · Dec 15, 2014 · d3f8002 · d3f8002
2 parents d987bba + fc04718
commit d3f8002
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/Core/Utilities/InstallTools.py b/Core/Utilities/InstallTools.py
@@ -1834,7 +1834,7 @@ def installNewPortal():
   result = execCommand( False, ["pip", "install", "tornado"] )
   if not result['OK']:
     error = "Tornado can not be installed:%s" % result['Value']
-    gLogger.erro(error)
+    gLogger.error(error)
     DIRAC.exit(-1)
     return error
   else:

diff --git a/Core/Workflow/Workflow.py b/Core/Workflow/Workflow.py
@@ -135,8 +135,8 @@ def createStepInstance( self, type, name ):
       raise KeyError( 'Can not find StepDefinition ' + type + ' to create StepInstrance ' + name )
 
   def removeStepInstance( self, name ):
-    self.instances[name].setParents( None )
-    self.instances.delete( name )
+    self.step_instances[name].setParent( None )
+    self.step_instances.delete( name )
 
   def updateParents( self ):
     self.module_definitions.updateParents( self )

diff --git a/DataManagementSystem/DB/FileCatalogComponents/DirectoryTreeBase.py b/DataManagementSystem/DB/FileCatalogComponents/DirectoryTreeBase.py
@@ -845,7 +845,7 @@ def _getDirectoryPhysicalSizeFromUsage( self, lfns, connection ):
             req = 'DELETE FROM FC_DirectoryUsage WHERE SEID=%d AND DirID=%d' % ( seID, dirID )
             result = self.db._update( req )
             if not result['OK']:
-              gLogger( 'Failed to delete entry from FC_DirectoryUsage', result['Message'] )
+              gLogger.error( 'Failed to delete entry from FC_DirectoryUsage', result['Message'] )
         seDict['TotalSize'] = int( totalSize )
         seDict['TotalFiles'] = int( totalFiles )
         successful[path] = seDict

diff --git a/DataManagementSystem/scripts/dirac-dms-create-replication-request.py b/DataManagementSystem/scripts/dirac-dms-create-replication-request.py
@@ -78,13 +78,17 @@
   lfnMetadata = res['Value']['Successful']
 
   for lfn in lfnMetadata:
-    rarFile = File()
-    rarFile.LFN = lfn
-    rarFile.Size = lfnMetadata[lfn]['Size']
-    rarFile.Checksum = lfnMetadata[lfn]['Checksum']
-    rarFile.GUID = lfnMetadata[lfn]['GUID']
-    rarFile.ChecksumType = 'ADLER32'
-    replicateAndRegister.addFile( rarFile )
+    try:
+      rarFile = File()
+      rarFile.LFN = lfn
+      rarFile.Size = lfnMetadata[lfn]['Size']
+      rarFile.Checksum = lfnMetadata[lfn]['Checksum']
+      rarFile.GUID = lfnMetadata[lfn]['GUID']
+      rarFile.ChecksumType = 'ADLER32'
+      replicateAndRegister.addFile( rarFile )
+    except ValueError as err:
+      print "Error", str(err), lfn
+      continue
 
   oRequest.addOperation( replicateAndRegister )
   isValid = gRequestValidator.validate( oRequest )

diff --git a/Workflow/Modules/ModuleBase.py b/Workflow/Modules/ModuleBase.py
@@ -89,11 +89,11 @@ def execute( self ):
 
     if not self.production_id:
       # self.PRODUCTION_ID is always set by the workflow
-      self.production_id = int( self.PRODUCTION_ID )
+      self.production_id = int( self.workflow_commons['PRODUCTION_ID'] )
 
     if not self.prod_job_id:
       # self.JOB_ID is set by the workflow, but this is not the WMS job id, but the transformation (production) task id
-      self.prod_job_id = int( self.JOB_ID )
+      self.prod_job_id = int( self.workflow_commons['JOB_ID'] )
 
     if not self.jobID:
       # this is the real wms job ID