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-32963 Fix ecl unused-files for bare-metal roxie with TLS and custom port #19291

Merged
merged 1 commit into from
Nov 28, 2024
Merged

HPCC-32963 Fix ecl unused-files for bare-metal roxie with TLS and custom port #19291

merged 1 commit into from
Nov 28, 2024

Conversation

asselitx
Copy link
Contributor

@asselitx asselitx commented Nov 11, 2024 •
edited
Loading

In non-containerized deployments, fix the ecl roxie unused-files command to work when roxie is configured for TLS (SSL) and/or is using a nonstandard port other than 9876.

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:

Passed manual tests:

  1. Local bare metal deployment configured roxie to use SSL on port 19876 only. ecl roxie unused-files command was able to communicate with roxie, no errors.
  2. Local containerized deployment tested to confirm that ecl roxie unused-files command continues to work for native protocol using port 9876.

Other occurrences of this issue, including for containerized code will be addressed in ticket HPCC-32962

@asselitx asselitx requested a review from mckellyln November 11, 2024 18:57
@github-actions GitHub Actions
Copy link

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

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

mckellyln
mckellyln reviewed Nov 12, 2024
View reviewed changes
esp/services/ws_dfu/ws_dfuXRefService.cpp
@@ -117,6 +117,10 @@ void CWsDfuXRefEx::init(IPropertyTree *cfg, const char *process, const char *ser
throw MakeStringException(-1, "No Dali Connection Active. Please Specify a Dali to connect to in you configuration file");
}

#ifndef _CONTAINERIZED
initBareMetalRoxieTargets(roxieConnMap);
Copy link
Contributor

@mckellyln mckellyln Nov 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

It seems like there is another

  void initBareMetalRoxieTargets(MapStringToMyClass<ISmartSocketFactory> &connMap, IPropertyTree *serviceTree, const char *daliAddress)

in ws_ecl_service.cpp - could these be commoned up ?

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 yes you're right- I'd copied that function from ws_ecl_service.cpp into TpWrapper for HPCC-31394 and missed the common-up. Should I common up in this ticket or in the parent (HPCC-32962) where I'll roll out the fix to the other services?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've added a note to HPCC-32962 to common-up that code.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok

mckellyln
mckellyln reviewed Nov 12, 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
And why did some of the CI tests not pass ?

@asselitx
HPCC-32963 Fix ecl unused-files for bare-metal roxie with TLS and cus…
5dc7b23 
…tom port

In non-containerized deployments, fix the `ecl roxie unused-files` command to
work when roxies are configured for TLS (SSL) and/or they're using a
nonstandard port other than 9876.

Signed-off-by: Terrence Asselin <[email protected]>
@asselitx asselitx force-pushed the unused-files-hpcc-32963 branch from 7a259e6 to 5dc7b23 Compare November 15, 2024 21:07
@asselitx
Copy link
Contributor Author

asselitx commented Nov 15, 2024 •
edited
Loading

Just one question And why did some of the CI tests not pass ?

Not sure, looks ECLWatch/npm related something with OTel. I've rebased to see if I pick up some fix from target.

And it looks like the tests now pass.

@asselitx asselitx requested a review from mckellyln November 20, 2024 17:21
mckellyln
mckellyln approved these changes Nov 21, 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.

Looks ok.

@asselitx
Copy link
Contributor Author

@ghalliday ready to merge

@ghalliday ghalliday merged commit 128b9d0 into hpcc-systems:candidate-9.8.x Nov 28, 2024
51 checks passed
@github-actions GitHub Actions
Copy link

Jirabot Action Result:
Added fix version: 9.8.44
Workflow Transition: 'Resolve issue'

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.
3 participants
@asselitx @mckellyln @ghalliday