Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add new property TuneFastDeviceClass #864

Merged
merged 3 commits into from Dec 7, 2020

Conversation

crombus
Copy link
Contributor

@crombus crombus commented Oct 23, 2020

Signed-off-by: crombus pkundra@redhat.com

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 23, 2020
@crombus crombus force-pushed the fasttune branch 2 times, most recently from e1277e4 to 76d77ba Compare October 23, 2020 14:05
@crombus crombus changed the title [WIP]add new property TuneFastDeviceClass add new property TuneFastDeviceClass Oct 23, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 23, 2020
@crombus
Copy link
Contributor Author

crombus commented Oct 23, 2020

@jarrpa I ran make gen-latest-csv but crd changes were not done. What can I do to make those changes

pkg/apis/ocs/v1/storagecluster_types.go Outdated Show resolved Hide resolved
pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
@openshift-ci-robot
Copy link

@iamniting: changing LGTM is restricted to collaborators

In response to this:

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.

@iamniting
Copy link
Member

I think we should make these changes in two commits first one for the move part and second one for add part.

pkg/apis/ocs/v1/storagecluster_types.go Outdated Show resolved Hide resolved
pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
pkg/controller/storagecluster/cephcluster.go Show resolved Hide resolved
@crombus crombus changed the title add new property TuneFastDeviceClass [WIP]add new property TuneFastDeviceClass Nov 23, 2020
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 23, 2020
@crombus
Copy link
Contributor Author

crombus commented Nov 23, 2020

@jarrpa the ci test is failing at govet. need help there.

pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
@kesavanvt
Copy link

kesavanvt commented Nov 23, 2020

@crombus since the implementation of throttleStorageDevices method is modified, it's required to make necessary changes in TestThrottleStorageDevices (throttleStorageDevices is invoked here ) under storagecluster_controller_test.go.

pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
pkg/controller/storagecluster/cephcluster.go Outdated Show resolved Hide resolved
@jarrpa
Copy link
Member

jarrpa commented Dec 1, 2020

Test failures are valid. Please rebase and resolve. Always run make ocs-operator-ci before any push.

@crombus
Copy link
Contributor Author

crombus commented Dec 1, 2020

the PR is dependent on #912. rook 1.5.1. I'll rebase it.
The failures are because of govet.

@obnoxxx
Copy link
Contributor

obnoxxx commented Dec 2, 2020

the PR is dependent on #912. rook 1.5.1. I'll rebase it.
The failures are because of govet.

#912 has merged now @crombus - you can rebase

@obnoxxx obnoxxx added this to the ocs 4.7 feature freeze milestone Dec 2, 2020
@obnoxxx
Copy link
Contributor

obnoxxx commented Dec 2, 2020

Not strictly required for a 4.7 feature, afaict, but would be good to have before feature freeze...

@crombus crombus changed the title [WIP]add new property TuneFastDeviceClass add new property TuneFastDeviceClass Dec 2, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 2, 2020
@crombus
Copy link
Contributor Author

crombus commented Dec 3, 2020

/test ocs-operator-ci

@obnoxxx
Copy link
Contributor

obnoxxx commented Dec 4, 2020

/test ocs-operator-bundle-e2e-aws

1 similar comment
@obnoxxx
Copy link
Contributor

obnoxxx commented Dec 4, 2020

/test ocs-operator-bundle-e2e-aws

move throttleStorageDevices func in
cephcluster.go and add managed-premium
as fastdeviceclass. modify test file
according to the changes.

Signed-off-by: crombus <pkundra@redhat.com>
add case for fasttune device

Signed-off-by: crombus <pkundra@redhat.com>
Signed-off-by: crombus <pkundra@redhat.com>
@obnoxxx
Copy link
Contributor

obnoxxx commented Dec 5, 2020

/retest

@obnoxxx
Copy link
Contributor

obnoxxx commented Dec 5, 2020

/test ocs-operator-ci

Copy link
Contributor

@obnoxxx obnoxxx left a comment

Choose a reason for hiding this comment

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

To my taste, the main commit (add new property TuneFastDeviceClass) does a bit too much. I would have recommended to split the refactoring (moving of function from reconcile.go to cephcluster.go, etc) into separat commits. But not blocking because of this.

The whole terminology with Tune[Fast|Slow]DeviceClass is rather confusing or non-obvious, but I guess it is what it is.

For now the patch might be enough, but conceptually, I think we need the list of device types to tune for slow or fast types not to be just storage class names and hard code selection of provisioners in the throttle function but instead we should have the devices types be pairs of provisioner and storage class name.

Since this can be done in a follow-up cleanup PR, approving this one for now.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kesavanvt, obnoxxx

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

The pull request process is described here

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 7, 2020
@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Contributor

@crombus: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/red-hat-storage-ocs-ci-e2e-aws 2e8b7aa link /test red-hat-storage-ocs-ci-e2e-aws

Full PR test history. Your PR dashboard.

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 9fb2553 into red-hat-storage:master Dec 7, 2020
raghavendra-talur added a commit to raghavendra-talur/ocs-operator that referenced this pull request Dec 8, 2020
A new property TuneFastDeviceClass was added to the Storage Cluster
spec in PR red-hat-storage#864. This commit adds the generated changes for that.

Signed-off-by: Raghavendra Talur <raghavendra.talur@gmail.com>
raghavendra-talur added a commit to raghavendra-talur/ocs-operator that referenced this pull request Dec 8, 2020
A new property TuneFastDeviceClass was added to the Storage Cluster
spec in PR red-hat-storage#864. This commit adds the generated changes for that.

Signed-off-by: Raghavendra Talur <raghavendra.talur@gmail.com>
raghavendra-talur added a commit to raghavendra-talur/ocs-operator that referenced this pull request Dec 9, 2020
A new property TuneFastDeviceClass was added to the Storage Cluster
spec in PR red-hat-storage#864. This commit adds the generated changes for that.

Signed-off-by: Raghavendra Talur <raghavendra.talur@gmail.com>
@crombus
Copy link
Contributor Author

crombus commented Jan 15, 2021

/cherry-pick release-4.6

@openshift-cherrypick-robot

@crombus: #864 failed to apply on top of branch "release-4.6":

Applying: add new property TuneFastDeviceClass
Using index info to reconstruct a base tree...
M	pkg/apis/ocs/v1/storagecluster_types.go
M	pkg/controller/storagecluster/cephcluster.go
M	pkg/controller/storagecluster/reconcile.go
M	pkg/controller/storagecluster/storagecluster_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/storagecluster/storagecluster_controller_test.go
CONFLICT (content): Merge conflict in pkg/controller/storagecluster/storagecluster_controller_test.go
Auto-merging pkg/controller/storagecluster/reconcile.go
CONFLICT (content): Merge conflict in pkg/controller/storagecluster/reconcile.go
Auto-merging pkg/controller/storagecluster/cephcluster.go
Auto-merging pkg/apis/ocs/v1/storagecluster_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add new property TuneFastDeviceClass
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".

In response to this:

/cherry-pick release-4.6

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.

@agarwal-mudit
Copy link
Member

@crombus https://bugzilla.redhat.com/show_bug.cgi?id=1909793 still doesn't have all the acks. Pls do not merge it into 4.6 yet.
Also, you should first backport it to 4.7

@crombus
Copy link
Contributor Author

crombus commented Jan 15, 2021

@agarwal-mudit this feature is already in 4.7.
And this will require manual BP of the two PR's mentioned in BZ.
I would say it is tricky to BP.

@agarwal-mudit
Copy link
Member

@agarwal-mudit this feature is already in 4.7.
And this will require manual BP of the two PR's mentioned in BZ.
I would say it is tricky to BP.

Ok, then lets not backport it to 4.6
Probably we can GA Azure without this feature. @obnoxxx

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.

None yet