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-32954 Add unit tests for the jobqueue #19298

Merged
merged 2 commits into from
Jan 9, 2025
Merged

HPCC-32954 Add unit tests for the jobqueue #19298

merged 2 commits into from
Jan 9, 2025

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Nov 14, 2024 •
edited
Loading

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:

@ghalliday ghalliday requested a review from jakesmith November 14, 2024 11:37
@github-actions GitHub Actions
Copy link

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

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

@AttilaVamos
Copy link
Contributor

@ghalliday How long this new unit test suppose to be running?

@AttilaVamos
Copy link
Contributor

@ghalliday I have a core trace, but it seems odd:

Core was generated by `/opt/HPCCSystems/bin/unittests -e JobQueueTester'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007f27d5989acf in raise () from /lib64/libc.so.6
[Current thread is 1 (Thread 0x7f27ca40e700 (LWP 143584))]

Unfortunately there is not Thread 0 stack trace.

jakesmith
jakesmith reviewed Dec 2, 2024
View reviewed changes
Copy link
Member

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

@ghalliday - some trivial comments + 1 re. expectedResults check being commented out

common/workunit/wujobq.cpp Outdated
{
unsigned timeout = prioritytransitiondelay;
bool usePrevPrio = true;
item.setown(dodequeue(minPrio, timeout, usePrevPrio, nullptr));
Copy link
Member

Choose a reason for hiding this comment

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

trivial: not sure overloading 'timeout' here (2 lines above) vs using 'prioritytransitiondelay' directly makes the code more intuitive.

testing/unittests/dalitests.cpp Outdated


static constexpr bool traceJobQueue = false;
static unsigned jobQueueStartTick;
Copy link
Member

Choose a reason for hiding this comment

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

in practice it may not matter in practice, but would look better if initialized to 0?

Copy link
Member Author

Choose a reason for hiding this comment

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

statics are initialised, but added an explicit initialiser.

testing/unittests/dalitests.cpp Outdated
{
return (msTick() - jobQueueStartTick) / tickScaling;
}
static void JobQueueSleep(unsigned ms)
Copy link
Member

Choose a reason for hiding this comment

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

pedantic: unusual for methods not to be camel case?

testing/unittests/dalitests.cpp Outdated
JobProcessor & cur = jobProcessors.item(i3);
DBGLOG(" Result: '%s' '%s'", cur.queryOutput(), cur.queryLog());
// if (i3 < expectedResults.size())
// CPPUNIT_ASSERT_EQUAL(std::string(expectedResults.begin()[i3]), std::string(cur.queryOutput()));
Copy link
Member

Choose a reason for hiding this comment

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

accidentally left commented out?

Copy link
Member Author

Choose a reason for hiding this comment

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

Commented out because it needed improving - now implemented.

@ghalliday ghalliday requested a review from jakesmith January 7, 2025 13:25
jakesmith
jakesmith approved these changes Jan 7, 2025
View reviewed changes
Copy link
Member

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

@ghalliday - I didn't spot any issues. 1 trivial formatting comment.

testing/unittests/dalitests.cpp Outdated
JobProcessor(Semaphore & _startedSem, Semaphore & _processedSem, IJobQueue * _queue, unsigned _id)
: startedSem(_startedSem), processedSem(_processedSem), queue(_queue), id(_id)
{
}
Copy link
Member

Choose a reason for hiding this comment

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

trivial/formatting: arguably odd indentation (braces not under ctor name)

@ghalliday
Copy link
Member Author

unit test regression test is timing out - I will investigate why.

@ghalliday
Changes following review
cd3fbd6 
Signed-off-by: Gavin Halliday <[email protected]>
@ghalliday
Copy link
Member Author

Fixed indent and renamed test so that not run as part of normal unit tests

@ghalliday ghalliday closed this Jan 9, 2025
@ghalliday ghalliday reopened this Jan 9, 2025
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 9, 2025

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

Jirabot Action Result:
Workflow Transition To: Merge Pending

@ghalliday ghalliday merged commit b037aa7 into hpcc-systems:master Jan 9, 2025
97 of 102 checks passed
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 9, 2025

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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