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

bugfix in XrdFileCache for 4.0x release #125

Merged
merged 14 commits into from
Jul 4, 2014
Merged

Conversation

alja
Copy link
Contributor

@alja alja commented Jul 2, 2014

The patch contains the following changes in XrdFileCache:

  • Correction in IOFileBlock::Read offset handling when output is split into defined block sizes (option -prefetchFileBlocks ).
  • Adding an implementation of virtual IOFileBlock::ioActive()
  • Log message improvements.

@abh3
Copy link
Member

abh3 commented Jul 2, 2014

Hi Alja,

I assume the delayed file open is comming later.

Andy

On Tue, 1 Jul 2014, Alja Mrak-Tadel wrote:

The patch contains the following changes in XrdFileCache:

  • Correction in IOFileBlock::Read offset handling when output is split into defined block sizes (option -prefetchFileBlocks ).
  • Adding an implementation of virtual IOFileBlock::ioActive()
  • Log message improvements.

You can merge this Pull Request by running:

git pull https://github.com/alja/xrootd 40-bugfix-xfc

Or you can view, comment on it, or merge it online at:

#125

-- Commit Summary --

  • Properly propagate offset in file block mode.
  • Parse block size in MB.
  • Implement virtual IOFileBlock::ioActive().
  • Simplify Prefetch::InitiateClose() -- return ioActive state unless file is comletely downloaded or Prefetch has not been started.
  • Add missing offset in Prefetch::Read() when file is completely downloaded.
  • Add offset information in log messages.
  • Check all Prefetch states in IOFileBlock::ioActive.
  • Check file is complete in GetNextTask().
  • Changes in logging.
  • Fix instantiation of XrdSysMutexHelper.
  • Fix compilation error.

-- File Changes --

M src/XrdFileCache/XrdFileCache.cc (2)
M src/XrdFileCache/XrdFileCacheFactory.cc (6)
M src/XrdFileCache/XrdFileCacheIOFileBlock.cc (49)
M src/XrdFileCache/XrdFileCacheIOFileBlock.hh (15)
M src/XrdFileCache/XrdFileCachePrefetch.cc (141)
M src/XrdFileCache/XrdFileCachePrefetch.hh (15)

-- Patch Links --

https://github.com/xrootd/xrootd/pull/125.patch
https://github.com/xrootd/xrootd/pull/125.diff


Reply to this email directly or view it on GitHub:
#125

@alja
Copy link
Contributor Author

alja commented Jul 3, 2014

Yes, this are corrections only for the mode where cached files are in predefined block size (option -prefetchFileBlocks).

@alja
Copy link
Contributor Author

alja commented Jul 3, 2014

I've just added a change in parsing of configuration. It now supports k and m suffixes using XrdOuca2x::a2sz().

@abh3
Copy link
Member

abh3 commented Jul 3, 2014

Hi Alja,

Thanks. Could you just give me a quick list of all the options that now
accept that notation so I can change the documentation? That would help a
lot. in terms of not missing or misidentifying anything.

Andy

On Thu, 3 Jul 2014, Alja Mrak-Tadel wrote:

I've just added a change in parsing of configuration. It now supports k and m suffixes using XrdOuca2x::a2sz().


Reply to this email directly or view it on GitHub:
#125 (comment)

@ljanyst ljanyst merged commit 8cc948a into xrootd:master Jul 4, 2014
@ljanyst
Copy link
Contributor

ljanyst commented Jul 4, 2014

Should this be merged with stable-4.0.x (for 4.0.1) as well?

@alja
Copy link
Contributor Author

alja commented Jul 4, 2014

Hi Andy,

I'm sorry I forgot to update the documentation.

Two XrdFileCache option -bufferSize and -blockSize now use k and m suffixes. I have updated src/XrdFileCache/README #127. And changed text (in green) for the same two options in html doc https://docs.google.com/document/d/1A4FgGn64EKsEFYwmNvbSyduEfx3ZxfJCQq4RU2Zui8o/edit?usp=sharing
Alja

@alja
Copy link
Contributor Author

alja commented Jul 4, 2014

@ljanyst
Can you please include the change for 4.0.1?

@alja
Copy link
Contributor Author

alja commented Jul 4, 2014

@ljanyst Do you prefer I make a new PR for stable 4.0 branch instead?

@ljanyst
Copy link
Contributor

ljanyst commented Jul 7, 2014

@alja Thanks! I will port it myself.

@alja alja deleted the 40-bugfix-xfc branch April 20, 2017 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants