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-30468 Use service hostname for external dafilesrv if available #17888

Merged
merged 1 commit into from
Oct 12, 2023
Merged

HPCC-30468 Use service hostname for external dafilesrv if available #17888

merged 1 commit into from
Oct 12, 2023

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Oct 11, 2023 •
edited
Loading

Also:

  • auto-generate secret name for secure dfs service.
  • Refresh directio endpoint in remapGroupsToDafilesrv on config changes.
  • Avoid trailing '/' being treated differently to no path by secret name generation.

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
Copy link

https://track.hpccsystems.com/browse/HPCC-30468
Jira updated

@jakesmith
Copy link
Member Author

@ghalliday @afishbeck - please review
@afishbeck - can you take a careful look at the change in splitUrlSections, which I added because url's like "https://blah.com/" were being considered differently to "https://blah..com", i.e. different secret names were generated.

@jakesmith jakesmith force-pushed the HPCC-30468-use-fqdn-from-service branch from f6da4b8 to fba1d45 Compare October 11, 2023 14:20
ghalliday
ghalliday reviewed Oct 11, 2023
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

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

@jakesmith a couple of minor comments

esp/clients/ws_dfsclient/ws_dfsclient.cpp Outdated
@@ -683,20 +688,18 @@ IDFSFile *lookupDFSFile(const char *logicalName, AccessMode accessMode, unsigned
// auto-discover local environment dfs service.
#ifdef _CONTAINERIZED
// NB: only expected to be here if experimental option #option('dfsesp-localfiles', true); is in use.
// This finds and uses local dfs service for local read lookukup.
// This finds and uses local dfs service for local read lookkups.
Copy link
Member

Choose a reason for hiding this comment

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

still a typo!

Copy link
Member Author

Choose a reason for hiding this comment

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

3rd time lucky

dali/base/dautils.cpp
}
auto externalService = k8s::getDafileServiceFromConfig("directio");
VStringBuffer dafilesrvEpStr("%s:%u", externalService.first.c_str(), externalService.second);
dafileSrvNode.setown(createINode(dafilesrvEpStr));
Copy link
Member

Choose a reason for hiding this comment

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

Accessing dafileSrvNode later on in the pushback needs to (and the createIGroup) needs to be done in a critical section in case it changes inside the call.

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, I'll fix.

system/jlib/jcontainerized.cpp
StringBuffer hostname;
dafilesrv.getProp("@hostname", hostname);
if (hostname.length())
return { hostname.str(), port };
Copy link
Member

Choose a reason for hiding this comment

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

Neat. I never knew that....

@jakesmith
Copy link
Member Author

@ghalliday - please see 2nd commit.

@jakesmith jakesmith requested a review from ghalliday October 11, 2023 16:44
afishbeck
afishbeck approved these changes Oct 11, 2023
View reviewed changes
system/jlib/jsecrets.cpp
@@ -214,7 +214,8 @@ static void splitUrlSections(const char *url, const char * &authority, size_t &a
else
{
authorityLen = path-url;
fullpath.append(path);
if (!streq(path, "/")) // treat empty trailing path as equal to no path
Copy link
Member

Choose a reason for hiding this comment

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

Yes, agreed.

ghalliday
ghalliday approved these changes Oct 12, 2023
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

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

@jakesmith please squash

@jakesmith
HPCC-30468 Use service hostname for external dafilesrv if available
00c31ea 
Also:
+ auto-generate secret name for secure dfs service.
+ Refresh directio endpoint in remapGroupsToDafilesrv on config
changes.
+ Avoid trailing '/' being treated differently to no path by
secret name generation.

Signed-off-by: Jake Smith <[email protected]>
@jakesmith jakesmith force-pushed the HPCC-30468-use-fqdn-from-service branch from b398061 to 00c31ea Compare October 12, 2023 11:21
@jakesmith
Copy link
Member Author

@ghalliday - squashed.

@ghalliday ghalliday merged commit b362a4d into hpcc-systems:candidate-9.4.x Oct 12, 2023
27 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@afishbeck afishbeck afishbeck approved these changes

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