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-30994 Ensure jobId's removed from log manager in worker #18128

Merged
merged 1 commit into from
Dec 14, 2023
Merged

HPCC-30994 Ensure jobId's removed from log manager in worker #18128

merged 1 commit into from
Dec 14, 2023

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Dec 8, 2023 •
edited
Loading

Also set jobId earlier in containerized, meaning that some early logging is tagged with the correct jobId instead of "UNK".

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 requested a review from ghalliday December 8, 2023 14:44
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 8, 2023

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

ghalliday
ghalliday reviewed Dec 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.

A couple of questions - possibly recorded in the jira.

thorlcr/slave/thslavemain.cpp Outdated
if (!slaveLogHandler)
slaveLogHandler = startSlaveLog();

if (globals->getPropBool("@MPChannelReconnect"))
Copy link
Member

Choose a reason for hiding this comment

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

This looks like a different change.

Copy link
Member Author

@jakesmith jakesmith Dec 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

shouldn't be here - result of clash mismerge. Will remove.

thorlcr/slave/thslavemain.cpp
@@ -385,12 +396,9 @@ int main( int argc, const char *argv[] )
usage();

mySlaveNum = globals->getPropInt("@slavenum", NotFound);
/* NB: in cloud/non-local storage mode, slave number is not known until after registration with the master
Copy link
Member

Choose a reason for hiding this comment

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

Is this comment no longer correct (I can't get to jira to check if you commented there).

Copy link
Member Author

Choose a reason for hiding this comment

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

this part of the comment would have still been true, 2nd line was misleading.
The comment is now replaced with a more explicit check and exception (line 399-400)

@jakesmith jakesmith requested a review from ghalliday December 11, 2023 15:02
@jakesmith
Copy link
Member Author

@ghalliday - please see replies/new commit.

ghalliday
ghalliday approved these changes Dec 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.

Please squash

ghalliday
ghalliday approved these changes Dec 14, 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-30994 Ensure jobId's removed from log manager in worker
4f87ea9 
Also set jobId earlier in containerized, meaning that some early
logging is tagged with the correct jobId instead of "UNK".

Signed-off-by: Jake Smith <[email protected]>
@jakesmith jakesmith force-pushed the HPCC-30994-worker-jobid branch from 2e69068 to 4f87ea9 Compare December 14, 2023 16:49
@ghalliday ghalliday merged commit 0e7f8de into hpcc-systems:candidate-9.2.x Dec 14, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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.
2 participants
@jakesmith @ghalliday