Skip to content

Conversation

@saintstack
Copy link
Contributor

Make it so can do the 'j' commands against cicd cluster...


    ./joshua_remote_cli.sh --context arn:aws:eks:us-west-2:XXXX:cluster/YYYY --joshua-dir ~/checkouts/fdb/fdb-joshua list --stopped | grep 20260108-051002-pr12617-clang-359e4945-1343-1f14941a72433a82
      20260108-051002-pr12617-clang-359e4945-1343-1f14941a72433a82 compressed=True data_size=35334909 duration=510978 ended=10000 fail=1 fail_fast=10 max_runs=10000 pass=9999 priority=100 remaining=0 runtime=0:17:44 sanity=False started=10000 stopped=20260108-052746 submitted=20260108-051002 timeout=5400 username=pr12617-clang-359e4945-13438
    delascasas:fdb-joshua stack [fdb-build-test]$
    delascasas:fdb-joshua stack [fdb-build-test]$ ./joshua_remote_cli.sh --context arn:aws:eks:us-west-2:XXXX:cluster/YYYY --joshua-dir ~/checkouts/fdb/fdb-joshua tail --errors 20260108-051002-pr12617-clang-359e4945-1343-1f14941a72433a82

jzhou77
jzhou77 previously approved these changes Jan 9, 2026
Copy link
Contributor

@jzhou77 jzhou77 left a comment

Choose a reason for hiding this comment

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

Nice!

johscheuer
johscheuer previously approved these changes Jan 9, 2026
Copy link
Member

@johscheuer johscheuer left a comment

Choose a reason for hiding this comment

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

In general LGTM 👍

if [ "$SCALER_TYPE" = "rhel9" ]; then
SCALER_POD=$(kubectl --context "$CONTEXT" get pods | grep agent-scaler | grep rhel9 | head -1 | awk '{print $1}')
else
SCALER_POD=$(kubectl --context "$CONTEXT" get pods | grep agent-scaler | grep -v rhel9 | head -1 | awk '{print $1}')
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
SCALER_POD=$(kubectl --context "$CONTEXT" get pods | grep agent-scaler | grep -v rhel9 | head -1 | awk '{print $1}')
SCALER_POD=$(kubectl --context "${CONTEXT}" get pods -l app=agent-scaler -o jsonpath='{.items[0].metadata.name}')

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Skipping this. What I have is ugly and could be prettier but works... Need to pick the rhel9 or the regular or the rhel9 scaler.

fi

if [ "$SCALER_TYPE" = "rhel9" ]; then
SCALER_POD=$(kubectl --context "$CONTEXT" get pods | grep agent-scaler | grep rhel9 | head -1 | awk '{print $1}')
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
SCALER_POD=$(kubectl --context "$CONTEXT" get pods | grep agent-scaler | grep rhel9 | head -1 | awk '{print $1}')
SCALER_POD=$(kubectl --context "${CONTEXT}" get pods -l app=agent-scaler-rhel9 -o jsonpath='{.items[0].metadata.name}')

Another option would be to define the label selector in $SCALER_TYPE (or actually the label value).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Skipping for same (weak) reason as above.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm... No. Let me look at this more. Thanks @johscheuer .... Let me do what you suggest.

exit 1
fi

# Copy joshua.py with patched imports
Copy link
Member

Choose a reason for hiding this comment

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

Could you explain/document why the patching is required?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(There is no lxml over on the agent pod and joshua.py is being run out of its module context)

@saintstack saintstack dismissed stale reviews from johscheuer and jzhou77 via 8653715 January 9, 2026 17:43
@saintstack
Copy link
Contributor Author

Address @johscheuer comments. Tested the changes against local cluster.

@@ -0,0 +1,198 @@
From 662a215b2f8901f190f583a3561589c121d3c332 Mon Sep 17 00:00:00 2001
Copy link
Member

Choose a reason for hiding this comment

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

Was that file uploaded intentionally?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mistake. Thanks for noticiing.

michael stack and others added 6 commits January 12, 2026 08:32
./joshua_remote_cli.sh --context arn:aws:eks:us-west-2:XXXX:cluster/YYYY --joshua-dir ~/checkouts/fdb/fdb-joshua list --stopped | grep 20260108-051002-pr12617-clang-359e4945-1343-1f14941a72433a82
  20260108-051002-pr12617-clang-359e4945-1343-1f14941a72433a82 compressed=True data_size=35334909 duration=510978 ended=10000 fail=1 fail_fast=10 max_runs=10000 pass=9999 priority=100 remaining=0 runtime=0:17:44 sanity=False started=10000 stopped=20260108-052746 submitted=20260108-051002 timeout=5400 username=pr12617-clang-359e4945-13438
delascasas:fdb-joshua stack [fdb-build-test]$
delascasas:fdb-joshua stack [fdb-build-test]$ ./joshua_remote_cli.sh --context arn:aws:eks:us-west-2:XXXX:cluster/YYYY --joshua-dir ~/checkouts/fdb/fdb-joshua tail --errors 20260108-051002-pr12617-clang-359e4945-1343-1f14941a72433a82
Co-authored-by: Johannes Scheuermann <[email protected]>
Co-authored-by: Johannes Scheuermann <[email protected]>
- Improve pod selection using proper Kubernetes labels instead of grep/awk
- Add auto-detection of script location
- Documentation and comments
Copy link
Member

@johscheuer johscheuer left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@saintstack saintstack merged commit 20bd6c1 into FoundationDB:main Jan 12, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants