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.

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

Jump to bottom

HPCC-29721 setReplicateDir fails if config dir ends with path seperator #17974

Merged
merged 1 commit into from
Nov 9, 2023
Merged

HPCC-29721 setReplicateDir fails if config dir ends with path seperator #17974

merged 1 commit into from
Nov 9, 2023

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Oct 30, 2023 •
edited
Loading

Causing unittest CDaliDFSStressTests testDFSRename failures.

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@github-actions
Copy link

https://track.hpccsystems.com/browse/HPCC-29721
Jira updated

@jakesmith jakesmith force-pushed the HPCC-29721-replicatedir-bug branch from e4c9272 to b226370 Compare October 30, 2023 13:45
@jakesmith jakesmith changed the title HPCC-29721 replicatedir not set if config dir ends with path seperator HPCC-29721 setReplicateDir fails if config dir ends with path seperator Oct 30, 2023
jakesmith
jakesmith commented Oct 30, 2023
View reviewed changes
dali/base/dafdesc.cpp
tmp.append(queryBaseDirectory(grp_unknown, 0, SepCharBaseOs(sc)));
if (sc != tmp.charAt(tmp.length()-1))
tmp.append(sc);
tmp.append(s);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NB: this is an incidental fix, observed while testing. A relative path and a config dir suffixed with a path separator caused a double path separator to be inserted.
I think this only ever happened (relative lfn dir path) via the unittests.

@jakesmith jakesmith requested a review from ghalliday October 30, 2023 13:48
ghalliday
ghalliday reviewed Oct 31, 2023
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few comments/questions.

dali/base/dafdesc.cpp
out.append(r).append(dir+i);
return true;
}
}
else if (count) { // this is a bit of a kludge to handle roxie backup
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to delete this code? If so the count/match variables are no longer needed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm, I did not, well spotted.

dali/base/dafdesc.cpp
if ((dir[i]==0)||isPathSepChar(dir[i])) {
if (d[i]==0)
{
if (dir[i]==0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth adding a comment to clarify the cases. E.g.,
//directory is an exact match for the current base, so return replica unmodified.

dali/base/dafdesc.cpp Outdated
return true;
}
else if (isPathSepChar(dir[i])) // should mean that the last char of d was not a pathsepchar
{
out.append(r).append(dir+i);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does r definitely have no trailing /? Otherwise this could lead to double //

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that may be an additional issue. I'll check and probably add a check for tailing '/' on r too.

@jakesmith jakesmith requested a review from ghalliday November 9, 2023 10:25
@jakesmith
Copy link
Member Author

@ghalliday - please review changes - I thought I pushed this last week..

ghalliday
ghalliday approved these changes Nov 9, 2023
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, please squash

@jakesmith
HPCC-29721 setReplicateDir fails if config dir ends with path seperator
152d51f 
Causing unittest CDaliDFSStressTests testDFSRename failures.

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
@jakesmith jakesmith force-pushed the HPCC-29721-replicatedir-bug branch from 6e42188 to 152d51f Compare November 9, 2023 12:48
@jakesmith
Copy link
Member Author

@ghalliday - squashed.

@ghalliday ghalliday merged commit 018eacd into hpcc-systems:candidate-9.0.x Nov 9, 2023
28 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghalliday ghalliday ghalliday approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jakesmith @ghalliday