Skip to content

Commit

Permalink
Add UUIDs to command line of running Tool Meisters
Browse files Browse the repository at this point in the history 
In order to facilitate a "big-hammer" approach to cleaning up wayward
Tool Meister sub-systems, we add UUIDs to the command line invocations
of the remote Tool Meister processes.  We don't need to do that for the
local Redis server, Tool Data Sink, and Tool Meister process because we
have their PID files already.

We do take this opportunity, though, to verify the UUID given on the
command line against the running parameters stored in Redis.
  • Loading branch information
@portante
portante authored May 12, 2022
1 parent 7572263 commit 1f64660
Show file tree
Hide file tree
Showing 14 changed files with 117 additions and 31 deletions.
1 change: 1 addition & 0 deletions agent/util-scripts/gold/test-client-tool-meister/test-53.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Collecting system information
/var/tmp/pbench-test-utils/pbench/mock-run/sysinfo/end/testhost.example.com/tm-sysinfo.err
/var/tmp/pbench-test-utils/pbench/mock-run/sysinfo/end/testhost.example.com/tm-sysinfo.out
/var/tmp/pbench-test-utils/pbench/mock-run/tm
/var/tmp/pbench-test-utils/pbench/mock-run/tm/.uuid
/var/tmp/pbench-test-utils/pbench/mock-run/tm/pbench-tool-data-sink.err
/var/tmp/pbench-test-utils/pbench/mock-run/tm/pbench-tool-data-sink.out
/var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.conf
Expand Down
7 changes: 4 additions & 3 deletions agent/util-scripts/gold/test-client-tool-meister/test-56.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ Collecting system information
/var/tmp/pbench-test-utils/pbench/mock-run/sysinfo/end/testhost.example.com/tm-sysinfo.err
/var/tmp/pbench-test-utils/pbench/mock-run/sysinfo/end/testhost.example.com/tm-sysinfo.out
/var/tmp/pbench-test-utils/pbench/mock-run/tm
/var/tmp/pbench-test-utils/pbench/mock-run/tm/.uuid
/var/tmp/pbench-test-utils/pbench/mock-run/tm/pbench-tool-data-sink.err
/var/tmp/pbench-test-utils/pbench/mock-run/tm/pbench-tool-data-sink.out
/var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.conf
Expand Down Expand Up @@ -662,10 +663,10 @@ sysinfo_full_hostname='testhost.example.com'
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR}\n pbench-sysstat
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR}\n pbench-sysstat
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR}\n pbench-sysstat
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-a.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-a.example.com yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-a.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-a.example.com 00000000-0000-0000-0000-000000000001 yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-a.example.com echo ${SSH_CONNECTION}
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-b.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-b.example.com yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-b.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-b.example.com 00000000-0000-0000-0000-000000000001 yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-b.example.com echo ${SSH_CONNECTION}
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-c.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-c.example.com yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-c.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-c.example.com 00000000-0000-0000-0000-000000000001 yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-c.example.com echo ${SSH_CONNECTION}
--- test-execution.log file contents
7 changes: 4 additions & 3 deletions agent/util-scripts/gold/test-client-tool-meister/test-57.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ pbench-tool-meister-stop: system information not collected when --interrupt spec
/var/tmp/pbench-test-utils/pbench/mock-run/sysinfo/beg/testhost.example.com/tm-sysinfo.err
/var/tmp/pbench-test-utils/pbench/mock-run/sysinfo/beg/testhost.example.com/tm-sysinfo.out
/var/tmp/pbench-test-utils/pbench/mock-run/tm
/var/tmp/pbench-test-utils/pbench/mock-run/tm/.uuid
/var/tmp/pbench-test-utils/pbench/mock-run/tm/pbench-tool-data-sink.err
/var/tmp/pbench-test-utils/pbench/mock-run/tm/pbench-tool-data-sink.out
/var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.conf
Expand Down Expand Up @@ -598,10 +599,10 @@ sysinfo_full_hostname='testhost.example.com'
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR}\n pbench-sysstat
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR}\n pbench-sysstat
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR}\n pbench-sysstat
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-a.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-a.example.com yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-a.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-a.example.com 00000000-0000-0000-0000-000000000001 yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-a.example.com echo ${SSH_CONNECTION}
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-b.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-b.example.com yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-b.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-b.example.com 00000000-0000-0000-0000-000000000001 yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-b.example.com echo ${SSH_CONNECTION}
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-c.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-c.example.com yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-c.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-c.example.com 00000000-0000-0000-0000-000000000001 yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-c.example.com echo ${SSH_CONNECTION}
--- test-execution.log file contents
7 changes: 4 additions & 3 deletions agent/util-scripts/gold/test-client-tool-meister/test-61.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ERROR - "pbench-tool-meister-start --sysinfo='block,security_mitigations,sos' 'l
/var/tmp/pbench-test-utils/pbench/mock-run/ssh_config
/var/tmp/pbench-test-utils/pbench/mock-run/ssh_config.d
/var/tmp/pbench-test-utils/pbench/mock-run/tm
/var/tmp/pbench-test-utils/pbench/mock-run/tm/.uuid
/var/tmp/pbench-test-utils/pbench/mock-run/tm/pbench-tool-data-sink.err
/var/tmp/pbench-test-utils/pbench/mock-run/tm/pbench-tool-data-sink.out
/var/tmp/pbench-test-utils/pbench/mock-run/tm/redis.conf
Expand Down Expand Up @@ -283,10 +284,10 @@ testhost.example.com INFO pbench-tool-meister __exit__ -- testhost.example.com:
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR}\n pbench-sysstat
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR}\n pbench-sysstat
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/rpm --query --queryformat=%{EVR}\n pbench-sysstat
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-a.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-a.example.com yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-a.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-a.example.com 00000000-0000-0000-0000-000000000001 yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-a.example.com echo ${SSH_CONNECTION}
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-b.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-b.example.com yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-b.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-b.example.com 00000000-0000-0000-0000-000000000001 yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-b.example.com echo ${SSH_CONNECTION}
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-c.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-c.example.com yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-c.example.com /var/tmp/pbench-test-utils/opt/pbench-agent/util-scripts/tool-meister/pbench-tool-meister localhost 17001 tm-lite-remote-c.example.com 00000000-0000-0000-0000-000000000001 yes
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o BatchMode=yes -o StrictHostKeyChecking=no remote-c.example.com echo ${SSH_CONNECTION}
--- test-execution.log file contents
Loading

0 comments on commit 1f64660

Please sign in to comment.