From 3b06cd3cfb280f95accde9e207734e0b84457bef Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 24 Feb 2016 21:40:26 +0000
Subject: [PATCH] gridftp plugin fixes
---
src/python/dm/__init__.py | 2 +-
.../processing/plugins/gridftpFileTransferPlugin.py | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index ea832c24..b4f063c8 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -1 +1 @@
-__version__ = "0.8 (2016.02.05)"
+__version__ = "0.9 (2016.02.24)"
diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
index 90ac727d..40f1c7ba 100755
--- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
@@ -13,6 +13,7 @@ from dm.ds_web_service.api.dsRestApiFactory import DsRestApiFactory
class GridftpFileTransferPlugin(FileTransferPlugin):
DEFAULT_COMMAND = 'globus-url-copy -c -cd -r -vb -tcp-bs 512K -p 1 -sync -sync-level 2'
+ DIRECTORY_TRANSFER_COMMAND = 'globus-url-copy -c -cd -r -vb -tcp-bs 512K -p 5 -sync -sync-level 2'
DEFAULT_PORT = 2811
@@ -107,7 +108,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
# Transfer file
self.logger.debug('Starting transfer: %s -> %s' % (srcUrl, destUrl))
- self.start(src=srcUrl, dest=destUrl, templateInfo=fileInfo, cwd=dataDirectory)
+ self.start(src=srcUrl, dest=destUrl, templateInfo=fileInfo)
# Get remote checksum
if self.remoteMd5Sum:
@@ -141,12 +142,10 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
return srcUrl
def getDestDirUrl(self, dataDirectory, storageHost, storageDirectory):
- (scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(dataDirectory, defaultPort=self.DEFAULT_PORT)
- dirName = os.path.dirname(os.path.relpath(dataDirectory, dirPath)).strip()
if self.dest:
- destUrl = '%s/%s/' % (self.dest, dirPath)
+ destUrl = '%s/' % (self.dest)
else:
- destUrl = 'sshftp://%s/%s/%s/' % (storageHost, storageDirectory, dirName)
+ destUrl = 'sshftp://%s/%s/' % (storageHost, storageDirectory)
return destUrl
def processDirectory(self, directoryInfo):
@@ -161,7 +160,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
# Transfer directory
self.logger.debug('Starting transfer: %s -> %s' % (srcUrl, destUrl))
- self.start(src=srcUrl, dest=destUrl, templateInfo=uploadInfo, cwd=dataDirectory)
+ self.start(src=srcUrl, dest=destUrl, command=self.DIRECTORY_TRANSFER_COMMAND, templateInfo=uploadInfo)
#######################################################################
# Testing.
--
GitLab