From 7c28d5d409d419012ca66e5e22ae38e51cd2d111 Mon Sep 17 00:00:00 2001 From: FedericoStagni Date: Mon, 8 Dec 2014 17:14:08 +0100 Subject: [PATCH] removed use of shifter proxy (read-only operations) --- TransformationSystem/Agent/MCExtensionAgent.py | 2 -- TransformationSystem/Agent/TaskManagerAgentBase.py | 2 -- TransformationSystem/Agent/TransformationAgent.py | 3 --- TransformationSystem/Agent/ValidateOutputDataAgent.py | 5 ----- WorkloadManagementSystem/Agent/InputDataAgent.py | 2 -- WorkloadManagementSystem/Executor/InputData.py | 5 ----- 6 files changed, 19 deletions(-) diff --git a/TransformationSystem/Agent/MCExtensionAgent.py b/TransformationSystem/Agent/MCExtensionAgent.py index 3f6d37188f1..b22fefb96e2 100755 --- a/TransformationSystem/Agent/MCExtensionAgent.py +++ b/TransformationSystem/Agent/MCExtensionAgent.py @@ -32,8 +32,6 @@ def initialize( self ): '''Sets defaults ''' - self.am_setOption( 'shifterProxy', 'DataManager' ) - gLogger.info( "Will consider the following transformation types: %s" % str( self.transformationTypes ) ) gLogger.info( "Will create a maximum of %s tasks per iteration" % self.maxIterationTasks ) gLogger.info( "Will not submit tasks for transformations with failure rate greater than %s%%" % ( self.maxFailRate ) ) diff --git a/TransformationSystem/Agent/TaskManagerAgentBase.py b/TransformationSystem/Agent/TaskManagerAgentBase.py index 0391de8427b..27048a49e35 100644 --- a/TransformationSystem/Agent/TaskManagerAgentBase.py +++ b/TransformationSystem/Agent/TaskManagerAgentBase.py @@ -67,8 +67,6 @@ def initialize( self ): gMonitor.registerActivity( "SubmittedTasks", "Automatically submitted tasks", "Transformation Monitoring", "Tasks", gMonitor.OP_ACUM ) - self.am_setOption( 'shifterProxy', 'ProductionManager' ) - # Default clients self.transClient = TransformationClient() diff --git a/TransformationSystem/Agent/TransformationAgent.py b/TransformationSystem/Agent/TransformationAgent.py index 4b565436d35..ad683027ece 100644 --- a/TransformationSystem/Agent/TransformationAgent.py +++ b/TransformationSystem/Agent/TransformationAgent.py @@ -80,9 +80,6 @@ def initialize( self ): # clients self.transfClient = TransformationClient() - # shifter - self.am_setOption( 'shifterProxy', 'ProductionManager' ) - # for caching using a pickle file self.__readCache() self.workDirectory = self.am_getWorkDirectory() diff --git a/TransformationSystem/Agent/ValidateOutputDataAgent.py b/TransformationSystem/Agent/ValidateOutputDataAgent.py index 9f11a454bb1..86fab802eea 100755 --- a/TransformationSystem/Agent/ValidateOutputDataAgent.py +++ b/TransformationSystem/Agent/ValidateOutputDataAgent.py @@ -43,11 +43,6 @@ def __init__( self, *args, **kwargs ): def initialize( self ): """ Sets defaults """ - # This sets the Default Proxy to used as that defined under - # /Operations/Shifter/DataManager - # the shifterProxy option in the Configuration can be used to change this default. - self.am_setOption( 'shifterProxy', 'DataManager' ) - gLogger.info( "Will treat the following transformation types: %s" % str( self.transformationTypes ) ) gLogger.info( "Will search for directories in the following locations: %s" % str( self.directoryLocations ) ) gLogger.info( "Will check the following storage elements: %s" % str( self.activeStorages ) ) diff --git a/WorkloadManagementSystem/Agent/InputDataAgent.py b/WorkloadManagementSystem/Agent/InputDataAgent.py index a886eab1bed..dbb7f879556 100755 --- a/WorkloadManagementSystem/Agent/InputDataAgent.py +++ b/WorkloadManagementSystem/Agent/InputDataAgent.py @@ -32,8 +32,6 @@ def initializeOptimizer( self ): #this will ignore failover SE files self.checkFileMetadata = self.am_getOption( 'CheckFileMetadata', True ) - self.am_setOption( 'shifterProxy', 'DataManager' ) - self.dataManager = DataManager() self.resourceStatus = ResourceStatus() self.fc = FileCatalog() diff --git a/WorkloadManagementSystem/Executor/InputData.py b/WorkloadManagementSystem/Executor/InputData.py index 86f652c83e8..38291eaf9dc 100755 --- a/WorkloadManagementSystem/Executor/InputData.py +++ b/WorkloadManagementSystem/Executor/InputData.py @@ -34,11 +34,6 @@ def initializeOptimizer( cls ): #this will ignore failover SE files cls.checkFileMetadata = cls.ex_getOption( 'CheckFileMetadata', True ) - #Define the shifter proxy needed - # This sets the Default Proxy to used as that defined under - # the shifterProxy option in the Configuration can be used to change this default. - cls.ex_setProperty( 'shifterProxy', 'DataManager' ) - cls.__dataManDict = {} cls.__fcDict = {} cls.__SEToSiteMap = {}