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-33292 Common-up code for creating roxie connection map #19502

Open
wants to merge 2 commits into
base: candidate-9.10.x
Choose a base branch
from

Conversation

asselitx
Copy link
Contributor

@asselitx asselitx commented Feb 7, 2025

  • Move common code to shared functions in SMCLib.
  • Rename initBareMetalRoxieTargets implementation in ws_ecl to indicate it has behavior specific to ws_ecl. The major differences that couldn't be commoned up are that it maps roxie targets by logical name and alias instead of by physical name, and it may use VIPs or a daliServer as endpoints.
  • Use applicable shared function from SMCLib in ws_ecl.
  • Note that this will change ws_ecl behavior in a small but positive way. It now prefers a secure roxie server endpoint over a non-secure.
  • Update CMake files to include and link SMCLib in ws_ecl.
  • Remove SDS_LOCK_TIMEOUT define from ws_ecl_service.cpp that wasn't used and conflicted with another newly-included definition.

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:

Manual testing of the creation of the connection map under different configuration combinations of physical and logical roxie clusters using secure and unsecure ports in different positions of the list of farms, and using different port numbers.

Tested ecl roxie CLI operations that send roxie control messages under the same set of configurations.

Saw some leaks on shutdown in valgrind, but testing a version prior to my PR showed they were present before this change. Opened https://hpccsystems.atlassian.net/browse/HPCC-33400 to track and fix that separately.

- Move common code in shared functions in SMCLib.
- Rename initBareMetalRoxieTargets implementation in ws_ecl to indicate it has
  behavior specific to ws_ecl. The major differences that couldn't be commoned
  up are that it maps roxie targets by logical name and alias instead of by
  physical name, and it may use VIPs or a daliServer as endpoints.
- Use applicable shared function from SMCLib in ws_ecl.
- Note that this will change ws_ecl behavior in a small but positive way. It
  now prefers a secure roxie server endpoint over a non-secure.
- Update CMake files to include and link SMCLib in ws_ecl.
- Remove SDS_LOCK_TIMEOUT define from ws_ecl_service.cpp that wasn't used and
  conflicted with another newly-included definition.

Signed-off-by: Terrence Asselin <[email protected]>
Copy link

github-actions bot commented Feb 7, 2025

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

Jirabot Action Result:
Workflow Transition To: Merge Pending
Updated PR

/**
* Get pipe-delimited list of roxie server addresses and TLS config from environment configuration for the roxie process named `process`.
* @param env environment configuration
* @param process roxie process name
Copy link
Contributor

Choose a reason for hiding this comment

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

Name doesn't match. Looks like line 211 refers to this name as well.

Copy link
Contributor

@timothyklemm timothyklemm left a comment

Choose a reason for hiding this comment

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

Better.

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.

2 participants