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-18250 Move gatherStats() from destructor to avoid accessing invalid memory #10410

Merged
merged 1 commit into from Sep 15, 2017

Conversation

Projects
None yet
4 participants
@ghalliday
Copy link
Member

commented Sep 11, 2017

Signed-off-by: Gavin Halliday gavin.halliday@lexisnexis.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
    • 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

Testing:

@ghalliday

This comment has been minimized.

Copy link
Member Author

commented Sep 11, 2017

@richardkchapman please review

@hpcc-jirabot

This comment has been minimized.

Copy link

commented Sep 11, 2017

@@ -27733,7 +27754,7 @@ class CDelayedActivityGraph : implements IActivityGraph, public CInterface
virtual IEclGraphResults * queryLocalGraph() { throwUnexpected(); }
virtual IRoxieServerChildGraph * queryLoopGraph() { throwUnexpected(); }
virtual IRoxieServerActivity *queryActivity(unsigned _activityId) { return nullptr; } // MORE - may need something here!?

virtual void updateFactoryStatistics() const { }

This comment has been minimized.

Copy link
@richardkchapman
@@ -27510,7 +27526,12 @@ class CProxyActivityGraph : implements IActivityGraph, implements IThorChildGrap
virtual IRoxieServerChildGraph * createGraphLoopInstance(IRoxieSlaveContext *ctx, unsigned loopCounter, unsigned parentExtractSize, const byte * parentExtract, const IRoxieContextLogger &logctx) { throwUnexpected(); }
virtual const char *queryName() const { throwUnexpected(); }
virtual IRoxieServerActivity *queryActivity(unsigned _activityId) { return nullptr; } // MORE - may need something here!?

virtual void updateFactoryStatistics() const

This comment has been minimized.

Copy link
@richardkchapman
SuperHashIteratorOf<decltype(childGraphs)::ELEMENT> iter(childGraphs);
ForEach(iter)
{
IActivityGraph * graph = static_cast<IActivityGraph *>(iter.query().getValue());

This comment has been minimized.

Copy link
@richardkchapman

richardkchapman Sep 13, 2017

Member

Confusing to name this local variable the same as a member...

@@ -15777,6 +15780,8 @@ class CRoxieServerParallelGraphLoopActivity : public CRoxieServerGraphLoopActivi
resultStream = NULL;
resultJunction.clear();
outputs.kill();
ForEachItemIn(i, iterationGraphs)

This comment has been minimized.

Copy link
@richardkchapman

richardkchapman Sep 13, 2017

Member

Bit nervous that this is not too late, given the comment on the line below?

This comment has been minimized.

Copy link
@ghalliday

ghalliday Sep 13, 2017

Author Member

I agree. I'll move it earlier.

@richardkchapman

This comment has been minimized.

Copy link
Member

commented Sep 13, 2017

@ghalliday A few comments

@ghalliday ghalliday force-pushed the ghalliday:issue18250 branch from 36eeff5 to 69ed71e Sep 13, 2017

virtual IThorChildGraph * queryChildGraph() { throwUnexpected(); }
virtual IEclGraphResults * queryLocalGraph() { throwUnexpected(); }
virtual IRoxieServerChildGraph * queryLoopGraph() { throwUnexpected(); }
virtual IRoxieServerActivity *queryActivity(unsigned _activityId) { return nullptr; } // MORE - may need something here!?

This comment has been minimized.

Copy link
@ghalliday

ghalliday Sep 13, 2017

Author Member

note: adding override revealed this function isn't in the base interface - so deleted.

@ghalliday

This comment has been minimized.

Copy link
Member Author

commented Sep 13, 2017

@richardkchapman addressed comments. Please check again.

@@ -27510,7 +27528,12 @@ class CProxyActivityGraph : implements IActivityGraph, implements IThorChildGrap
virtual IRoxieServerChildGraph * createGraphLoopInstance(IRoxieSlaveContext *ctx, unsigned loopCounter, unsigned parentExtractSize, const byte * parentExtract, const IRoxieContextLogger &logctx) { throwUnexpected(); }
virtual const char *queryName() const { throwUnexpected(); }
virtual IRoxieServerActivity *queryActivity(unsigned _activityId) { return nullptr; } // MORE - may need something here!?

This comment has been minimized.

Copy link
@richardkchapman

richardkchapman Sep 13, 2017

Member

I suspect this should be removed too?

@richardkchapman

This comment has been minimized.

Copy link
Member

commented Sep 13, 2017

@ghalliday One more comment

HPCC-18250 Move gatherStats() from destructor to avoid accessing inva…
…lid memory

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

@ghalliday ghalliday force-pushed the ghalliday:issue18250 branch from 69ed71e to 7d8161c Sep 15, 2017

@ghalliday

This comment has been minimized.

Copy link
Member Author

commented Sep 15, 2017

@richardkchapman removed function and added override to the other members of that class.

@richardkchapman richardkchapman merged commit cea1393 into hpcc-systems:master Sep 15, 2017

@HPCCSmoketest

This comment has been minimized.

Copy link
Contributor

commented Sep 15, 2017

Automated Smoketest:
Sha: 7d8161c
Build: success
Build: success
ECL Watch: Rebuilding Site

errors warnings build time
0 75 43.531 seconds

Install hpccsystems-platform-community_6.5.0-trunk0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 92 92 0 0 0
wutoolTest(Dali) 19 19 0 0 0
wutoolTest(Cassandra) 19 19 0 0 0

Regression test result:

phase total pass fail
setup (hthor) 11 11 0
setup (thor) 11 11 0
setup (roxie) 11 11 0
test (hthor) 744 744 0
test (thor) 639 639 0
test (roxie) 772 772 0

HPCC Stop: OK
HPCC Uninstall: OK

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.