HPCC-32803 In file ops, update source file props without locking source file #19232
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32803 Jirabot Action Result: |
shamser
force-pushed
the
issue32803
branch
2 times, most recently
from
1583c1f
to
d7e4efb
Compare
|
HPCC-32879 PR needs to be merged first to allow the changes in this PR to work. @jakesmith |
jakesmith
requested changes
Oct 29, 2024
dali/ft/filecopy.cpp
Outdated
| @@ -3446,7 +3449,7 @@ bool FileSprayer::isSameSizeHeaderFooter() | |||
| return retVal; | |||
| } | |||
|
|
|||
| void FileSprayer::updateTargetProperties() | |||
| void FileSprayer::updateTargetProperties(cost_type & totalReadCost) | |||
There was a problem hiding this comment.
looks like this is supposed to be totalWriteCost (totalReadCost is not updated in this method).
dali/ft/filecopy.cpp
Outdated
| throw error.getClear(); | ||
| } | ||
|
|
||
| void FileSprayer::updateSourceProperties(cost_type & totalReadCost) |
There was a problem hiding this comment.
it would be cleaner if updateTargetProperties and updateSourceProperties returned the total (vs filled by reference)
With a comment ahead of each method saying what it returns.
| curProps.setPropInt64(getDFUQResultFieldName(DFUQRFreadCost), legacyReadCost + prevReadCost + totalReadCost); | ||
| distributedSource->addAttrValue(getDFUQResultFieldName(DFUQRFnumDiskReads), totalNumReads); | ||
| cost_type legacyReadCost = getLegacyReadCost(distributedSource->queryAttributes(), distributedSource); | ||
| distributedSource->addAttrValue(getDFUQResultFieldName(DFUQRFreadCost), legacyReadCost + totalReadCost); |
There was a problem hiding this comment.
as discussed, separate topic, updating supers directly vs via updateFileAttrs
I've opened a new JIRA to revisit/tackle this separately.
…ce file This fixes the issue of some file operations failing because the source file was locked when the operation was taking place. Source files may be locked if it is being processed elsewhere. Prevously, the source file was being locked to allow the source file's disk read count and read costs properties to be updated. The fix makes use of CFileAttrLock to update file properties without requiring the file to be locked. Changes: - Make FileSprayer::updateTargetProperties update only update the target properties (it was also previously updating the source properties) - Create FileSprayer::updateSourceProperties to update the source properties and make it use CFileAttrLock lock the attributes, removing the need to lock the IDistributedFile. Signed-off-by: Shamser Ahmed <[email protected]>
Signed-off-by: Shamser Ahmed <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the issue of some file operations failing because the source file was locked when the operation was taking place. Source files may be locked if it is being processed elsewhere. Prevously, the source file was being locked to allow the source file's disk read count and read costs properties to be updated. This issue is fixed by making use of CFileAttrLock which makes it possible to update file properties without requiring the file to be locked.
Changes:
Type of change:
Checklist:
Smoketest:
Testing: