Feature/revision index #1733
Open
Feature/revision index #1733
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shiyan2016
force-pushed
the
feature/revision-index
branch
2 times, most recently
from
09f5315
to
0f20137
Compare
furykerry
reviewed
Sep 11, 2024
| err := rh.List(context.TODO(), &revisions, &client.ListOptions{Namespace: parent.GetNamespace(), LabelSelector: selector}) | ||
| if err != nil { | ||
| return nil, err | ||
| opts := &client.ListOptions{ |
There was a problem hiding this comment.
consider add DisableDeepCopy option
There was a problem hiding this comment.
When use DisableDeepCopy, kruise will panic in e2e because some update codes in cloneset VCTHashEqual handler.
We should fix it. @shiyan2016
pkg/controller/cloneset/cloneset_controller.go:453
lastEqualRevision := equalRevisions[equalCount-1]
if !VCTHashEqual(lastEqualRevision, updateRevision) {
klog.InfoS("Revision vct hash will be updated", "revisionName", lastEqualRevision.Name, "lastRevisionVCTHash", lastEqualRevision.Annotations[volumeclaimtemplate.HashAnnotation], "updateRevisionVCTHash", updateRevision.Annotations[volumeclaimtemplate.HashAnnotation])
lastEqualRevision.Annotations[volumeclaimtemplate.HashAnnotation] = updateRevision.Annotations[volumeclaimtemplate.HashAnnotation]
}
// if the equivalent revision is not immediately prior we will roll back by incrementing the
// Revision of the equivalent revision
updateRevision, err = r.controllerHistory.UpdateControllerRevision(equalRevisions[equalCount-1], updateRevision.Revision)
|
plz fix the ut |
shiyan2016
force-pushed
the
feature/revision-index
branch
2 times, most recently
from
29fc5b4
to
d5e1156
Compare
Signed-off-by: shiyan2016 <[email protected]>
shiyan2016
force-pushed
the
feature/revision-index
branch
from
d5e1156
to
fc894ef
Compare
furykerry
reviewed
Sep 25, 2024
| @@ -137,6 +139,7 @@ func init() { | |||
| utilruntime.Must(appsv1.AddToScheme(scheme)) | |||
| utilruntime.Must(appsv1alpha1.AddToScheme(scheme)) | |||
| utilruntime.Must(corev1.AddToScheme(scheme)) | |||
| utilruntime.Must(apps.AddToScheme(scheme)) | |||
There was a problem hiding this comment.
there is no need to add unversioned scheme here, L139 already do the job
ABNER-1
requested changes
Sep 25, 2024
| @@ -69,7 +71,13 @@ func TestRevisionHistory(t *testing.T) { | |||
| t.Fatalf("Failed to new controller revision: %v", err) | |||
| } | |||
|
|
|||
| fakeClient := fake.NewClientBuilder().Build() | |||
| fakeClient := fake.NewClientBuilder().WithIndex(&apps.ControllerRevision{}, fieldindex.IndexNameForOwnerRefUID, func(obj client.Object) []string { | |||
| var owners []string | |||
There was a problem hiding this comment.
There are so many errors in other uts and can be fixed by using client with index.
I think we should wrap this code with a customized function and replace fake.NewClientBuilder().
| err := rh.List(context.TODO(), &revisions, &client.ListOptions{Namespace: parent.GetNamespace(), LabelSelector: selector}) | ||
| if err != nil { | ||
| return nil, err | ||
| opts := &client.ListOptions{ |
There was a problem hiding this comment.
When use DisableDeepCopy, kruise will panic in e2e because some update codes in cloneset VCTHashEqual handler.
We should fix it. @shiyan2016
pkg/controller/cloneset/cloneset_controller.go:453
lastEqualRevision := equalRevisions[equalCount-1]
if !VCTHashEqual(lastEqualRevision, updateRevision) {
klog.InfoS("Revision vct hash will be updated", "revisionName", lastEqualRevision.Name, "lastRevisionVCTHash", lastEqualRevision.Annotations[volumeclaimtemplate.HashAnnotation], "updateRevisionVCTHash", updateRevision.Annotations[volumeclaimtemplate.HashAnnotation])
lastEqualRevision.Annotations[volumeclaimtemplate.HashAnnotation] = updateRevision.Annotations[volumeclaimtemplate.HashAnnotation]
}
// if the equivalent revision is not immediately prior we will roll back by incrementing the
// Revision of the equivalent revision
updateRevision, err = r.controllerHistory.UpdateControllerRevision(equalRevisions[equalCount-1], updateRevision.Revision)
furykerry
reviewed
Sep 25, 2024
| @@ -219,6 +229,13 @@ func testUpdateWhenSidecarSetPaused(t *testing.T, sidecarSetInput *appsv1alpha1. | |||
|
|
|||
| fakeClient := fake.NewClientBuilder().WithScheme(scheme). | |||
| WithObjects(sidecarSetInput, podInput). | |||
| WithIndex(&apps.ControllerRevision{}, fieldindex.IndexNameForOwnerRefUID, func(obj client.Object) []string { | |||
There was a problem hiding this comment.
use appsv1.ControllerRevision{}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR does
add revision fieldindex to optimize list revisions operation
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how to verify it
Ⅳ. Special notes for reviews