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-31054 Improve error message when file copy runs out of disk space #18174

Merged
merged 1 commit into from
Jan 11, 2024
Merged

HPCC-31054 Improve error message when file copy runs out of disk space #18174

merged 1 commit into from
Jan 11, 2024

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Jan 3, 2024 •
edited
Loading

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:

@ghalliday ghalliday requested a review from mckellyln January 3, 2024 08:54
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 3, 2024

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

mckellyln
mckellyln reviewed Jan 3, 2024
View reviewed changes
system/jlib/jfile.cpp
@@ -3264,7 +3264,8 @@ void doCopyFile(IFile * target, IFile * source, size32_t buffersize, ICopyFilePr
// try to delete partial copy
StringBuffer s;
s.append("copyFile target=").append(dest->queryFilename()).append(" source=").append(source->queryFilename()).appendf("; read/write failure (%d): ",e->errorCode());
exc.setown(MakeStringException(e->errorCode(), "%s", s.str()));
e->errorMessage(s);
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this call strerror(e->errorCode()) ? (class ErrnoException)
If so then yes this looks fine.
Or do you want makeErrnoException() instead of makeStringException() ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think this is probably right. In this case e will be a IOSException or an IErrnoException. (I think they are only different for windows - the first for operating system errors, the second for errors from the c library first...!)

When e->errorMessage() is called it will call strerror() - so the message will include the description. I think it cannot call makeErrnoException() because it may not be an errno.

There is similar code in copyFileSection() ~995 which adds the error message and creates an OsException - which I think will lead to the message being duplicated, but I didn't fix since it would be benign.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, then looks fine.

mckellyln
mckellyln reviewed Jan 3, 2024
View reviewed changes
Copy link
Contributor

@mckellyln mckellyln left a comment

Choose a reason for hiding this comment

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

Just one question.

@ghalliday ghalliday requested a review from mckellyln January 10, 2024 09:25
mckellyln
mckellyln approved these changes Jan 11, 2024
View reviewed changes
Copy link
Contributor

@mckellyln mckellyln left a comment

Choose a reason for hiding this comment

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

Approved

@ghalliday ghalliday merged commit 954c8f7 into hpcc-systems:candidate-9.4.x Jan 11, 2024
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mckellyln mckellyln mckellyln 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
@ghalliday @mckellyln