Closed BourgoisMickael closed 8 months ago
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.
Status report is not available.
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.
/create_integration_branches
I have created the integration data for the additional destination branches.
improvement/ARSN-401-cluster-rpc-primary
into
development/7.70
development/8.1
The following branches will NOT be impacted:
development/6.4
development/7.10
development/7.4
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
The following approvals are needed before I can proceed with the merge:
the author
2 peers
The following options are set: create_integration_branches
The following approvals are needed before I can proceed with the merge:
the author
2 peers
The following options are set: create_integration_branches
The Fix Version/s
in issue ARSN-401 contains:
7.70.27
8.1.125
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.70.28
8.1.126
Please check the Fix Version/s
of ARSN-401, or the target
branch of this pull request.
The following options are set: create_integration_branches
There is a conflict between your branch improvement/ARSN-401-cluster-rpc-primary
and the
destination branch development/7.70
.
Please resolve the conflict on the feature branch (improvement/ARSN-401-cluster-rpc-primary
).
git fetch && \
git checkout origin/improvement/ARSN-401-cluster-rpc-primary && \
git merge origin/development/7.70
Resolve merge conflicts and commit
git push origin HEAD:improvement/ARSN-401-cluster-rpc-primary
The following options are set: create_integration_branches
A conflict has been raised during the update of
integration branch w/8.1/improvement/ARSN-401-cluster-rpc-primary
with contents from improvement/ARSN-401-cluster-rpc-primary
and development/8.1
.
Please resolve the conflict on the integration branch (w/8.1/improvement/ARSN-401-cluster-rpc-primary
).
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout w/8.1/improvement/ARSN-401-cluster-rpc-primary
$ git pull # or "git reset --hard origin/w/8.1/improvement/ARSN-401-cluster-rpc-primary"
$ git merge origin/development/8.1
$ # <intense conflict resolution>
$ git commit
$ git merge origin/improvement/ARSN-401-cluster-rpc-primary
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.1/improvement/ARSN-401-cluster-rpc-primary
The following options are set: create_integration_branches
The following approvals are needed before I can proceed with the merge:
the author
2 peers
The following options are set: create_integration_branches
/approve
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:
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.1
The following branches will NOT be impacted:
development/6.4
development/7.10
development/7.4
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.
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, create_integration_branches
I have successfully merged the changeset of this pull request into targetted development branches:
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.1
The following branches have NOT changed:
development/6.4
development/7.10
development/7.4
Please check the status of the associated issue ARSN-401.
Goodbye bourgoismickael.
This is useful in scenarios where a library or module (arsenal in this case) needs to accept a configuration object that is meant to be passed to another library or module (werelogs). By directly linking the type of the configuration object to the expected parameter type of the werelogs.configure method, it helps to ensure that the arsenal library will correctly propagate the configuration object to werelogs, even if future versions of werelogs change the expected configuration object structure.
My understanding is that, but I may not have the full picture: if we fork a worker before we configure werelogs, we will need to apply the werelogs configuration to both the primary and the worker(s), because they're now different processes. But if we apply the config prior to the fork, then the worker will be already configured since the worker process memory maps the primary's memory (and copy-on-write when written to).
Adds:
PRIMARY
onlyerrorCode
in error communication (for HTTP)This is used by scuba https://github.com/scality/scuba/pull/79