Skip to content

feat (FileStorage): allow to specify block size #8768

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.

Sign up for GitHub

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

Draft
chaen wants to merge 1 commit into
base: integration
Choose a base branch
from
+16 −2
Draft

feat (FileStorage): allow to specify block size #8768

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions src/DIRAC/Resources/Storage/FileStorage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,20 @@ def __init__(self, storageName, parameters):

self.pluginName = "File"
self.protocol = self.protocolParameters["Protocol"]
self.block_size = int(self._allProtocolParameters.get("BlockSize", 0))

def _do_copy(self, src, dst):
"""
Either use shutil.copy2 or copyfileobj if the site is
strongly opinionated on the block size
"""
if not self.block_size:
return shutil.copy2(src, dst)
else:
with open(src, "rb") as fd_r:
with open(dst, "wb") as fd_w:
shutil.copyfileobj(fd_r, fd_w, self.block_size)
shutil.copystat(src, dst)

def getURLBase(self, withWSUrl=False):
return S_OK(self.basePath)
Expand Down Expand Up @@ -243,7 +257,7 @@ def getFile(self, path, localPath=False):
try:
fileName = os.path.basename(src_url)
dest_url = os.path.join(localPath, fileName)
shutil.copy2(src_url, dest_url)
self._do_copy(src_url, dest_url)

fileSize = os.path.getsize(dest_url)
successful[src_url] = fileSize
Expand Down Expand Up @@ -277,7 +291,7 @@ def putFile(self, path, sourceSize=0):
dirname = os.path.dirname(dest_url)
if not os.path.exists(dirname):
os.makedirs(dirname)
shutil.copy2(src_file, dest_url)
self._do_copy(src_file, dest_url)
fileSize = os.path.getsize(dest_url)
try:
src_cks = fileAdler(src_file)
Expand Down
Loading