HPCC-31893 Fix conflict between multiple thor components on same node

[Michael-Gardner]

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]

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

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

[Michael-Gardner]

@mckellyln This is a cleaner way to kill slaves on local & remote machines. Using kill_process from hpcc_setenv that will look at the passed in pidfile, kill based on the pid instead of matching a partial name like killall. Fixes the issue where multiple thors on the same cluster have a similar name and get matched incorrectly, killing slaves from the wrong thor component.

The env file in the related Jira has a mythor1 and mythor2 on a local node for testing. Both Dan Camper and I tested these changes.

The grep with "${slavename}_" has the _ after the slavename to ensure we don't match both "mythor2" and "mythor28" etc. The thorslave pid files are named ${slavename}_[num].pid. Where slavename is something like thorslave_mythor2.

[mckellyln]

If I look now on a Thor node that has multiple separate thors on it I see -

-rw-rw-r-- 1 hpcc hpcc 7 May 20 15:26 thorslave_thor400_112_5.pid
-rw-rw-r-- 1 hpcc hpcc 7 May 20 15:26 thorslave_thor400_112_105.pid
-rw-rw-r-- 1 hpcc hpcc 7 May 20 15:26 thorslave_thor400_112_205.pid
-rw-rw-r-- 1 hpcc hpcc 7 May 20 15:26 thorslave_thor400_112_305.pid

-rw-rw-r-- 1 hpcc hpcc 7 May 20 23:27 thorslave_thor400_112_4_5.pid
-rw-rw-r-- 1 hpcc hpcc 7 May 20 23:27 thorslave_thor400_112_4_105.pid
-rw-rw-r-- 1 hpcc hpcc 7 May 20 23:27 thorslave_thor400_112_4_205.pid
-rw-rw-r-- 1 hpcc hpcc 7 May 20 23:27 thorslave_thor400_112_4_305.pid

Will the grep of ${slavename}_ be good enough here to isolate the single thor chosen ?

[mckellyln]

I have two comments.

And what was the original problem this is solving ? Was it that the process name was > 15 chars in length and the wrong pid was getting killed ?

[Michael-Gardner]

@mckellyln Similar. Dan had two mythors on the same box and every time the second one was started, it would kill the slaves for the first. (mythor1, mythor2). The Jira contains an environment xml that I tested this against.

[mckellyln]

Approved.

[Michael-Gardner]

@ghalliday ready for merge