Skip to content

overlay: stop disabling iscsid.socket#1298

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
jlebon:pr/iscsi-socket
May 30, 2023
Merged

overlay: stop disabling iscsid.socket#1298
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
jlebon:pr/iscsi-socket

Conversation

@jlebon
Copy link
Copy Markdown
Member

@jlebon jlebon commented May 26, 2023

The iSCSI daemon is now socket-activated so that it's only running when
needed rather than always enabled. We're breaking that by disabling
iscsid.socket.

This effectively reverts 929ac48 ("c9s: Disable iscsid.socket"). It's
not certain why this was done, but it was likely to workaround failing
tests. These tests should be fixed now[1] so we should be able to stop
doing this.

@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 26, 2023
@jlebon
Copy link
Copy Markdown
Member Author

jlebon commented May 26, 2023

Requires: #1294

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 26, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 26, 2023
The iSCSI daemon is now socket-activated so that it's only running when
needed rather than always enabled. We're breaking that by disabling
`iscsid.socket`.

This effectively reverts 929ac48 ("c9s: Disable iscsid.socket"). It's
not certain why this was done, but it was likely to workaround failing
tests. These tests should be fixed now[[1]] so we should be able to stop
doing this.

[1]: coreos/coreos-assembler#3275
@jlebon jlebon force-pushed the pr/iscsi-socket branch from da58b91 to 8c94270 Compare May 29, 2023 13:22
@jlebon jlebon marked this pull request as ready for review May 29, 2023 13:22
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 29, 2023
@jlebon
Copy link
Copy Markdown
Member Author

jlebon commented May 29, 2023

And now rebased!

@openshift-ci openshift-ci Bot requested review from c4rt0 and cgwalters May 29, 2023 13:23
@travier
Copy link
Copy Markdown
Member

travier commented May 30, 2023

/lgtm
/retest

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 30, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlebon, travier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 30, 2023

@jlebon: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 9915682 into openshift:master May 30, 2023
@mkowalski
Copy link
Copy Markdown

/cherry-pick release-4.13

@openshift-cherrypick-robot
Copy link
Copy Markdown

@mkowalski: #1298 failed to apply on top of branch "release-4.13":

Applying: overlay: stop disabling `iscsid.socket`
Using index info to reconstruct a base tree...
M	overlay.d/07el9/usr/lib/systemd/system-preset/36-iscsid-disabled.preset
Falling back to patching base and 3-way merge...
Auto-merging overlay.d/07el9/usr/lib/systemd/system-preset/36-iscsid-disabled.preset
CONFLICT (content): Merge conflict in overlay.d/07el9/usr/lib/systemd/system-preset/36-iscsid-disabled.preset
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 overlay: stop disabling `iscsid.socket`
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants