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

HPCC-25686 Thor crash in FileIO->close() #14844

Merged
merged 1 commit into from
Apr 15, 2021

Conversation

mckellyln
Copy link
Contributor

Signed-off-by: Mark Kelly mark.kelly@lexisnexisrisk.com

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:

smoke test

@github-actions
Copy link

https://track.hpccsystems.com/browse/HPCC-25686
Jira not updated (pull request already registered)

@mckellyln
Copy link
Contributor Author

@jakesmith do you also think we should throw if we cannot open the file ?
As in -

    Owned<IFileIO> partOutputIO = createMultipleWrite(this, *partDesc, diskRowMinSz, twFlags, compress, ecomp, this, &abortSoon, (external&&!query) ? &tempExternalName : NULL);
    if (!partOutputIO)
        throw MakeActivityException(activity, ...)

@jakesmith
Copy link
Member

@jakesmith do you also think we should throw if we cannot open the file ?
As in -

    Owned<IFileIO> partOutputIO = createMultipleWrite(this, *partDesc, diskRowMinSz, twFlags, compress, ecomp, this, &abortSoon, (external&&!query) ? &tempExternalName : NULL);
    if (!partOutputIO)
        throw MakeActivityException(activity, ...)

@mckellyln - it already throws an exception if fails to open (see line 802)

@@ -433,14 +433,17 @@ void CDiskWriteSlaveActivityBase::close()
outraw.clear();
}

Owned<IFileIO> tmpFileIO;
if (outputIO)
Copy link
Member

Choose a reason for hiding this comment

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

looking again, if outputIO is unset, it implies neither 'out' or 'outraw' can be set either.

It won't make any practical difference, but clearer if this conditional block includes lines 417-434 too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok, I will move it there. thx

Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

Not imperative, but one improvement suggestion.

@mckellyln
Copy link
Contributor Author

@jakesmith pushed update. If ok I will squash

Signed-off-by: Mark Kelly <mark.kelly@lexisnexisrisk.com>
@mckellyln
Copy link
Contributor Author

Squashed

Copy link
Member

@jakesmith jakesmith 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.

@richardkchapman richardkchapman merged commit d52557a into hpcc-systems:candidate-7.12.x Apr 15, 2021
@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
OS: centos 7.6.1810 (Linux 3.10.0-957.1.3.el7.x86_64)
GCC: gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5)
Host: ip-10-20-0-189.ca-central-1.compute.internal
Sha: ac6bc7c
Build: success
Milestone:Install hpccsystems-platform-community_7.12.45-closedown0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout elaps
unittest 146 146 0 0 0 52 sec
wutoolTest(Dali) 19 19 0 0 0 1 sec
wutoolTest(Cassandra) 19 19 0 0 0 5 sec

Regression test result:

phase total pass fail elaps
setup (hthor) 9 9 0 24 sec (00:00:24)
setup (thor) 9 9 0 40 sec (00:00:40)
setup (roxie) 19 19 0 17 sec (00:00:17)
test (hthor) 951 951 0 788 sec (00:13:08)
test (thor) 862 862 0 1028 sec (00:17:08)
test (roxie) 1024 1024 0 848 sec (00:14:08)

HPCC Stop: OK
HPCC Uninstall: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
8 sec (00:00:08) 599 sec (00:09:59) 106 sec (00:01:46) 20 sec (00:00:20) 17 sec (00:00:17) 1332 sec (00:22:12) 18 sec (00:00:18) 2100 sec (00:35:00)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants