merged fixes from 0.9

etc/dm.deploy.conf

@@ -15,5 +15,5 @@ DM_DAQ_WEB_SERVICE_HOST=DM_HOSTNAME
 DM_DAQ_WEB_SERVICE_PORT=33336
 DM_CAT_WEB_SERVICE_HOST=DM_HOSTNAME
 DM_CAT_WEB_SERVICE_PORT=44436
-DM_SOFTWARE_VERSION="0.8 (DM_DATE)"
+DM_SOFTWARE_VERSION="0.9 (DM_DATE)"
 

src/python/dm/__init__.py

-__version__ = "0.8 (2016.02.05)"
+__version__ = "0.9 (2016.02.24)"

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.

src/python/dm/ds_web_service/service/impl/experimentManager.py

@@ -231,8 +231,8 @@ class ExperimentManager(Singleton):
         if os.path.exists(directoryPath):
             self.logger.debug('Processing directory path %s (directoryInfo: %s)' % (directoryPath, directoryInfo))
             if self.manageStoragePermissions:
-                self.logger.debug('Modifying permissions for directory %s' % directoryPath)
-                OsUtility.chmodPath(directoryPath, fileMode=self.FILE_PERMISSIONS_MODE)
+                self.logger.debug('Modifying permissions for directory %s to %s' % (directoryPath, self.DIR_PERMISSIONS_MODE))
+                OsUtility.chmodPath(directoryPath, dirMode=self.DIR_PERMISSIONS_MODE)
                 self.logger.debug('Changing group owner for %s to %s' % (directoryPath, experimentName))
                 self.platformUtility.recursivelyChangePathGroupOwner(directoryPath, experimentName)
                 # Recursively modify subdirectory permissions