Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v6r12] Removed use of shifter proxy (read-only operations) #2199

Merged
merged 1 commit into from
Dec 15, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions TransformationSystem/Agent/MCExtensionAgent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) )
Expand Down
2 changes: 0 additions & 2 deletions TransformationSystem/Agent/TaskManagerAgentBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
3 changes: 0 additions & 3 deletions TransformationSystem/Agent/TransformationAgent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 0 additions & 5 deletions TransformationSystem/Agent/ValidateOutputDataAgent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) )
Expand Down
2 changes: 0 additions & 2 deletions WorkloadManagementSystem/Agent/InputDataAgent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 0 additions & 5 deletions WorkloadManagementSystem/Executor/InputData.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down