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-30848 Ensure globals are available in bare-metal esp #18145

Merged

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Dec 14, 2023

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:

@jakesmith jakesmith force-pushed the HPCC-30848-esp-globals branch from d05946e to 55eec12 Compare December 14, 2023 16:11
@jakesmith jakesmith changed the title HPCC-30848 Ensure globals are available in baer-metal esp HPCC-30848 Ensure globals are available in bare-metal esp Dec 14, 2023
@jakesmith jakesmith requested a review from wangkx December 14, 2023 16:11
Copy link
Member

@wangkx wangkx left a comment

Choose a reason for hiding this comment

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

@jakesmith the changes look good although I do leave questions/comments. I tested the getRemoteStorage().

esp/platform/espcfg.cpp Show resolved Hide resolved
esp/platform/espp.cpp Show resolved Hide resolved
esp/platform/espp.cpp Show resolved Hide resolved
@ghalliday ghalliday merged commit c834127 into hpcc-systems:candidate-9.4.x Dec 15, 2023
45 checks passed
@ghalliday
Copy link
Member

@jakesmith I merged since it was approved, but I wonder if kevin's comment isn't better.

Curious again. Why not pass the cfgfile to the loadConfiguration like other components (for example, dfuserver: globals.setown(loadConfiguration(defaultYaml, argv, "dfuserver", "DFUSERVER", "dfuserver.xml", nullptr)))?

I should have let you answer before merging. As it stands the global properties are not picked up by anything (e.g., tracing) which does not monitor for updates to the configuration.

Copy link
Member Author

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

@wangkx - see replies.

esp/platform/espcfg.cpp Show resolved Hide resolved
esp/platform/espp.cpp Show resolved Hide resolved
esp/platform/espp.cpp Show resolved Hide resolved
@jakesmith
Copy link
Member Author

As it stands the global properties are not picked up by anything (e.g., tracing) which does not monitor for updates to the configuration.

global/tracing (if defined under Software/Globals) should be picked up after this change, i.e. anything calling getGlobalConfig*() asking for "tracing" should see it.

You're right though, as the esp config is structured config changes to esp (both bare-metal and cloud) are not going to be propagated. Beyond the scope of this PR, but should be revisited. I've opened a new JIRA: https://track.hpccsystems.com/browse/HPCC-31029

@wangkx
Copy link
Member

wangkx commented Dec 18, 2023

Thanks for the replies.

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.

3 participants