Skip to content

CLDSRV-734: Revert back from go to python supervisord#5922

Merged
bert-e merged 1 commit intodevelopment/9.0from
bugfix/CLDSRV-734-supervisord-python
Sep 29, 2025
Merged

CLDSRV-734: Revert back from go to python supervisord#5922
bert-e merged 1 commit intodevelopment/9.0from
bugfix/CLDSRV-734-supervisord-python

Conversation

@BourgoisMickael
Copy link
Copy Markdown
Contributor

This will fix fluent-bit access to s3 log files

The go version is not a perfect replacement it has multiple changes that would require to update supervisor conf.

Breaking changes includes:

  • log files name changes
    • process number starts count at 1 instead of 0
    • include full process_name with number in logfile
    • s3_1-1.log instead of s3-0.log
  • no supervisorctl, replaced by superivsord ctl with less option
  • no interactive supervisor ctl, if used without command it rewrite the superivsord.sock and then we lose access to supervisord ctl
  • replaced priority with depends_on
  • replaced %(ENV_X)s with envFiles

Overrall we’d like to avoid breaking changes until we resolve correct usage of the go version and apply it in every component at once.

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Aug 29, 2025

Hello bourgoismickael,

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.

@codecov
Copy link
Copy Markdown

codecov bot commented Aug 29, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.31%. Comparing base (23fc025) to head (d6380a6).
⚠️ Report is 1 commits behind head on development/9.0.
✅ All tests successful. No failed tests found.

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff                @@
##           development/9.0    #5922   +/-   ##
================================================
  Coverage            83.31%   83.31%           
================================================
  Files                  189      189           
  Lines                12147    12147           
================================================
  Hits                 10120    10120           
  Misses                2027     2027           
Flag Coverage Δ
ceph-backend-test 65.78% <ø> (ø)
file-ft-tests 66.43% <ø> (ø)
kmip-ft-tests 27.02% <ø> (ø)
mongo-v0-ft-tests 68.03% <ø> (ø)
mongo-v1-ft-tests 68.00% <ø> (ø)
multiple-backend 35.53% <ø> (ø)
quota-tests 33.14% <ø> (-0.04%) ⬇️
quota-tests-inflights 34.25% <ø> (ø)
unit 67.42% <ø> (ø)
utapi-v2-tests 33.42% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Aug 29, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@scality scality deleted a comment from bert-e Aug 29, 2025
@scality scality deleted a comment from bert-e Aug 29, 2025
@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Aug 29, 2025

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

@BourgoisMickael BourgoisMickael requested review from a team, DarkIsDude, anurag4DSB, francoisferrand, leif-scality and nicolas2bert and removed request for a team August 29, 2025 11:03
@BourgoisMickael BourgoisMickael marked this pull request as draft August 29, 2025 14:25
@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

Will not merge for now, we will try to fix the divergence in supervisord.conf and try to use that same version into all our containers to have the same behavior everywhere.

Copy link
Copy Markdown
Contributor

@tcarmet tcarmet left a comment

Choose a reason for hiding this comment

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

LGTM but for full fluent-bit access does it need the scality group to exists? If so, can you double check if usermode --login ${USER} is also creating a scality group (not only the user), if not let's modify the user creation to ensure we have one.

@DarkIsDude DarkIsDude removed their request for review September 15, 2025 08:05
This will fix fluent-bit access to s3 log files

The go version is not a perfect replacement it has multiple changes that would require to update supervisor conf.

Breaking changes includes:

- log files name changes
  - process number starts count at 1 instead of 0
  - include full process_name with number in logfile
  - s3_1-1.log instead of s3-0.log
- no supervisorctl, replaced by superivsord ctl with less option
- no interactive supervisor ctl, if used without command it rewrite the superivsord.sock and then we lose access to supervisord ctl
- replaced priority with depends_on
- replaced %(ENV_X)s with envFiles

Overrall we’d like to avoid breaking changes until we resolve correct usage of the go version and apply it in every component at once.
@BourgoisMickael BourgoisMickael force-pushed the bugfix/CLDSRV-734-supervisord-python branch from c0c5dc3 to d6380a6 Compare September 29, 2025 08:55
@BourgoisMickael BourgoisMickael marked this pull request as ready for review September 29, 2025 09:08
@scality scality deleted a comment from bert-e Sep 29, 2025
@scality scality deleted a comment from bert-e Sep 29, 2025
@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/reset

@scality scality deleted a comment from bert-e Sep 29, 2025
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 29, 2025

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 29, 2025

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 29, 2025

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

@scality scality deleted a comment from bert-e Sep 29, 2025
@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/approve

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

Merging as we don't have time to tacke the breaking changes for 9.5.1

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 29, 2025

Build failed

The build for commit did not succeed in branch bugfix/CLDSRV-734-supervisord-python

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 29, 2025

Build failed

The build for commit did not succeed in branch w/9.1/bugfix/CLDSRV-734-supervisord-python

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 29, 2025

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

  • ✔️ development/9.0

  • ✔️ development/9.1

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8

Please check the status of the associated issue CLDSRV-734.

Goodbye bourgoismickael.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit d6380a6 into development/9.0 Sep 29, 2025
52 of 53 checks passed
@bert-e bert-e deleted the bugfix/CLDSRV-734-supervisord-python branch September 29, 2025 11:19
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.

5 participants