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-32890 Add cleanjobqueues to daliadmin #19242

Merged
merged 1 commit into from
Oct 29, 2024
Merged

HPCC-32890 Add cleanjobqueues to daliadmin #19242

merged 1 commit into from
Oct 29, 2024

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Oct 25, 2024 •
edited
Loading

cleanjobqueues scans all /JobQueues and the Clients within them, and deletes any which are not in use (connected==0).

NB: this should only be necessary on old (pre 9.4 systems). (see HPCC-31807 in 9.4+)

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

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

Jirabot Action Result:
Assigning user: [email protected]
Workflow Transition To: Merge Pending
Updated PR

@jakesmith jakesmith requested a review from shamser October 25, 2024 17:44
shamser
shamser reviewed Oct 28, 2024
View reviewed changes
dali/daliadmin/daadmin.cpp Outdated
{
IPropertyTree &queue = queueIter->query();
const char *name = queue.queryProp("@name");
if (isEmptyString(name)) // should be blank, but guard
Copy link
Contributor

Choose a reason for hiding this comment

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

comment: should not be blank ?

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

shamser
shamser reviewed Oct 28, 2024
View reviewed changes
dali/daliadmin/daadmin.cpp Outdated
for (auto &client: toRemove)
queue.removeTree(client);
}
PROGLOG("%s %u stale client entries", dryRun ? "Dryrun, there are" : "Removed", (unsigned)toRemove.size());
Copy link
Contributor

Choose a reason for hiding this comment

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

minor: would it be useful to show the queue name too?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah, changed.

shamser
shamser reviewed Oct 28, 2024
View reviewed changes
Copy link
Contributor

@shamser shamser left a comment

Choose a reason for hiding this comment

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

Minor: a code comment needs to be changed.

shamser
shamser requested changes Oct 28, 2024
View reviewed changes
Copy link
Contributor

@shamser shamser left a comment

Choose a reason for hiding this comment

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

Minor: a code comment needs to fixed.

@jakesmith jakesmith requested a review from shamser October 28, 2024 11:36
@jakesmith
Copy link
Member Author

@shamser - please see 2nd commit.

@jakesmith jakesmith force-pushed the HPCC-32890-cleanjobqueues branch from a38acd1 to 6d0479b Compare October 29, 2024 11:58
@jakesmith
HPCC-32890 Add cleanjobqueues to daliadmin
c44c522 
cleanjobqueues scans all /JobQueues and the Clients within them,
and deletes any which are not in use (connected==0).

NB: this should only be necessary on old (pre 9.4 systems).
(see HPCC-31807 in 9.4+)

Signed-off-by: Jake Smith <[email protected]>
@jakesmith jakesmith force-pushed the HPCC-32890-cleanjobqueues branch from 6d0479b to c44c522 Compare October 29, 2024 12:00
@ghalliday ghalliday merged commit 0c76000 into hpcc-systems:candidate-9.8.x Oct 29, 2024
18 checks passed
@github-actions GitHub Actions
Copy link

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

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

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