Skip to content

remove unused port-forward PID captures#2446

Merged
bert-e merged 1 commit into
development/2.15from
improvement/ZENKO-5298/cleanup-pf-pid
Jun 18, 2026
Merged

remove unused port-forward PID captures#2446
bert-e merged 1 commit into
development/2.15from
improvement/ZENKO-5298/cleanup-pf-pid

Conversation

@delthas

@delthas delthas commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Drop three _*_PF_PID=$! assignments in .github/scripts/end2end/setup-e2e-env.sh that are never read again — no wait, kill, or disown references the captured PIDs anywhere in the file.
  • Pure cleanup, no behavior change. kubectl port-forward ... & already detaches into the background fine without the capture.

Removed

  • _KAFKA_PF_PID
  • _KAFKA_AUTH_PF_PID
  • _PROM_PF_PID

Why

Flagged by @maeldonn on PR #2378 review for two new captures we'd added (_JAEGER_PF_PID, _CLOUDSERVER_INTERNAL_PF_PID); those were dropped in that PR. This one handles the three pre-existing ones.

Issue: ZENKO-5298

Three `_*_PF_PID=$!` assignments in setup-e2e-env.sh are never
referenced after they're set — no wait, kill, or disown. The
port-forwards already run in the background fine without capturing
the PID.

Removes `_KAFKA_PF_PID`, `_KAFKA_AUTH_PF_PID`, `_PROM_PF_PID`. Pure
cleanup, no behavior change.

Flagged by Maël on Zenko PR #2378 review.

Issue: ZENKO-5298
@bert-e

bert-e commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Hello delthas,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e

bert-e commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@SylvainSenechal SylvainSenechal left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

there was a problem with it, or is it a pure 3 lines removal cleanup 🤔

@delthas

delthas commented Jun 18, 2026

Copy link
Copy Markdown
Contributor Author

there was a problem with it, or is it a pure 3 lines removal cleanup 🤔

Literally a 3 line cleanup 😀

@delthas

delthas commented Jun 18, 2026

Copy link
Copy Markdown
Contributor Author

/approve

@scality scality deleted a comment from bert-e Jun 18, 2026
@bert-e

bert-e commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.15

The following branches will NOT be impacted:

  • development/2.10
  • development/2.11
  • development/2.12
  • development/2.13
  • development/2.14
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

This pull request does not target the following hotfix branch(es) so they
will be left untouched:

  • hotfix/2.13.5

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e

bert-e commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@bert-e

bert-e commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.15

The following branches have NOT changed:

  • development/2.10
  • development/2.11
  • development/2.12
  • development/2.13
  • development/2.14
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue ZENKO-5298.

Goodbye delthas.

@bert-e bert-e merged commit c5f010a into development/2.15 Jun 18, 2026
22 checks passed
@bert-e bert-e deleted the improvement/ZENKO-5298/cleanup-pf-pid branch June 18, 2026 13:45
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.

4 participants