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-33122 Clean up the mechanism for modifying the component config #19362

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

HPCC-33122 Clean up the mechanism for modifying the component config #19362

wants to merge 9 commits into from

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Dec 13, 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:

@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-33122

Jirabot Action Result:
Assigning user: [email protected]
Workflow Transition To: Merge Pending
Updated PR

@ghalliday ghalliday requested a review from jakesmith December 20, 2024 16:48
@ghalliday
Copy link
Member Author

I think ready for initial review, but I need to go back and review it as well.

@ghalliday ghalliday mentioned this pull request Jan 2, 2025
Draft
39 tasks
jakesmith
jakesmith reviewed Jan 7, 2025
View reviewed changes
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.

@ghalliday - looks good, a couple of questions.

dali/base/dafdesc.cpp Outdated
{
CriticalBlock block(storageCS);
Owned<IPropertyTree> globalConfig = getGlobalConfig();
Owned<IPropertyTree> storage = globalConfig->getPropTree("storage");
Owned<IPropertyTree> storage = newGlobalConfiguration->getPropTree("storage");
Copy link
Member

Choose a reason for hiding this comment

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

trivial: could be an unlinked item, i.e. could be IPropertyTree *storage = newGlobalConfiguration->queryPropTree("storage");

only mentioning, because I looked at the code and the fact it was linked made me wonder if it was necessary for some reason.

system/jlib/jptree.cpp Outdated
ConfigUpdateFunc notifyFunc = notifyConfigUpdates[notifyFuncId];
notifyFunc(config, global);
}
refreshConfiguration(true, false);
Copy link
Member

Choose a reason for hiding this comment

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

trivial: 2nd param 'avoidClone' while not used if firstTime=true - slightly clearer that not/doesn't need to clone if passed avoidClone=true here?

system/jlib/jptree.cpp Outdated
CriticalBlock b(notifyFuncCS);
//Ensure all modifications to the config take place before the config is updated, and the monitoring/caching functions are called.
for (auto & modifyFunc : modifyConfigUpdates)
modifyFunc.second(newComponentConfiguration, newGlobalConfiguration);
Copy link
Member

Choose a reason for hiding this comment

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

minor: I might be inclined to put these 2 lines in a 'executeModifyCallbacks' and rename executeCallbacks to 'executeNotifyCallbacks'

Copy link
Member

Choose a reason for hiding this comment

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

and, as with the current executeCallbacks, would it be better to wrap the calls with try/catch blocks, in case one of them throws?

roxie/ccd/ccddali.cpp
@@ -805,7 +806,7 @@ class CRoxieDaliHelper : implements IRoxieDaliHelper, public CInterface
waitToConnect -= delay;
}
}
initializeStorageGroups(daliHelper->connected());
initializeStoragePlanes(daliHelper->connected(), false); // This can be called while queries are running - so is not thread safe
Copy link
Member

Choose a reason for hiding this comment

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

not new, but it looks like connectToDali is called every time a query dll is loaded, unconditionally,
meaning there is excessive calling of loading/refreshing the configuration (may be slowing the init time down as well).
Should this only be called by when it 1st time and/or when it actually reconnects to Dali ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Created HPCC-33198 to look at that issue.

@jakesmith jakesmith mentioned this pull request Jan 7, 2025
Open
39 tasks
@ghalliday
Changes following review
6aa210e 
Signed-off-by: Gavin Halliday <[email protected]>
@ghalliday ghalliday requested a review from jakesmith January 10, 2025 12:51
@ghalliday
Copy link
Member Author

See changes following review in last commit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakesmith jakesmith Awaiting requested review from jakesmith

At least 1 approving review is required to merge this pull request.

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